From 186ca7a0a1471bb60c8c716ddd38f4a48aba0c12 Mon Sep 17 00:00:00 2001 From: Sandy Noble Date: Sun, 11 Aug 2013 10:18:30 +0100 Subject: [PATCH] Fixed that stinky webcam_captureCurrentImage problem. It turned out I was tracking the wrong local repo, so my changes weren't pushing. --- .gitignore | 7 ++- Polargraphsd spec.properties.txt | 50 +++++++++++++++ controlsSetup.pde | 6 +- data/highrect.svg | 62 ++++++++++++++++++ data/midsquare.svg | 62 ++++++++++++++++++ data/midsquares.svg | 104 +++++++++++++++++++++++++++++++ polargraphcontroller.pde | 6 +- trace.pde | 2 +- 8 files changed, 291 insertions(+), 8 deletions(-) create mode 100644 Polargraphsd spec.properties.txt create mode 100644 data/highrect.svg create mode 100644 data/midsquare.svg create mode 100644 data/midsquares.svg diff --git a/.gitignore b/.gitignore index 4e02790..c6acf87 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ -/default.properties.txt \ No newline at end of file +/default.properties.txt +/application.windows32 +/application.windows64 +/application.linux32 +/application.linux64 +/application.macosx diff --git a/Polargraphsd spec.properties.txt b/Polargraphsd spec.properties.txt new file mode 100644 index 0000000..064824c --- /dev/null +++ b/Polargraphsd spec.properties.txt @@ -0,0 +1,50 @@ +# *** Polargraph properties file *** +#Thu May 16 08:14:07 PDT 2013 +controller.pixel.samplearea=10.0 +controller.pictureframe.position.y=190 +controller.pictureframe.position.x=190 +controller.testPenWidth.startSize=0.5 +controller.machine.colour=969696 +machine.motors.mmPerRev=95.0 +controller.window.width=1190 +controller.frame.colour=C80000 +controller.image.position.y=178 +controller.image.position.x=178 +machine.motors.accel=400.0 +controller.image.height=180 +controller.machine.serialport=0 +controller.window.height=288 +controller.maxSegmentLength=2 +machine.penlift.up=90 +machine.penlift.down=180 +controller.page.position.y=120 +controller.vector.scaling=100.0 +controller.page.position.x=27 +controller.pictureframe.width=95 +machine.step.multiplier=1 +controller.grid.size=75.0 +controller.testPenWidth.endSize=2.0 +controller.pictureframe.height=95 +controller.page.colour=DCDCDC +controller.testPenWidth.incrementSize=0.5 +controller.image.width=119 +machine.motors.stepsPerRev=800.0 +machine.pen.size=0.5 +controller.page.width=457 +controller.pixel.mask.color=00FF00 +controller.machine.baudrate=57600 +controller.vector.minLineLength=0 +machine.width=510 +controller.page.height=610 +controller.vector.position.y=0.0 +controller.background.colour=646464 +controller.image.filename=C\:\\Users\\mpoon@roblox.com\\Documents\\Mona_Lisa_resize.jpg +controller.vector.position.x=0.0 +controller.homepoint.y=120.0 +controller.guide.colour=FFFFFF +machine.motors.maxSpeed=600.0 +controller.homepoint.x=255.0 +controller.density.preview.style=1 +controller.pixel.scaling=1.0 +controller.densitypreview.colour=000000 +machine.height=730 diff --git a/controlsSetup.pde b/controlsSetup.pde index 412046e..67d9f1f 100644 --- a/controlsSetup.pde +++ b/controlsSetup.pde @@ -296,7 +296,7 @@ Map initialiseNumberboxValues(Map map) else if (MODE_CHANGE_GRID_SIZE.equals(key)) { n.setValue(getGridSize()); - n.setMin(20); + n.setMin(5); n.setMultiplier(0.5); } else if (MODE_CHANGE_MACHINE_WIDTH.equals(key)) @@ -458,7 +458,7 @@ Map initialiseNumberboxValues(Map map) n.setValue(penLiftUpPosition); n.setMin(0); n.setMax(360); - n.setMultiplier(1); + n.setMultiplier(0.5); } else if (MODE_PEN_LIFT_POS_DOWN.equals(key)) { @@ -466,7 +466,7 @@ Map initialiseNumberboxValues(Map map) n.setValue(penLiftDownPosition); n.setMin(0); n.setMax(360); - n.setMultiplier(0.1); + n.setMultiplier(0.5); } else if (MODE_LIVE_BLUR_VALUE.equals(key)) { diff --git a/data/highrect.svg b/data/highrect.svg new file mode 100644 index 0000000..c51cbed --- /dev/null +++ b/data/highrect.svg @@ -0,0 +1,62 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/data/midsquare.svg b/data/midsquare.svg new file mode 100644 index 0000000..f920f26 --- /dev/null +++ b/data/midsquare.svg @@ -0,0 +1,62 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/data/midsquares.svg b/data/midsquares.svg new file mode 100644 index 0000000..e77eb9c --- /dev/null +++ b/data/midsquares.svg @@ -0,0 +1,104 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/polargraphcontroller.pde b/polargraphcontroller.pde index f22712e..ad6dc9a 100644 --- a/polargraphcontroller.pde +++ b/polargraphcontroller.pde @@ -33,8 +33,8 @@ import diewald_CV_kit.utility.*; import diewald_CV_kit.blobdetection.*; import geomerative.*; -import org.apache.batik.svggen.font.table.*; -import org.apache.batik.svggen.font.*; +//import org.apache.batik.svggen.font.table.*; +//import org.apache.batik.svggen.font.*; import java.util.zip.CRC32; @@ -47,6 +47,7 @@ import java.util.logging.*; import javax.swing.*; import processing.serial.*; import controlP5.*; +import java.awt.event.KeyEvent; import java.awt.event.*; int majorVersionNo = 1; @@ -3061,4 +3062,3 @@ PImage makeColourImage(int w, int h, int colour) } return img; } - 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()