diff --git a/Main/src/main/java/Classes/SettingsManager.java b/Main/src/main/java/Classes/SettingsManager.java index 85b98e95b..0685a9c9d 100644 --- a/Main/src/main/java/Classes/SettingsManager.java +++ b/Main/src/main/java/Classes/SettingsManager.java @@ -1,7 +1,36 @@ package Classes; import Classes.MetaClass.Singleton; +import Objects.*; +import org.json.JSONObject; + +import java.util.HashMap; + public class SettingsManager extends Singleton { public static int x = 5; // example of how to setup variable in singleton + public static HashMap cams = new HashMap(); + public static HashMap UsbCameras = new HashMap(); + public static HashMap USBCamerasInfo = new HashMap(); + public static DefaultGeneralSettings GeneralSettings; + public static HashMap CameraPort = new HashMap(); + public static HashMap CamerasCurrentPipeline = new HashMap(); + public SettingsManager(){ + InitiateGeneralSettings(); + InitiateCamerasInfo(); + InitiateUsbCameras(); + InitiateUsbCamerasSettings(); + } + private void InitiateGeneralSettings(){ + + } + private void InitiateCamerasInfo(){ + + } + private void InitiateUsbCameras(){ + + } + private void InitiateUsbCamerasSettings(){ + + } } diff --git a/Main/src/main/java/Main.java b/Main/src/main/java/Main.java index 25162caa3..70ab90cb6 100644 --- a/Main/src/main/java/Main.java +++ b/Main/src/main/java/Main.java @@ -1,7 +1,10 @@ +import Classes.SettingsManager; import Handlers.Web.Server; public class Main { public static void main(String [] args) { + SettingsManager Manager = new SettingsManager(); Server.main(8888); } } + diff --git a/Main/src/main/java/Objects/DefaultGeneralSettings.java b/Main/src/main/java/Objects/DefaultGeneralSettings.java new file mode 100644 index 000000000..4954a9ea1 --- /dev/null +++ b/Main/src/main/java/Objects/DefaultGeneralSettings.java @@ -0,0 +1,14 @@ +package Objects; + +public class DefaultGeneralSettings { + public int team_number = 1577; + public String connection_type = "DHCP"; + public String ip = ""; + public String gateway = ""; + public String netmask = ""; + public String hostname = "Chameleon-Vision"; + public String curr_camera = ""; + public String curr_pipeline = ""; + + +} diff --git a/Main/src/main/java/Objects/DefaultPipeline.java b/Main/src/main/java/Objects/DefaultPipeline.java new file mode 100644 index 000000000..a8f678919 --- /dev/null +++ b/Main/src/main/java/Objects/DefaultPipeline.java @@ -0,0 +1,22 @@ +package Objects; +import java.util.Arrays; +import java.util.List; + +public class DefaultPipeline { + public int exposure = 50; + public int brightness = 50; + public String orientation = "Normal"; + public List hue = Arrays.asList(0,100); + public List saturation = Arrays.asList(0,100); + public List value = Arrays.asList(0,100); + public boolean erode = false; + public boolean dilate = false; + public List area = Arrays.asList(0,100); + public List ratio = Arrays.asList(0,20); + public List extent = Arrays.asList(0,100); + public boolean is_binary = false; + public String sort_mode = "Largest"; + public String target_intersection = "Largest"; + public double M = 1; + public double B = 0; +} diff --git a/Main/target/classes/Main.class b/Main/target/classes/Main.class deleted file mode 100644 index 07a95badb..000000000 Binary files a/Main/target/classes/Main.class and /dev/null differ