From b09c22123e55fd5d0e7c160ebdf2af60f69eeb72 Mon Sep 17 00:00:00 2001
From: Sandy Noble <sandy.noble@gmail.com>
Date: Mon, 26 Aug 2013 18:09:44 +0100
Subject: [PATCH] Some sw awtooth stuff.

---
 controlsActions.pde      | 7 +++++--
 polargraphcontroller.pde | 4 +++-
 trace.pde                | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/controlsActions.pde b/controlsActions.pde
index ebcc4d4..fc5ff0c 100644
--- a/controlsActions.pde
+++ b/controlsActions.pde
@@ -249,8 +249,11 @@ void button_mode_renderSquarePixel()
 }
 void button_mode_renderSawPixel()
 {
-//  if (pixelCentresForMachine != null && !pixelCentresForMachine.isEmpty())
-//    sendSawtoothPixels();
+  if (getDisplayMachine().pixelsCanBeExtracted() && isBoxSpecified())
+  {
+    Set<PVector> pixels = getDisplayMachine().extractNativePixelsFromArea(getBoxVector1(), getBoxVectorSize(), getGridSize(), sampleArea);
+    sendSawtoothPixels(pixels);
+  }
 }
 void button_mode_renderCirclePixel()
 {
diff --git a/polargraphcontroller.pde b/polargraphcontroller.pde
index f22712e..59689dd 100644
--- a/polargraphcontroller.pde
+++ b/polargraphcontroller.pde
@@ -1372,7 +1372,9 @@ void keyPressed()
 {
 
   keys[keyCode] = true;
-  println(KeyEvent.getKeyText(keyCode));
+  //println("key: " + KeyEvent.getKeyText(keyCode));
+  //println("Keys: " + keys);
+  //println("Keycode: " + keyCode);
   
   if (checkKey(CONTROL) && checkKey(KeyEvent.VK_PAGE_UP)) 
     changeMachineScaling(1);
diff --git a/trace.pde b/trace.pde
index b0fd1f4..11e3b0a 100644
--- a/trace.pde
+++ b/trace.pde
@@ -203,7 +203,7 @@ public void trace_captureCurrentImage()
 {
 //  capturedImage = webcam_buildLiveImage();
   if (getDisplayMachine().imageIsReady())
-    webcam_captureCurrentImage(getDisplayMachine().getImage());
+    trace_captureCurrentImage(getDisplayMachine().getImage());
 }
 
 public void trace_processLoadedImage()