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

Adjusted folder structure to sit under com.chameleonvision package

Browse Source
This commit is contained in:
Banks Troutman
2019-09-15 15:03:44 -04:00
parent ec5a94d076
commit 25652ba32e
11 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Main/src/main/java/Main.java
View File

@@ -1,9 +1,7 @@
import Classes.SettingsManager;
import Handlers.Vision.CameraProcess;
import Handlers.Web.Server;
import com.chameleonvision.settings.SettingsManager;
import com.chameleonvision.vision.process.CameraProcess;
import com.chameleonvision.web.Server;
import edu.wpi.cscore.UsbCamera;
import edu.wpi.first.networktables.NetworkTable;
import edu.wpi.first.networktables.NetworkTableInstance;
import java.util.Map;

2
Main/src/main/java/Exceptions/NoCameraException.java → Main/src/main/java/com/chameleonvision/NoCameraException.java
View File

@@ -1,4 +1,4 @@
package Exceptions;
package com.chameleonvision;
public class NoCameraException extends Exception {
public NoCameraException(){

17
Main/src/main/java/Classes/SettingsManager.java → Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
View File

@@ -1,10 +1,13 @@
package Classes;
import Exceptions.NoCameraException;
import Objects.*;
package com.chameleonvision.settings;
import com.chameleonvision.NoCameraException;
import java.io.*;
import java.nio.file.*;
import Objects.CamVideoMode;
import com.chameleonvision.vision.CamVideoMode;
import com.chameleonvision.vision.Camera;
import com.chameleonvision.vision.GeneralSettings;
import com.chameleonvision.vision.Pipeline;
import com.google.gson.Gson;
import java.util.ArrayList;
import java.util.HashMap;
@@ -33,10 +36,10 @@ public class SettingsManager {
}
return instance;
}
public static HashMap<String,Camera> Cameras = new HashMap<String, Camera>();
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 Objects.GeneralSettings GeneralSettings;
public static com.chameleonvision.vision.GeneralSettings GeneralSettings;
public static HashMap<String, String> CamerasCurrentPipeline = new HashMap<String, String>();
public static HashMap<String,String> CameraPort = new HashMap<String, String>();
private Path SettingsPath = Paths.get(System.getProperty("user.dir"),"Settings");
@@ -47,7 +50,7 @@ public class SettingsManager {
private void InitiateGeneralSettings(){
CheckPath(SettingsPath);
try {
GeneralSettings = new Gson().fromJson(new FileReader(Paths.get(SettingsPath.toString(),"Settings.json").toString()), Objects.GeneralSettings.class);
GeneralSettings = new Gson().fromJson(new FileReader(Paths.get(SettingsPath.toString(),"Settings.json").toString()), com.chameleonvision.vision.GeneralSettings.class);
} catch (FileNotFoundException e) {
GeneralSettings = new GeneralSettings();
}

2
Main/src/main/java/Objects/CamVideoMode.java → Main/src/main/java/com/chameleonvision/vision/CamVideoMode.java
View File

@@ -1,4 +1,4 @@
package Objects;
package com.chameleonvision.vision;
public class CamVideoMode {
public int fps;

2
Main/src/main/java/Objects/Camera.java → Main/src/main/java/com/chameleonvision/vision/Camera.java
View File

@@ -1,4 +1,4 @@
package Objects;
package com.chameleonvision.vision;
import java.util.HashMap;

4
Main/src/main/java/Objects/GeneralSettings.java → Main/src/main/java/com/chameleonvision/vision/GeneralSettings.java
View File

@@ -1,4 +1,4 @@
package Objects;
package com.chameleonvision.vision;
public class GeneralSettings {
public int team_number = 1577;
@@ -6,7 +6,7 @@ public class GeneralSettings {
public String ip = "";
public String gateway = "";
public String netmask = "";
public String hostname = "Chameleon-Vision";
public String hostname = "Chameleon-vision";
public String curr_camera = "";
public String curr_pipeline = "";

2
Main/src/main/java/Objects/Pipeline.java → Main/src/main/java/com/chameleonvision/vision/Pipeline.java
View File

@@ -1,4 +1,4 @@
package Objects;
package com.chameleonvision.vision;
import java.util.Arrays;
import java.util.List;

14
Main/src/main/java/Handlers/Vision/CameraProcess.java → Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java
View File

@@ -1,16 +1,12 @@
package Handlers.Vision;
package com.chameleonvision.vision.process;
import Classes.SettingsManager;
import Objects.Pipeline;
import edu.wpi.first.networktables.NetworkTable;
import com.chameleonvision.settings.SettingsManager;
import com.chameleonvision.vision.Pipeline;
import edu.wpi.first.networktables.NetworkTableInstance;
import edu.wpi.first.cameraserver.CameraServer;
import org.opencv.core.Mat;
import org.apache.commons.math3.fraction.Fraction;
import org.apache.commons.math3.util.FastMath;
import org.opencv.core.MatOfPoint;
import java.util.List;
public class CameraProcess implements Runnable{
private String CameraName;
@@ -25,9 +21,9 @@ public class CameraProcess implements Runnable{
CameraServer cs = CameraServer.getInstance();
NetworkTableInstance networkTableInstance = NetworkTableInstance.getDefault();
SettingsManager manager = SettingsManager.getInstance();
manager.CamerasCurrentPipeline.put(CameraName,manager.Cameras.get(CameraName).pipelines.keySet().toArray()[0].toString());
SettingsManager.CamerasCurrentPipeline.put(CameraName, SettingsManager.Cameras.get(CameraName).pipelines.keySet().toArray()[0].toString());
//Setting up camera and network table
var Table = networkTableInstance.getTable("/Chameleon-Vision/" + CameraName);
var Table = networkTableInstance.getTable("/Chameleon-vision/" + CameraName);
var PipeLineEntry = Table.getEntry("Pipeline");
var DriverModeEntry = Table.getEntry("Driver_Mode");
var cv_sink = cs.getVideo(manager.UsbCameras.get(CameraName));

3
Main/src/main/java/Handlers/Vision/VisionProcess.java → Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
View File

@@ -1,10 +1,9 @@
package Handlers.Vision;
package com.chameleonvision.vision.process;
import org.jetbrains.annotations.NotNull;
import org.opencv.core.*;
import org.opencv.imgproc.*;
import javax.swing.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

5
Main/src/main/java/Handlers/Web/Server.java → Main/src/main/java/com/chameleonvision/web/Server.java
View File

@@ -1,11 +1,10 @@
package Handlers.Web;
package com.chameleonvision.web;
import Classes.SettingsManager;
import com.chameleonvision.settings.SettingsManager;
import io.javalin.Javalin;
import io.javalin.websocket.WsContext;
import java.util.ArrayList;
import java.util.List;
import org.json.JSONObject;
public class Server {
private static List<WsContext> users = new ArrayList<WsContext>();