Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-07-03 03:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

make pipelinemanager update networktables on ui pipeline change

Browse Source
This commit is contained in:
Matt
2019-11-29 21:41:38 -08:00
parent 373b4262e5
commit a2c6668280
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Main/src/main/java/com/chameleonvision/vision/pipeline/PipelineManager.java
View File

@@ -5,6 +5,7 @@ import com.chameleonvision.config.ConfigManager;
import com.chameleonvision.vision.VisionManager; import com.chameleonvision.vision.VisionManager;
import com.chameleonvision.vision.VisionProcess; import com.chameleonvision.vision.VisionProcess;
import com.chameleonvision.web.SocketHandler; import com.chameleonvision.web.SocketHandler;
import edu.wpi.first.networktables.NetworkTableEntry;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
@@ -21,6 +22,7 @@ public class PipelineManager {
private final VisionProcess parentProcess; private final VisionProcess parentProcess;
private int currentPipelineIndex; private int currentPipelineIndex;
private boolean driverMode; private boolean driverMode;
public NetworkTableEntry ntIndexEntry;
public PipelineManager(VisionProcess visionProcess, List<CVPipelineSettings> loadedPipelineSettings) { public PipelineManager(VisionProcess visionProcess, List<CVPipelineSettings> loadedPipelineSettings) {
parentProcess = visionProcess; parentProcess = visionProcess;
@@ -90,11 +92,7 @@ public class PipelineManager {
} }
public CVPipeline getCurrentPipeline() { public CVPipeline getCurrentPipeline() {
if (driverMode) { return driverMode ? driverModePipeline : pipelines.get(currentPipelineIndex);
return driverModePipeline;
} else {
return pipelines.get(currentPipelineIndex);
}
} }
public void setCurrentPipeline(int index) { public void setCurrentPipeline(int index) {
@@ -116,6 +114,9 @@ public class PipelineManager {
} }
} }
newPipeline.initPipeline(parentProcess.getCamera()); newPipeline.initPipeline(parentProcess.getCamera());
if(ntIndexEntry != null) {
ntIndexEntry.setDouble(index);
}
} }
} }