Skip to content

Commit a09ce92

Browse files
committed
some stuff
1 parent 3ffbac3 commit a09ce92

File tree

2 files changed

+1
-43
lines changed

2 files changed

+1
-43
lines changed

photon-core/src/main/java/org/photonvision/vision/pipeline/RKNNPipeline.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ protected CVPipelineResult process(Frame input_frame, RKNNPipelineSettings setti
180180

181181
boolean isIn(List<NeuralNetworkPipeResult> list, NeuralNetworkPipeResult target) {
182182
for (var item : list)
183-
if (item.box.equals(target.box)
183+
if (item.bbox.equals(target.bbox)
184184
&& item.classIdx == target.classIdx
185185
&& item.confidence == target.confidence) return true;
186186
return false;

photon-core/src/main/java/org/photonvision/vision/processes/PipelineManager.java

-42
Original file line numberDiff line numberDiff line change
@@ -238,48 +238,6 @@ private void updatePipelineFromRequested() {
238238
"fullsettings", ConfigManager.getInstance().getConfig().toHashMap()));
239239
}
240240

241-
/**
242-
* Recreate the current user pipeline with the current pipeline index. Useful to force a
243-
* recreation after changing pipeline type
244-
*/
245-
private void recreateUserPipeline() {
246-
// Cleanup potential old native resources before swapping over from a user pipeline
247-
if (currentUserPipeline != null && !(currentPipelineIndex < 0)) {
248-
currentUserPipeline.release();
249-
}
250-
251-
var desiredPipelineSettings = userPipelineSettings.get(currentPipelineIndex);
252-
switch (desiredPipelineSettings.pipelineType) {
253-
case Reflective:
254-
logger.debug("Creating Reflective pipeline");
255-
currentUserPipeline =
256-
new ReflectivePipeline((ReflectivePipelineSettings) desiredPipelineSettings);
257-
break;
258-
case ColoredShape:
259-
logger.debug("Creating ColoredShape pipeline");
260-
currentUserPipeline =
261-
new ColoredShapePipeline((ColoredShapePipelineSettings) desiredPipelineSettings);
262-
break;
263-
case AprilTag:
264-
logger.debug("Creating AprilTag pipeline");
265-
currentUserPipeline =
266-
new AprilTagPipeline((AprilTagPipelineSettings) desiredPipelineSettings);
267-
break;
268-
269-
case Aruco:
270-
logger.debug("Creating Aruco Pipeline");
271-
currentUserPipeline = new ArucoPipeline((ArucoPipelineSettings) desiredPipelineSettings);
272-
break;
273-
case ObjectDetection:
274-
logger.debug("Creating ObjectDetection Pipeline");
275-
currentUserPipeline =
276-
new ObjectDetectionPipeline((ObjectDetectionPipelineSettings) desiredPipelineSettings);
277-
default:
278-
// Can be calib3d or drivermode, both of which are special cases
279-
break;
280-
}
281-
}
282-
283241
/**
284242
* Enters or exits calibration mode based on the parameter. <br>
285243
* <br>

0 commit comments

Comments
 (0)