From 55aa11b08ea92c77fd0ece39e82f781f060a298b Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Wed, 11 Sep 2019 22:07:24 +0300
Subject: [PATCH] added settings manager variablers

---
 .../main/java/Classes/SettingsManager.java    |  29 ++++++++++++++++++
 Main/src/main/java/Main.java                  |   3 ++
 .../java/Objects/DefaultGeneralSettings.java  |  14 +++++++++
 .../main/java/Objects/DefaultPipeline.java    |  22 +++++++++++++
 Main/target/classes/Main.class                | Bin 407 -> 0 bytes
 5 files changed, 68 insertions(+)
 create mode 100644 Main/src/main/java/Objects/DefaultGeneralSettings.java
 create mode 100644 Main/src/main/java/Objects/DefaultPipeline.java
 delete mode 100644 Main/target/classes/Main.class

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<Integer> hue = Arrays.asList(0,100);
+    public List<Integer> saturation = Arrays.asList(0,100);
+    public List<Integer> value = Arrays.asList(0,100);
+    public boolean erode = false;
+    public boolean dilate = false;
+    public List<Integer> area = Arrays.asList(0,100);
+    public List<Integer> ratio = Arrays.asList(0,20);
+    public List<Integer> 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 07a95badbe98c465b880d4a9f52d69326ec9c7cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 407
zcmZvXK~KU!5QX1Dp|(~LP}HNIiU)c!F~N8-F`868)YOBgEo|zNQj(?czdT7i_yhb=
z#<ys~#U9?|&Aj<$`}O_t3E%?9J{)v>bg}Q^z(r4>d8tcXT?y2~ek$Nx&&Eoi73)$x
zET)+<Pckdm>BO^<EK+H-^?yyLdew6>;(MvfA-AWj0=@7hp2($)3R&h+QW;(5!!=!+
zocZoQV*x*zEzC&WXnW4H#DRqbXrSrhFhGDKp0ERfy$$~{o2XGm>a8rtg);N#S!Ge8
z%u*TV!@GWp6V&<V_NzfyAl0RdSOsh2>>c85J>H_)v5k7v;5Pst+jJiN4m)=FoYm&s
d_UUSc+GgG7DtNESOB;lXU9{Ne<Eb^Ye*jAjNO1rF