mirror of
https://github.com/euphy/polargraphcontroller
synced 2025-01-08 19:24:25 +01:00
Fixed that stinky webcam_captureCurrentImage problem. It turned out I was tracking the wrong local repo, so my changes weren't pushing.
This commit is contained in:
parent
65a9c9afc1
commit
186ca7a0a1
7
.gitignore
vendored
7
.gitignore
vendored
@ -1,2 +1,7 @@
|
|||||||
|
|
||||||
/default.properties.txt
|
/default.properties.txt
|
||||||
|
/application.windows32
|
||||||
|
/application.windows64
|
||||||
|
/application.linux32
|
||||||
|
/application.linux64
|
||||||
|
/application.macosx
|
||||||
|
50
Polargraphsd spec.properties.txt
Normal file
50
Polargraphsd spec.properties.txt
Normal file
@ -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
|
@ -296,7 +296,7 @@ Map<String, Controller> initialiseNumberboxValues(Map<String, Controller> map)
|
|||||||
else if (MODE_CHANGE_GRID_SIZE.equals(key))
|
else if (MODE_CHANGE_GRID_SIZE.equals(key))
|
||||||
{
|
{
|
||||||
n.setValue(getGridSize());
|
n.setValue(getGridSize());
|
||||||
n.setMin(20);
|
n.setMin(5);
|
||||||
n.setMultiplier(0.5);
|
n.setMultiplier(0.5);
|
||||||
}
|
}
|
||||||
else if (MODE_CHANGE_MACHINE_WIDTH.equals(key))
|
else if (MODE_CHANGE_MACHINE_WIDTH.equals(key))
|
||||||
@ -458,7 +458,7 @@ Map<String, Controller> initialiseNumberboxValues(Map<String, Controller> map)
|
|||||||
n.setValue(penLiftUpPosition);
|
n.setValue(penLiftUpPosition);
|
||||||
n.setMin(0);
|
n.setMin(0);
|
||||||
n.setMax(360);
|
n.setMax(360);
|
||||||
n.setMultiplier(1);
|
n.setMultiplier(0.5);
|
||||||
}
|
}
|
||||||
else if (MODE_PEN_LIFT_POS_DOWN.equals(key))
|
else if (MODE_PEN_LIFT_POS_DOWN.equals(key))
|
||||||
{
|
{
|
||||||
@ -466,7 +466,7 @@ Map<String, Controller> initialiseNumberboxValues(Map<String, Controller> map)
|
|||||||
n.setValue(penLiftDownPosition);
|
n.setValue(penLiftDownPosition);
|
||||||
n.setMin(0);
|
n.setMin(0);
|
||||||
n.setMax(360);
|
n.setMax(360);
|
||||||
n.setMultiplier(0.1);
|
n.setMultiplier(0.5);
|
||||||
}
|
}
|
||||||
else if (MODE_LIVE_BLUR_VALUE.equals(key))
|
else if (MODE_LIVE_BLUR_VALUE.equals(key))
|
||||||
{
|
{
|
||||||
|
62
data/highrect.svg
Normal file
62
data/highrect.svg
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
width="744.09448819"
|
||||||
|
height="1052.3622047"
|
||||||
|
id="svg2"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.48.2 r9819"
|
||||||
|
sodipodi:docname="New document 1">
|
||||||
|
<defs
|
||||||
|
id="defs4" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="base"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1.0"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:zoom="0.35"
|
||||||
|
inkscape:cx="375"
|
||||||
|
inkscape:cy="520"
|
||||||
|
inkscape:document-units="px"
|
||||||
|
inkscape:current-layer="layer1"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:window-width="1920"
|
||||||
|
inkscape:window-height="1137"
|
||||||
|
inkscape:window-x="-8"
|
||||||
|
inkscape:window-y="-8"
|
||||||
|
inkscape:window-maximized="1" />
|
||||||
|
<metadata
|
||||||
|
id="metadata7">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title></dc:title>
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<g
|
||||||
|
inkscape:label="Layer 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1">
|
||||||
|
<rect
|
||||||
|
style="fill:#000000"
|
||||||
|
id="rect2985"
|
||||||
|
width="500"
|
||||||
|
height="180"
|
||||||
|
x="131.42857"
|
||||||
|
y="223.79076" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.7 KiB |
62
data/midsquare.svg
Normal file
62
data/midsquare.svg
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
width="744.09448819"
|
||||||
|
height="1052.3622047"
|
||||||
|
id="svg2"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.48.2 r9819"
|
||||||
|
sodipodi:docname="highrect.svg">
|
||||||
|
<defs
|
||||||
|
id="defs4" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="base"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1.0"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:zoom="0.35"
|
||||||
|
inkscape:cx="375"
|
||||||
|
inkscape:cy="520"
|
||||||
|
inkscape:document-units="px"
|
||||||
|
inkscape:current-layer="layer1"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:window-width="1920"
|
||||||
|
inkscape:window-height="1137"
|
||||||
|
inkscape:window-x="-8"
|
||||||
|
inkscape:window-y="-8"
|
||||||
|
inkscape:window-maximized="1" />
|
||||||
|
<metadata
|
||||||
|
id="metadata7">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title></dc:title>
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<g
|
||||||
|
inkscape:label="Layer 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1">
|
||||||
|
<rect
|
||||||
|
style="fill:#000000"
|
||||||
|
id="rect2985"
|
||||||
|
width="51.42857"
|
||||||
|
height="48.57143"
|
||||||
|
x="105.71429"
|
||||||
|
y="466.64792" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.7 KiB |
104
data/midsquares.svg
Normal file
104
data/midsquares.svg
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
width="744.09448819"
|
||||||
|
height="1052.3622047"
|
||||||
|
id="svg2"
|
||||||
|
version="1.1"
|
||||||
|
inkscape:version="0.48.2 r9819"
|
||||||
|
sodipodi:docname="midsquare.svg">
|
||||||
|
<defs
|
||||||
|
id="defs4" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="base"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1.0"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:zoom="0.35"
|
||||||
|
inkscape:cx="375"
|
||||||
|
inkscape:cy="520"
|
||||||
|
inkscape:document-units="px"
|
||||||
|
inkscape:current-layer="layer1"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:window-width="1920"
|
||||||
|
inkscape:window-height="1137"
|
||||||
|
inkscape:window-x="-8"
|
||||||
|
inkscape:window-y="-8"
|
||||||
|
inkscape:window-maximized="1" />
|
||||||
|
<metadata
|
||||||
|
id="metadata7">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title></dc:title>
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<g
|
||||||
|
inkscape:label="Layer 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1">
|
||||||
|
<rect
|
||||||
|
style="fill:#000000"
|
||||||
|
id="rect2985"
|
||||||
|
width="51.42857"
|
||||||
|
height="48.57143"
|
||||||
|
x="105.71429"
|
||||||
|
y="466.64792" />
|
||||||
|
<rect
|
||||||
|
style="fill:#000000"
|
||||||
|
id="rect2985-1"
|
||||||
|
width="51.42857"
|
||||||
|
height="48.57143"
|
||||||
|
x="200"
|
||||||
|
y="465.21933" />
|
||||||
|
<rect
|
||||||
|
style="fill:#000000"
|
||||||
|
id="rect2985-7"
|
||||||
|
width="51.42857"
|
||||||
|
height="48.57143"
|
||||||
|
x="300"
|
||||||
|
y="465.21936" />
|
||||||
|
<rect
|
||||||
|
style="fill:#000000"
|
||||||
|
id="rect2985-4"
|
||||||
|
width="51.42857"
|
||||||
|
height="48.57143"
|
||||||
|
x="382.85715"
|
||||||
|
y="473.79074" />
|
||||||
|
<rect
|
||||||
|
style="fill:#000000"
|
||||||
|
id="rect2985-0"
|
||||||
|
width="51.42857"
|
||||||
|
height="48.57143"
|
||||||
|
x="457.14285"
|
||||||
|
y="479.50507" />
|
||||||
|
<rect
|
||||||
|
style="fill:#000000"
|
||||||
|
id="rect2985-9"
|
||||||
|
width="51.42857"
|
||||||
|
height="48.57143"
|
||||||
|
x="537.14282"
|
||||||
|
y="470.93362" />
|
||||||
|
<rect
|
||||||
|
style="fill:#000000"
|
||||||
|
id="rect2985-48"
|
||||||
|
width="51.42857"
|
||||||
|
height="48.57143"
|
||||||
|
x="628.57141"
|
||||||
|
y="473.79074" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 2.6 KiB |
@ -33,8 +33,8 @@ import diewald_CV_kit.utility.*;
|
|||||||
import diewald_CV_kit.blobdetection.*;
|
import diewald_CV_kit.blobdetection.*;
|
||||||
|
|
||||||
import geomerative.*;
|
import geomerative.*;
|
||||||
import org.apache.batik.svggen.font.table.*;
|
//import org.apache.batik.svggen.font.table.*;
|
||||||
import org.apache.batik.svggen.font.*;
|
//import org.apache.batik.svggen.font.*;
|
||||||
import java.util.zip.CRC32;
|
import java.util.zip.CRC32;
|
||||||
|
|
||||||
|
|
||||||
@ -47,6 +47,7 @@ import java.util.logging.*;
|
|||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import processing.serial.*;
|
import processing.serial.*;
|
||||||
import controlP5.*;
|
import controlP5.*;
|
||||||
|
import java.awt.event.KeyEvent;
|
||||||
import java.awt.event.*;
|
import java.awt.event.*;
|
||||||
|
|
||||||
int majorVersionNo = 1;
|
int majorVersionNo = 1;
|
||||||
@ -3061,4 +3062,3 @@ PImage makeColourImage(int w, int h, int colour)
|
|||||||
}
|
}
|
||||||
return img;
|
return img;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -203,7 +203,7 @@ public void trace_captureCurrentImage()
|
|||||||
{
|
{
|
||||||
// capturedImage = webcam_buildLiveImage();
|
// capturedImage = webcam_buildLiveImage();
|
||||||
if (getDisplayMachine().imageIsReady())
|
if (getDisplayMachine().imageIsReady())
|
||||||
webcam_captureCurrentImage(getDisplayMachine().getImage());
|
trace_captureCurrentImage(getDisplayMachine().getImage());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void trace_processLoadedImage()
|
public void trace_processLoadedImage()
|
||||||
|
Loading…
Reference in New Issue
Block a user