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

type fix and added full setting save

Browse Source
This commit is contained in:
ori agranat
2019-10-21 20:22:39 +03:00
parent c6cd86d8db
commit 717e4f3568
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Main/src/main/java/com/chameleonvision/web/ServerHandler.java
View File

@@ -52,6 +52,7 @@ public class ServerHandler {
for (HashMap.Entry<String, Object> e : ((HashMap<String, Object>) entry.getValue()).entrySet()) {
setField(SettingsManager.GeneralSettings, e.getKey(), e.getValue());
}
SettingsManager.saveSettings();
break;
}
case "cameraSettings": {
@@ -59,6 +60,7 @@ public class ServerHandler {
CameraManager.getCurrentCamera().setFOV((Number) camSettings.get("fov"));
CameraManager.getCurrentCamera().setStreamDivisor((Integer) camSettings.get("streamDivisor"));
CameraManager.getCurrentCamera().setCamVideoMode((Integer) camSettings.get("resolution"), true);
SettingsManager.saveSettings();
break;
}
case "changeCameraName": {
@@ -89,6 +91,7 @@ public class ServerHandler {
CameraManager.setCurrentCamera((String) entry.getValue());
HashMap<String, Object> tmp = new HashMap<>();
tmp.put("pipeline", CameraManager.getCurrentCamera().getCurrentPipeline());
tmp.put("pipelineList", CameraManager.getCurrentCamera().getPipelines().keySet());
tmp.put("port", CameraManager.getCurrentCamera().getStreamPort());
tmp.put("resolutionList", CameraManager.getResolutionList());
broadcastMessage(tmp);

4
chameleon-client/src/views/SettingsViewes/Cameras.vue
View File

@@ -1,8 +1,8 @@
<template>
<div>
<CVselect name="Camera" :list="cameraList" v-model="currentCameraIndex"></CVselect>
<CVselect name="Resulotion" v-model="cameraSettings.resolution" :list="resolutionList"></CVselect>
<CVselect name="Stream Resulotion" v-model="cameraSettings.streamDivisor" :list="['1:1','1:2','1:4','1:6']"></CVselect>
<CVselect name="Resolution" v-model="cameraSettings.resolution" :list="resolutionList"></CVselect>
<CVselect name="Stream Resolution" v-model="cameraSettings.streamDivisor" :list="['1:1','1:2','1:4','1:6']"></CVselect>
<CVnumberinput name="Diagonal FOV" v-model="cameraSettings.fov" ></CVnumberinput>
<v-btn style="margin-top:10px" small color="#4baf62" @click="sendCameraSettings">Save Camera Settings</v-btn>
</div>