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

removed unnecessary save of cameras current pipline

Browse Source
This commit is contained in:
Unknown
2019-09-18 10:36:29 +03:00
parent 7fdab7d3db
commit 5b75c85c0f
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ public class SettingsManager {
private static SettingsManager instance;
private SettingsManager() {
InitiateSavedSettings();
InitiateGeneralSettings();
InitiateCamerasInfo();
InitiateUsbCameras();
InitiateCameras();
@@ -57,11 +57,9 @@ public class SettingsManager {
private Path CamsPath = Paths.get(SettingsPath.toString(), "Cams");
private void InitiateSavedSettings() {
private void InitiateGeneralSettings() {
CheckPath(SettingsPath);
try {
CamerasCurrentPipeline = new Gson().fromJson(new FileReader(Paths.get(SettingsPath.toString(),"SelectedPipelines.json").toString()),HashMap.class);
// CamerasCurrentPipeline = new JSONArray(Paths.get(SettingsPath.toString(),"SelectedPipelines.json")).toList();
GeneralSettings = new Gson().fromJson(new FileReader(Paths.get(SettingsPath.toString(), "Settings.json").toString()), com.chameleonvision.vision.GeneralSettings.class);
} catch (FileNotFoundException e) {
GeneralSettings = new GeneralSettings();
@@ -157,7 +155,6 @@ public class SettingsManager {
CreateNewPipeline(null,cam);
CreateNewPipeline(null,cam);//Created 2 pipeline for testing TODO add a create pipeline button
CamerasCurrentPipeline.put(CameraName,"pipeline0");//sets pipeline0 as the default pipeline
}
@@ -227,7 +224,6 @@ public class SettingsManager {
public void SaveSettings() {
SaveCameras();
SaveGeneralSettings();
SaveSelectedPipelines();
}
private void SaveCameras() {
@@ -254,16 +250,4 @@ public class SettingsManager {
e.printStackTrace();
}
}
private void SaveSelectedPipelines() {
try {
FileWriter writer = new FileWriter(Paths.get(SettingsPath.toString(), "SelectedPipelines.json").toString());
new Gson().toJson(CamerasCurrentPipeline, writer);
writer.flush();
writer.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}

4
Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java
View File

@@ -102,9 +102,9 @@ public class CameraProcess implements Runnable {
FoundContours.clear();
FilteredContours.clear();
GroupedContours.clear();
SettingsManager.CamerasCurrentPipeline.put(CameraName,SettingsManager.Cameras.get(CameraName).pipelines.keySet().stream().findFirst().toString());
currentPipeline = SettingsManager.Cameras.get(CameraName).pipelines.get(SettingsManager.CamerasCurrentPipeline.get(CameraName));
// System.out.println(SettingsManager.CamerasCurrentPipeline.get(CameraName));
// start fps counter right before grabbing input frame
startTime = System.nanoTime();