From a2c666828030532bf4e6a93b0014d89e2a0cef5b Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 29 Nov 2019 21:41:38 -0800 Subject: [PATCH] make pipelinemanager update networktables on ui pipeline change --- .../vision/pipeline/PipelineManager.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Main/src/main/java/com/chameleonvision/vision/pipeline/PipelineManager.java b/Main/src/main/java/com/chameleonvision/vision/pipeline/PipelineManager.java index ec2bd67b0..de92fd325 100644 --- a/Main/src/main/java/com/chameleonvision/vision/pipeline/PipelineManager.java +++ b/Main/src/main/java/com/chameleonvision/vision/pipeline/PipelineManager.java @@ -5,6 +5,7 @@ import com.chameleonvision.config.ConfigManager; import com.chameleonvision.vision.VisionManager; import com.chameleonvision.vision.VisionProcess; import com.chameleonvision.web.SocketHandler; +import edu.wpi.first.networktables.NetworkTableEntry; import java.util.Comparator; import java.util.HashMap; @@ -21,6 +22,7 @@ public class PipelineManager { private final VisionProcess parentProcess; private int currentPipelineIndex; private boolean driverMode; + public NetworkTableEntry ntIndexEntry; public PipelineManager(VisionProcess visionProcess, List loadedPipelineSettings) { parentProcess = visionProcess; @@ -90,11 +92,7 @@ public class PipelineManager { } public CVPipeline getCurrentPipeline() { - if (driverMode) { - return driverModePipeline; - } else { - return pipelines.get(currentPipelineIndex); - } + return driverMode ? driverModePipeline : pipelines.get(currentPipelineIndex); } public void setCurrentPipeline(int index) { @@ -116,6 +114,9 @@ public class PipelineManager { } } newPipeline.initPipeline(parentProcess.getCamera()); + if(ntIndexEntry != null) { + ntIndexEntry.setDouble(index); + } } }