Skip to content

Commit 43d3ad1

Browse files
committed
Reorder sockets to maintain backwards compatibility
1 parent c696c89 commit 43d3ad1

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

core/src/main/java/edu/wpi/grip/core/operations/composite/FindBlobsOperation.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ public FindBlobsOperation(InputSocket.Factory inputSocketFactory, OutputSocket.F
6161
this.inputSocket = inputSocketFactory.create(inputHint);
6262
this.minAreaSocket = inputSocketFactory.create(minAreaHint);
6363
this.circularitySocket = inputSocketFactory.create(circularityHint);
64+
this.colorSocket = inputSocketFactory.create(colorHint);
6465
this.convexitySocket = inputSocketFactory.create(convexityHint);
6566
this.inertiaRatioSocket = inputSocketFactory.create(inertiaRatioHint);
66-
this.colorSocket = inputSocketFactory.create(colorHint);
6767

6868
this.outputSocket = outputSocketFactory.create(blobsHint);
6969
}
@@ -74,9 +74,10 @@ public List<InputSocket> getInputSockets() {
7474
inputSocket,
7575
minAreaSocket,
7676
circularitySocket,
77+
colorSocket,
78+
//Sockets placed last to maintain backwards compatibility in deserialization
7779
convexitySocket,
78-
inertiaRatioSocket,
79-
colorSocket
80+
inertiaRatioSocket
8081
);
8182
}
8283

@@ -93,10 +94,9 @@ public void perform() {
9394
final Mat input = inputSocket.getValue().get();
9495
final Number minArea = minAreaSocket.getValue().get();
9596
final List<Number> circularity = circularitySocket.getValue().get();
97+
final Boolean darkBlobs = colorSocket.getValue().get();
9698
final List<Number> convexity = convexitySocket.getValue().get();
9799
final List<Number> inertiaRatio = inertiaRatioSocket.getValue().get();
98-
final Boolean darkBlobs = colorSocket.getValue().get();
99-
100100

101101
final SimpleBlobDetector blobDetector = SimpleBlobDetector.create(new SimpleBlobDetector
102102
.Params()

0 commit comments

Comments
 (0)