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

Fix pipeline renaming and saving, RotationMode UI fix

Browse Source
This commit is contained in:
Banks Troutman
2019-11-29 00:30:29 -05:00
parent 0b1e0e4701
commit 25613d2625
8 changed files with 56 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Main/src/main/java/com/chameleonvision/web/SocketHandler.java
View File

@@ -6,7 +6,6 @@ import com.chameleonvision.vision.VisionProcess;
import com.chameleonvision.vision.camera.CameraCapture;
import com.chameleonvision.vision.enums.ImageRotationMode;
import com.chameleonvision.vision.pipeline.CVPipeline;
import com.chameleonvision.vision.pipeline.CVPipeline2dSettings;
import com.chameleonvision.vision.pipeline.CVPipelineSettings;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -16,7 +15,6 @@ import io.javalin.websocket.WsCloseContext;
import io.javalin.websocket.WsConnectContext;
import io.javalin.websocket.WsContext;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.SerializationUtils;
import org.msgpack.jackson.dataformat.MessagePackFactory;
import java.lang.reflect.Field;
@@ -86,15 +84,20 @@ public class SocketHandler {
CVPipelineSettings origPipeline = currentProcess.getPipelineByIndex(pipelineIndex).settings;
String val = mapper.writeValueAsString(origPipeline);
CVPipelineSettings newPipeline = mapper.readValue(val, origPipeline.getClass());
newPipeline.nickname += "(Copy)";
if (cameraIndex != -1) {
VisionProcess newProcess = VisionManager.getVisionProcessByIndex(cameraIndex);
if (newProcess != null) {
VisionManager.addPipelineToCamera(newPipeline, newProcess);
newProcess.addPipeline(newPipeline);
}
} else {
VisionManager.addPipelineToCamera(newPipeline, currentProcess);
currentProcess.addPipeline(newPipeline);
}
VisionManager.saveCurrentCameraPipelines();
sendFullSettings();
break;