Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-20 00:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed general settings naming and added general settings save in ui

Browse Source
This commit is contained in:
ori agranat
2019-10-15 21:00:18 +03:00
parent 91a1338022
commit cd94c9f8c0
13 changed files with 72 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
View File

@@ -32,10 +32,10 @@ public class SettingsManager {
// netSettings.run();
// }
var allCameras = CameraManager.getAllCamerasByName();
if (!allCameras.containsKey(GeneralSettings.curr_camera) && allCameras.size() > 0) {
if (!allCameras.containsKey(GeneralSettings.currentCamera) && allCameras.size() > 0) {
var cam = allCameras.entrySet().stream().findFirst().get().getValue();
GeneralSettings.curr_camera = cam.name;
GeneralSettings.curr_pipeline = cam.getCurrentPipelineIndex();
GeneralSettings.currentCamera = cam.name;
GeneralSettings.currentPipeline = cam.getCurrentPipelineIndex();
}
}
@@ -49,12 +49,12 @@ public class SettingsManager {
}
public static void updateCameraSetting(String cameraName, int pipelineNumber) {
GeneralSettings.curr_camera = cameraName;
GeneralSettings.curr_pipeline = pipelineNumber;
GeneralSettings.currentCamera = cameraName;
GeneralSettings.currentPipeline = pipelineNumber;
}
public static void updatePipelineSetting(int pipelineNumber) {
GeneralSettings.curr_pipeline = pipelineNumber;
GeneralSettings.currentPipeline = pipelineNumber;
}
public static void saveSettings() {