diff --git a/.gitignore b/.gitignore index c85194bf6..ef32c47e9 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,5 @@ fabric.properties .idea/caches/build_file_checksums.ser Main/Settings/ +Main/.gradle +Main/target diff --git a/Main/src/main/java/Main.java b/Main/src/main/java/Main.java index 10ccd73f4..fc584e472 100644 --- a/Main/src/main/java/Main.java +++ b/Main/src/main/java/Main.java @@ -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; diff --git a/Main/src/main/java/Exceptions/NoCameraException.java b/Main/src/main/java/com/chameleonvision/NoCameraException.java similarity index 81% rename from Main/src/main/java/Exceptions/NoCameraException.java rename to Main/src/main/java/com/chameleonvision/NoCameraException.java index 320671431..063da8f48 100644 --- a/Main/src/main/java/Exceptions/NoCameraException.java +++ b/Main/src/main/java/com/chameleonvision/NoCameraException.java @@ -1,4 +1,4 @@ -package Exceptions; +package com.chameleonvision; public class NoCameraException extends Exception { public NoCameraException(){ diff --git a/Main/src/main/java/Classes/SettingsManager.java b/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java similarity index 94% rename from Main/src/main/java/Classes/SettingsManager.java rename to Main/src/main/java/com/chameleonvision/settings/SettingsManager.java index 964776d56..e714a3a41 100644 --- a/Main/src/main/java/Classes/SettingsManager.java +++ b/Main/src/main/java/com/chameleonvision/settings/SettingsManager.java @@ -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 Cameras = new HashMap(); + public static HashMap Cameras = new HashMap(); public static HashMap UsbCameras = new HashMap(); public static HashMap USBCamerasInfo = new HashMap(); - public static Objects.GeneralSettings GeneralSettings; + public static com.chameleonvision.vision.GeneralSettings GeneralSettings; public static HashMap CamerasCurrentPipeline = new HashMap(); public static HashMap CameraPort = new HashMap(); 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(); } diff --git a/Main/src/main/java/Objects/CamVideoMode.java b/Main/src/main/java/com/chameleonvision/vision/CamVideoMode.java similarity index 78% rename from Main/src/main/java/Objects/CamVideoMode.java rename to Main/src/main/java/com/chameleonvision/vision/CamVideoMode.java index 503971884..a288d100e 100644 --- a/Main/src/main/java/Objects/CamVideoMode.java +++ b/Main/src/main/java/com/chameleonvision/vision/CamVideoMode.java @@ -1,4 +1,4 @@ -package Objects; +package com.chameleonvision.vision; public class CamVideoMode { public int fps; diff --git a/Main/src/main/java/Objects/Camera.java b/Main/src/main/java/com/chameleonvision/vision/Camera.java similarity index 86% rename from Main/src/main/java/Objects/Camera.java rename to Main/src/main/java/com/chameleonvision/vision/Camera.java index 446258c36..d64bf4cb5 100644 --- a/Main/src/main/java/Objects/Camera.java +++ b/Main/src/main/java/com/chameleonvision/vision/Camera.java @@ -1,4 +1,4 @@ -package Objects; +package com.chameleonvision.vision; import java.util.HashMap; diff --git a/Main/src/main/java/Objects/GeneralSettings.java b/Main/src/main/java/com/chameleonvision/vision/GeneralSettings.java similarity index 76% rename from Main/src/main/java/Objects/GeneralSettings.java rename to Main/src/main/java/com/chameleonvision/vision/GeneralSettings.java index 843e6ffd0..c722d8ee8 100644 --- a/Main/src/main/java/Objects/GeneralSettings.java +++ b/Main/src/main/java/com/chameleonvision/vision/GeneralSettings.java @@ -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 = ""; diff --git a/Main/src/main/java/Objects/Pipeline.java b/Main/src/main/java/com/chameleonvision/vision/Pipeline.java similarity index 95% rename from Main/src/main/java/Objects/Pipeline.java rename to Main/src/main/java/com/chameleonvision/vision/Pipeline.java index 86344c11a..ef63c57cf 100644 --- a/Main/src/main/java/Objects/Pipeline.java +++ b/Main/src/main/java/com/chameleonvision/vision/Pipeline.java @@ -1,4 +1,4 @@ -package Objects; +package com.chameleonvision.vision; import java.util.Arrays; import java.util.List; diff --git a/Main/src/main/java/Handlers/Vision/CameraProcess.java b/Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java similarity index 88% rename from Main/src/main/java/Handlers/Vision/CameraProcess.java rename to Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java index 504227741..e1c907c89 100644 --- a/Main/src/main/java/Handlers/Vision/CameraProcess.java +++ b/Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java @@ -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)); diff --git a/Main/src/main/java/Handlers/Vision/VisionProcess.java b/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java similarity index 98% rename from Main/src/main/java/Handlers/Vision/VisionProcess.java rename to Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java index 90b5ae055..ea4d9c18f 100644 --- a/Main/src/main/java/Handlers/Vision/VisionProcess.java +++ b/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java @@ -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; diff --git a/Main/src/main/java/Handlers/Web/Server.java b/Main/src/main/java/com/chameleonvision/web/Server.java similarity index 92% rename from Main/src/main/java/Handlers/Web/Server.java rename to Main/src/main/java/com/chameleonvision/web/Server.java index 257b72a45..53400b829 100644 --- a/Main/src/main/java/Handlers/Web/Server.java +++ b/Main/src/main/java/com/chameleonvision/web/Server.java @@ -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 users = new ArrayList();