@@ -46,13 +46,10 @@ public class FilterContoursOperation implements Operation {
46
46
SocketHints .Inputs .createNumberListRangeSocketHint ("Solidity" , 0 , 100 );
47
47
48
48
private final SocketHint <Number > minVertexHint =
49
- SocketHints .Inputs .createNumberSpinnerSocketHint ("Min Vertex Count " , 0 , 0 , Integer .MAX_VALUE );
49
+ SocketHints .Inputs .createNumberSpinnerSocketHint ("Min Vertices " , 0 , 0 , Integer .MAX_VALUE );
50
50
51
51
private final SocketHint <Number > maxVertexHint =
52
- SocketHints .Inputs .createNumberSpinnerSocketHint ("Max Vertex Count" , 0 , 1000 , Integer .MAX_VALUE );
53
-
54
- private final SocketHint <Boolean > forceConvexHint =
55
- SocketHints .createBooleanSocketHint ("Force Convex" , false );
52
+ SocketHints .Inputs .createNumberSpinnerSocketHint ("Max Vertices" , 0 , 1000000 , Integer .MAX_VALUE );
56
53
57
54
private final SocketHint <Number > minRatioHint =
58
55
SocketHints .Inputs .createNumberSpinnerSocketHint ("Min Ratio" , 0 , 0 , Integer .MAX_VALUE );
@@ -94,7 +91,6 @@ public InputSocket<?>[] createInputSockets(EventBus eventBus) {
94
91
new InputSocket <>(eventBus , solidityHint ),
95
92
new InputSocket <>(eventBus , minVertexHint ),
96
93
new InputSocket <>(eventBus , maxVertexHint ),
97
- new InputSocket <>(eventBus , forceConvexHint ),
98
94
new InputSocket <>(eventBus , minRatioHint ),
99
95
new InputSocket <>(eventBus , maxRatioHint ),
100
96
};
@@ -119,9 +115,8 @@ public void perform(InputSocket<?>[] inputs, OutputSocket<?>[] outputs) {
119
115
final double maxSolidity = ((List <Number >) inputs [7 ].getValue ().get ()).get (1 ).doubleValue ();
120
116
final double minVertexCount = ((Number ) inputs [8 ].getValue ().get ()).doubleValue ();
121
117
final double maxVertexCount = ((Number ) inputs [9 ].getValue ().get ()).doubleValue ();
122
- final boolean forceConvex = ((Boolean ) inputs [10 ].getValue ().get ()).booleanValue ();
123
- final double minRatio = ((Number ) inputs [11 ].getValue ().get ()).doubleValue ();
124
- final double maxRatio = ((Number ) inputs [12 ].getValue ().get ()).doubleValue ();
118
+ final double minRatio = ((Number ) inputs [10 ].getValue ().get ()).doubleValue ();
119
+ final double maxRatio = ((Number ) inputs [11 ].getValue ().get ()).doubleValue ();
125
120
126
121
127
122
final MatVector inputContours = inputSocket .getValue ().get ().getContours ();
@@ -148,8 +143,6 @@ public void perform(InputSocket<?>[] inputs, OutputSocket<?>[] outputs) {
148
143
149
144
if (contour .rows () < minVertexCount || contour .rows () > maxVertexCount ) continue ;
150
145
151
- if (forceConvex && !isContourConvex (contour )) continue ;
152
-
153
146
final double ratio = bb .width () / bb .height ();
154
147
if (ratio < minRatio || ratio > maxRatio ) continue ;
155
148
0 commit comments