added create new cam function

2026-06-21 01:01:41 +00:00 · 2019-09-13 20:08:40 +03:00
parent c1f335bab8
commit 2d4acbaf59
5 changed files with 144 additions and 15 deletions
--- a/Main/chameleon-vision.iml
+++ b/Main/chameleon-vision.iml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_12">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: io.javalin:javalin:3.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.31" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.31" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.31" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20190722" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.26" level="project" />
+    <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-java:2019.4.1" level="project" />
+    <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-jni:all:2019.4.1" level="project" />
+    <orderEntry type="library" name="Maven: edu.wpi.first.cameraserver:cameraserver-java:2019.4.1" level="project" />
+    <orderEntry type="library" name="Maven: edu.wpi.first.ntcore:ntcore-java:2019.4.1" level="project" />
+    <orderEntry type="library" name="Maven: edu.wpi.first.ntcore:ntcore-jni:all:2019.4.1" level="project" />
+    <orderEntry type="library" name="Maven: edu.wpi.first.wpiutil:wpiutil-java:2019.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.opencv:opencv-java:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
+  </component>
+</module>
--- a/Main/pom.xml
+++ b/Main/pom.xml
@@ -84,12 +84,12 @@
            <artifactId>wpiutil-java</artifactId>
            <version>RELEASE</version>
        </dependency>
-        <dependency>
-            <!--opencv libs for java-->
-            <groupId>org.opencv</groupId>
-            <artifactId>opencv-java</artifactId>
-            <version>RELEASE</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            &lt;!&ndash;opencv libs for java&ndash;&gt;-->
+<!--            <groupId>org.opencv</groupId>-->
+<!--            <artifactId>opencv-java</artifactId>-->
+<!--            <version>RELEASE</version>-->
+<!--        </dependency>-->
        <dependency>
            <!--apache common classes libs-->
            <groupId>org.apache.commons</groupId>
--- a/Main/src/main/java/Classes/SettingsManager.java
+++ b/Main/src/main/java/Classes/SettingsManager.java
@@ -2,13 +2,17 @@ package Classes;
 import Objects.*;
 import java.io.*;
 import java.nio.file.*;
+
+import Objects.VideoMode;
 import com.google.gson.Gson;

 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;

 import edu.wpi.cscore.*;
+import org.opencv.video.Video;
 import org.opencv.videoio.VideoCapture;

 public class SettingsManager  {
@@ -17,6 +21,7 @@ public class SettingsManager  {
        InitiateGeneralSettings();
        InitiateCamerasInfo();
        InitiateUsbCameras();
+        InitiateCameras();
        InitiateUsbCamerasSettings();
    }
    public static synchronized SettingsManager getInstance(){
@@ -29,8 +34,8 @@ public class SettingsManager  {
        }
        return instance;
    }
-    public static HashMap cams = new HashMap();
-    public static HashMap UsbCameras = new HashMap();
+    public static HashMap<String,Camera> Cameras = new HashMap<String, Camera>();
+    public static HashMap<String,UsbCamera> UsbCameras = new HashMap<String, UsbCamera>();
    public static HashMap<String,UsbCameraInfo> USBCamerasInfo = new HashMap<String,UsbCameraInfo>();
    public static DefaultGeneralSettings GeneralSettings;
    public static HashMap CameraPort = new HashMap();
@@ -40,13 +45,7 @@ public class SettingsManager  {


    private void InitiateGeneralSettings(){
-        if (!Files.exists(SettingsPath)){
-            try {
-                Files.createDirectories(SettingsPath);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
+        CheckPath(SettingsPath);
        try {
            GeneralSettings = new Gson().fromJson(new FileReader(Paths.get(SettingsPath.toString(),"Settings.json").toString()),DefaultGeneralSettings.class);
        } catch (FileNotFoundException e) {
@@ -76,9 +75,69 @@ public class SettingsManager  {
        }
    }
    private void InitiateUsbCameras(){
+        for(Map.Entry<String,UsbCameraInfo> entry : USBCamerasInfo.entrySet()){
+            var device = entry.getValue();
+            var camera = new UsbCamera(device.name, device.dev);
+            UsbCameras.put(device.name,camera);
+        }
+    }
+    private void InitiateCameras(){
+        CheckPath(CamsPath);
+        for(Map.Entry<String,UsbCameraInfo> entry: USBCamerasInfo.entrySet()){
+            var camPath = Paths.get(CamsPath.toString(),String.format("%s.json",entry.getKey()));
+            if(Files.exists(camPath)){
+                try {
+                    Camera cam = new Gson().fromJson(new FileReader(camPath.toString()),Camera.class);
+                    Cameras.put(entry.getKey(),cam);

+                } catch (FileNotFoundException e) {
+                    e.printStackTrace();
+                }
+            } else{
+                CreateNewCam(entry.getKey());
+            }
+        }
    }
    private void InitiateUsbCamerasSettings(){

    }
+    private void CheckPath(Path path){
+        if (!Files.exists(path)){
+            try {
+                Files.createDirectories(path);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    private void CreateNewCam(String CameraName){
+        Camera cam = new Camera();
+        var caminfo =USBCamerasInfo.get(CameraName);
+        cam.path = caminfo.path;
+        var videomode = UsbCameras.get(CameraName).enumerateVideoModes()[0];
+        VideoMode CamVideoMode = new VideoMode();
+        CamVideoMode.fps = videomode.fps;
+        CamVideoMode.heigh = videomode.height;
+        CamVideoMode.width = videomode.width;
+        CamVideoMode.pixel_format = videomode.pixelFormat.name();
+
+        cam.pipelines = new HashMap<String, DefaultPipeline>();
+        cam.resolution = 0;
+        cam.FOV = 60.8;
+        Cameras.put(CameraName,cam);
+        CreateNewPipeline("",CameraName);
+
+    }
+    private void CreateNewPipeline(String PipeName, String CamName){
+        if (CamName.equals("")){
+            CamName = GeneralSettings.curr_camera;
+        }
+        if (PipeName.equals("")){
+            var suffix = 0;
+            PipeName = "pipeline" + suffix;
+
+
+        }
+    }
+
 }
--- a/Main/src/main/java/Objects/Camera.java
+++ b/Main/src/main/java/Objects/Camera.java
@@ -0,0 +1,14 @@
+package Objects;
+
+import edu.wpi.cscore.UsbCameraInfo;
+
+import java.util.HashMap;
+
+public class Camera {
+    public Double FOV = 60.8;
+    public String path = "";
+    public HashMap<String,DefaultPipeline> pipelines;
+    public int resolution = 0;
+    public VideoMode videoMode;
+
+}
--- a/Main/src/main/java/Objects/VideoMode.java
+++ b/Main/src/main/java/Objects/VideoMode.java
@@ -0,0 +1,9 @@
+package Objects;
+
+public class VideoMode {
+    public int fps;
+    public int width;
+    public int heigh;
+    public String pixel_format;
+
+}