added current pipeline to full settings and current camera

This commit is contained in:
ori agranat
2019-10-25 15:57:46 +03:00
parent ec117e9884
commit 583154090b
2 changed files with 17 additions and 12 deletions

View File

@@ -1,5 +1,6 @@
package com.chameleonvision.vision.camera;
import com.chameleonvision.settings.GeneralSettings;
import com.chameleonvision.util.FileHelper;
import com.chameleonvision.settings.SettingsManager;
import com.chameleonvision.vision.Pipeline;
@@ -13,10 +14,7 @@ import org.opencv.videoio.VideoCapture;
import java.io.*;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
public class CameraManager {
@@ -103,6 +101,16 @@ public class CameraManager {
if (curCam == null) throw new CameraException(CameraException.CameraExceptionType.BAD_CAMERA);
return curCam;
}
public static Integer getCurrentCameraIndex() throws CameraException {
if (AllCamerasByName.size() == 0) throw new CameraException(CameraException.CameraExceptionType.NO_CAMERA);
List<String> arr = new ArrayList<>(AllCamerasByName.keySet());
for (var i = 0; i < AllCamerasByName.size(); i++){
if (SettingsManager.GeneralSettings.currentCamera.equals(arr.get(i))){
return i;
}
}
return null;
}
public static void setCurrentCamera(String cameraName) throws CameraException {
if (!AllCamerasByName.containsKey(cameraName))