vmario/polargraphcontroller
0
0
Fork 0
mirror of https://github.com/euphy/polargraphcontroller synced 2024-11-15 02:37:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed the line filtering back to safer territory.

Browse Source
This commit is contained in:
Sandy Noble 2014-09-17 23:45:09 +01:00
parent a3efbd9cdb
commit 7091fdbb44
2 changed files with 50 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
drawing.pde
View File

@ -674,7 +674,7 @@ void sendVectorShapes(RShape vec, float scaling, PVector position, int pathSorti
String command = ""; String command = "";
PVector lastPoint = new PVector(); PVector lastPoint = new PVector();
boolean liftToGetToNewPoint = true; boolean liftToGetToNewPoint = true;
// go through and get each path // go through and get each path
for (int i = 0; i<pointPaths.length; i++) for (int i = 0; i<pointPaths.length; i++)
{ {
@ -684,38 +684,35 @@ void sendVectorShapes(RShape vec, float scaling, PVector position, int pathSorti
if (pointPaths[i].length > pathLengthHighPassCutoff) if (pointPaths[i].length > pathLengthHighPassCutoff)
{ {
List<List<PVector>> filteredPaths = filterPoints(pointPaths[i], VECTOR_FILTER_LOW_PASS, minimumVectorLineLength, scaling, position); List<PVector> filteredPoints = filterPoints(pointPaths[i], VECTOR_FILTER_LOW_PASS, minimumVectorLineLength, scaling, position);
for (List<PVector> filteredPoints : filteredPaths) if (!filteredPoints.isEmpty())
{ {
if (!filteredPoints.isEmpty()) // draw the first one with a pen up and down to get to it
PVector p = filteredPoints.get(0);
if ( p.x == lastPoint.x && p.y == lastPoint.y )
liftToGetToNewPoint = false;
else
liftToGetToNewPoint = true;
// pen UP! (IF THE NEW POINT IS DIFFERENT FROM THE LAST ONE!)
if (liftToGetToNewPoint)
addToCommandQueue(CMD_PENUP+"END");
// move to this point and put the pen down
command = CMD_CHANGELENGTHDIRECT+(int)p.x+","+(int)p.y+","+getMaxSegmentLength()+",END";
addToCommandQueue(command);
if (liftToGetToNewPoint)
addToCommandQueue(CMD_PENDOWN+"END");
// then just iterate through the rest
for (int j=1; j<filteredPoints.size(); j++)
{ {
// draw the first one with a pen up and down to get to it p = filteredPoints.get(j);
PVector p = filteredPoints.get(0);
if ( p.x == lastPoint.x && p.y == lastPoint.y )
liftToGetToNewPoint = false;
else
liftToGetToNewPoint = true;
// pen UP! (IF THE NEW POINT IS DIFFERENT FROM THE LAST ONE!)
if (liftToGetToNewPoint)
addToCommandQueue(CMD_PENUP+"END");
// move to this point and put the pen down
command = CMD_CHANGELENGTHDIRECT+(int)p.x+","+(int)p.y+","+getMaxSegmentLength()+",END"; command = CMD_CHANGELENGTHDIRECT+(int)p.x+","+(int)p.y+","+getMaxSegmentLength()+",END";
addToCommandQueue(command); addToCommandQueue(command);
if (liftToGetToNewPoint)
addToCommandQueue(CMD_PENDOWN+"END");
// then just iterate through the rest
for (int j=1; j<filteredPoints.size(); j++)
{
p = filteredPoints.get(j);
command = CMD_CHANGELENGTHDIRECT+(int)p.x+","+(int)p.y+","+getMaxSegmentLength()+",END";
addToCommandQueue(command);
}
lastPoint = new PVector(p.x, p.y);
} }
lastPoint = new PVector(p.x, p.y);
} }
} }
} }
@ -879,18 +876,17 @@ List<RPoint[]> removeShortPaths(List<RPoint[]> list, int cutoff)
return list; return list;
} }
List<List<PVector>> filterPoints(RPoint[] points, int filterToUse, long filterParam, float scaling, PVector position) List<PVector> filterPoints(RPoint[] points, int filterToUse, long filterParam, float scaling, PVector position)
{ {
return filterPointsLowPass(points, filterParam, scaling, position); return filterPointsLowPass(points, filterParam, scaling, position);
} }
List<List<PVector>> filterPointsLowPass(RPoint[] points, long filterParam, float scaling, PVector position) List<PVector> filterPointsLowPass(RPoint[] points, long filterParam, float scaling, PVector position)
{ {
List<List<PVector>> result = new ArrayList<List<PVector>>(); List<PVector> result = new ArrayList<PVector>();
// scale and convert all the points first, and filter them by area. // scale and convert all the points first
List<List<PVector>> areaFiltered = new ArrayList<List<PVector>>(); List<PVector> scaled = new ArrayList<PVector>(points.length);
List<PVector> scaledPoints = null;
for (int j = 0; j<points.length; j++) for (int j = 0; j<points.length; j++)
{ {
RPoint firstPoint = points[j]; RPoint firstPoint = points[j];
@ -898,64 +894,37 @@ List<List<PVector>> filterPointsLowPass(RPoint[] points, long filterParam, float
p = PVector.mult(p, scaling); p = PVector.mult(p, scaling);
p = PVector.add(p, position); p = PVector.add(p, position);
p = getDisplayMachine().inSteps(p); p = getDisplayMachine().inSteps(p);
// Check if the point is on the drawable area
if (getDisplayMachine().getPictureFrame().surrounds(p)) if (getDisplayMachine().getPictureFrame().surrounds(p))
{ {
if (scaledPoints == null)
{
scaledPoints = new ArrayList<PVector>(points.length);
}
p = getDisplayMachine().asNativeCoords(p); p = getDisplayMachine().asNativeCoords(p);
scaledPoints.add(p); scaled.add(p);
}
else
{ // if the point is NOT in the drawable area, then check to see if there is a
// scaledPoints list, and if there is, that means this is the first point in
// the current path that is NOT in the drawable area. That is, the line was on
// the drawable area, but it's just gone off it.
// In this case, append the current list of scaled points into the results list,
// and then nullify scaledPoints so it'll be restarted as a new list if a
// subsequent point ends up coming back on the drawable area.
if (scaledPoints != null && scaledPoints.size() > 0)
{
areaFiltered.add(scaledPoints);
scaledPoints = null;
}
} }
} }
if (scaled.size() > 1)
// Now filter by length
if (!areaFiltered.isEmpty())
{ {
for (List<PVector> filteredPoints : areaFiltered) PVector p = scaled.get(0);
result.add(p);
for (int j = 1; j<scaled.size(); j++)
{ {
List<PVector> lengthFiltered = new ArrayList<PVector>(); p = scaled.get(j);
PVector p = filteredPoints.get(0); // and even then, only bother drawing if it's a move of over "x" steps
lengthFiltered.add(p); int diffx = int(p.x) - int(result.get(result.size()-1).x);
int diffy = int(p.y) - int(result.get(result.size()-1).y);
for (int j = 1; j<filteredPoints.size(); j++)
if (abs(diffx) > filterParam || abs(diffy) > filterParam)
{ {
p = filteredPoints.get(j); //println("Adding point " + p + ", last: " + result.get(result.size()-1));
// and even then, only bother drawing if it's a move of over "x" steps result.add(p);
int diffx = int(p.x) - int(lengthFiltered.get(lengthFiltered.size()-1).x);
int diffy = int(p.y) - int(lengthFiltered.get(lengthFiltered.size()-1).y);
if (abs(diffx) > filterParam || abs(diffy) > filterParam)
{
//println("Adding point " + p + ", last: " + result.get(result.size()-1));
lengthFiltered.add(p);
}
}
if (lengthFiltered.size() >= 2)
{
result.add(lengthFiltered);
} }
} }
} }
println("finished filter."); if (result.size() < 2)
result.clear();
//println("finished filter.");
return result; return result;
} }

2
polargraphcontroller.pde
View File

@ -52,7 +52,7 @@ import java.awt.event.*;
int majorVersionNo = 1; int majorVersionNo = 1;
int minorVersionNo = 10; int minorVersionNo = 10;
int buildNo = 0; int buildNo = 2;
String programTitle = "Polargraph Controller v" + majorVersionNo + "." + minorVersionNo + " build " + buildNo; String programTitle = "Polargraph Controller v" + majorVersionNo + "." + minorVersionNo + " build " + buildNo;
ControlP5 cp5; ControlP5 cp5;