diff --git a/src/main/java/id/co/gtc/erhacam/AutoCloseAlert.java b/src/main/java/id/co/gtc/erhacam/AutoCloseAlert.java index 16094cc..486dc11 100644 --- a/src/main/java/id/co/gtc/erhacam/AutoCloseAlert.java +++ b/src/main/java/id/co/gtc/erhacam/AutoCloseAlert.java @@ -52,8 +52,11 @@ public class AutoCloseAlert { Cam1 = new Circle(10, Color.RED); Cam2 = new Circle(10, Color.RED); Cam3 = new Circle(10, Color.RED); - Cam4 = new Circle(10, Color.RED); - Cam5 = new Circle(10, Color.RED); + if (!DermiesMode){ + Cam4 = new Circle(10, Color.RED); + Cam5 = new Circle(10, Color.RED); + } + } public static void ChangeCamStatus(int id, boolean active){ @@ -61,8 +64,8 @@ public class AutoCloseAlert { case 1 -> Cam1; case 2 -> Cam2; case 3 -> Cam3; - case 4 -> Cam4; - case 5 -> Cam5; + case 4 -> DermiesMode? null: Cam4; + case 5 -> DermiesMode ? null : Cam5; default -> null; }; if (x!=null){ @@ -236,7 +239,8 @@ public class AutoCloseAlert { imageView.setSmooth(true); stackPane.getChildren().add(imageView); } - HBox CamStatus = new HBox(30, Cam1, Cam2, Cam3, Cam4, Cam5); + + HBox CamStatus = DermiesMode ? new HBox(30, Cam1, Cam2, Cam3) : new HBox(30, Cam1, Cam2, Cam3, Cam4, Cam5); CamStatus.setMinHeight(60); CamStatus.setAlignment(Pos.CENTER); diff --git a/src/main/java/id/co/gtc/erhacam/CaptureView.java b/src/main/java/id/co/gtc/erhacam/CaptureView.java index 438f4f5..e7b8082 100644 --- a/src/main/java/id/co/gtc/erhacam/CaptureView.java +++ b/src/main/java/id/co/gtc/erhacam/CaptureView.java @@ -604,8 +604,10 @@ public class CaptureView { LoadCameraDetail(cam1, 1, CameraConfigEnum.CameraConfigLeft90); LoadCameraDetail(cam2, 2, CameraConfigEnum.CameraConfigLeft45); LoadCameraDetail(cam3, 3, CameraConfigEnum.CameraConfigCenter); - LoadCameraDetail(cam4, 4, CameraConfigEnum.CameraConfigRight45); - LoadCameraDetail(cam5, 5, CameraConfigEnum.CameraConfigRight90); + if (!DermiesMode){ + LoadCameraDetail(cam4, 4, CameraConfigEnum.CameraConfigRight45); + LoadCameraDetail(cam5, 5, CameraConfigEnum.CameraConfigRight90); + } Platform.runLater(()->{ clear(); diff --git a/src/main/java/id/co/gtc/erhacam/MainApplication.java b/src/main/java/id/co/gtc/erhacam/MainApplication.java index 52969db..1eb797e 100644 --- a/src/main/java/id/co/gtc/erhacam/MainApplication.java +++ b/src/main/java/id/co/gtc/erhacam/MainApplication.java @@ -47,10 +47,24 @@ public class MainApplication extends Application { String UserID = Integer.toHexString(sd.ReadUserID()) ; sd.Close(); - if (UserID.equals("14022025") || UserID.equals("03102025")){ - // 14022025 = Erha, 03102025 = Dermies + if (UserID.equals("14022025") || UserID.equals("3102025")){ + // 14022025 = Erha, 3102025 = Dermies DermiesMode = !UserID.equals("14022025"); - Logger.info("Secure Dongle UserID valid"); + Logger.info("Secure Dongle UserID valid for "+(DermiesMode?"Dermies":"Erha")); + if (DermiesMode){ + boolean needsave = false; + if (!config.getCameraRight45().isEmpty()){ + System.out.println("Dermies mode, disable Camera 4"); + config.SetCameraRight45(""); + needsave = true; + } + if (!config.getCameraRight90().isEmpty()){ + System.out.println("Dermies mode, disable Camera 5"); + config.SetCameraRight90(""); + needsave = true; + } + if (needsave) config.Save(); + } FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml")); Screen screen = Screen.getPrimary(); Rectangle2D screenbound = screen.getBounds(); diff --git a/src/main/java/id/co/gtc/erhacam/MainView.java b/src/main/java/id/co/gtc/erhacam/MainView.java index b0c19cd..1188ea6 100644 --- a/src/main/java/id/co/gtc/erhacam/MainView.java +++ b/src/main/java/id/co/gtc/erhacam/MainView.java @@ -9,6 +9,7 @@ import javafx.scene.layout.AnchorPane; import javafx.scene.layout.Pane; import org.tinylog.Logger; +import static Config.SomeCodes.DermiesMode; import static Config.SomeCodes.ValidString; @SuppressWarnings("unused") @@ -41,8 +42,9 @@ public class MainView { @FXML private void CaptureClick(ActionEvent event){ - if (currentselected.equals("capture-view.fxml")) return; - loadContent("capture-view.fxml"); + String fxmlfile = DermiesMode?"capture-view-dermies.fxml":"capture-view.fxml"; + if (currentselected.equals(fxmlfile)) return; + loadContent(fxmlfile); } @FXML diff --git a/src/main/java/id/co/gtc/erhacam/SettingView.java b/src/main/java/id/co/gtc/erhacam/SettingView.java index e7cd41e..3df9e38 100644 --- a/src/main/java/id/co/gtc/erhacam/SettingView.java +++ b/src/main/java/id/co/gtc/erhacam/SettingView.java @@ -13,15 +13,37 @@ import static Config.SomeCodes.*; public class SettingView { @FXML - private ComboBox CameraLeft90; + private Label lblCamera1; @FXML - private ComboBox CameraLeft45; + private Label lblCamera2; @FXML - private ComboBox CameraCenter; + private Label lblCamera3; @FXML - private ComboBox CameraRight45; + private Label lblCamera4; @FXML - private ComboBox CameraRight90; + private Label lblCamera5; + + @FXML + private ComboBox Camera1; + @FXML + private ComboBox Camera2; + @FXML + private ComboBox Camera3; + @FXML + private ComboBox Camera4; + @FXML + private ComboBox Camera5; + + @FXML + private Button ApplyCamera1; + @FXML + private Button ApplyCamera2; + @FXML + private Button ApplyCamera3; + @FXML + private Button ApplyCamera4; + @FXML + private Button ApplyCamera5; @FXML private TextField FTPHost; @@ -316,32 +338,60 @@ public class SettingView { Platform.runLater(()->{ - CameraLeft90.getItems().clear(); - CameraLeft45.getItems().clear(); - CameraCenter.getItems().clear(); - CameraRight45.getItems().clear(); - CameraRight90.getItems().clear(); + if (DermiesMode){ + lblCamera4.setVisible(false); + lblCamera5.setVisible(false); + Camera4.setVisible(false); + Camera5.setVisible(false); + ApplyCamera4.setVisible(false); + ApplyCamera5.setVisible(false); + Cam4BottomCrop.setVisible(false); + Cam5BottomCrop.setVisible(false); + Cam4TopCrop.setVisible(false); + Cam5TopCrop.setVisible(false); + Cam4LeftCrop.setVisible(false); + Cam5LeftCrop.setVisible(false); + Cam4RightCrop.setVisible(false); + Cam5RightCrop.setVisible(false); + } + + Camera1.getItems().clear(); + Camera2.getItems().clear(); + Camera3.getItems().clear(); + if (!DermiesMode){ + Camera4.getItems().clear(); + Camera5.getItems().clear(); + } + + Camera1.getItems().add(""); + Camera2.getItems().add(""); + Camera3.getItems().add(""); + if (!DermiesMode){ + Camera4.getItems().add(""); + Camera5.getItems().add(""); + } - CameraLeft90.getItems().add(""); - CameraLeft45.getItems().add(""); - CameraCenter.getItems().add(""); - CameraRight45.getItems().add(""); - CameraRight90.getItems().add(""); for(String camera: cameranames){ Logger.info("adding camera : "+camera+" to camera list"); - CameraLeft90.getItems().add(camera); - CameraLeft45.getItems().add(camera); - CameraCenter.getItems().add(camera); - CameraRight45.getItems().add(camera); - CameraRight90.getItems().add(camera); + Camera1.getItems().add(camera); + Camera2.getItems().add(camera); + Camera3.getItems().add(camera); + if (!DermiesMode){ + Camera4.getItems().add(camera); + Camera5.getItems().add(camera); + } + + } + + Camera1.setValue(config.getCameraLeft90()); + Camera2.setValue(config.getCameraLeft45()); + Camera3.setValue(config.getCameraCenter()); + if (!DermiesMode){ + Camera4.setValue(config.getCameraRight45()); + Camera5.setValue(config.getCameraRight90()); } - CameraLeft90.setValue(config.getCameraLeft90()); - CameraLeft45.setValue(config.getCameraLeft45()); - CameraCenter.setValue(config.getCameraCenter()); - CameraRight45.setValue(config.getCameraRight45()); - CameraRight90.setValue(config.getCameraRight90()); TextFieldSetText(FTPHost,config.getFTPHost()); TextFieldSetText(FTPPort,config.getFTPPort()); @@ -374,14 +424,17 @@ public class SettingView { TextFieldSetText(Cam3BottomCrop,String.valueOf(config.getCam3BottomCrop())); TextFieldSetText(Cam3LeftCrop,String.valueOf(config.getCam3LeftCrop())); TextFieldSetText(Cam3RightCrop,String.valueOf(config.getCam3RightCrop())); - TextFieldSetText(Cam4TopCrop,String.valueOf(config.getCam4TopCrop())); - TextFieldSetText(Cam4BottomCrop,String.valueOf(config.getCam4BottomCrop())); - TextFieldSetText(Cam4LeftCrop,String.valueOf(config.getCam4LeftCrop())); - TextFieldSetText(Cam4RightCrop,String.valueOf(config.getCam4RightCrop())); - TextFieldSetText(Cam5TopCrop,String.valueOf(config.getCam5TopCrop())); - TextFieldSetText(Cam5BottomCrop,String.valueOf(config.getCam5BottomCrop())); - TextFieldSetText(Cam5LeftCrop,String.valueOf(config.getCam5LeftCrop())); - TextFieldSetText(Cam5RightCrop,String.valueOf(config.getCam5RightCrop())); + if (!DermiesMode){ + TextFieldSetText(Cam4TopCrop,String.valueOf(config.getCam4TopCrop())); + TextFieldSetText(Cam4BottomCrop,String.valueOf(config.getCam4BottomCrop())); + TextFieldSetText(Cam4LeftCrop,String.valueOf(config.getCam4LeftCrop())); + TextFieldSetText(Cam4RightCrop,String.valueOf(config.getCam4RightCrop())); + TextFieldSetText(Cam5TopCrop,String.valueOf(config.getCam5TopCrop())); + TextFieldSetText(Cam5BottomCrop,String.valueOf(config.getCam5BottomCrop())); + TextFieldSetText(Cam5LeftCrop,String.valueOf(config.getCam5LeftCrop())); + TextFieldSetText(Cam5RightCrop,String.valueOf(config.getCam5RightCrop())); + } + }); } @@ -392,27 +445,27 @@ public class SettingView { @FXML private void ApplyCameraLeft90(){ - config.SetCameraLeft90(CameraLeft90.getValue()); + config.SetCameraLeft90(Camera1.getValue()); } @FXML private void ApplyCameraLeft45(){ - config.SetCameraLeft45(CameraLeft45.getValue()); + config.SetCameraLeft45(Camera2.getValue()); } @FXML private void ApplyCameraFront(){ - config.SetCameraCenter(CameraCenter.getValue()); + config.SetCameraCenter(Camera3.getValue()); } @FXML private void ApplyCameraRight45(){ - config.SetCameraRight45(CameraRight45.getValue()); + config.SetCameraRight45(Camera4.getValue()); } @FXML private void ApplyCameraRight90(){ - config.SetCameraRight90(CameraRight90.getValue()); + config.SetCameraRight90(Camera5.getValue()); } @FXML diff --git a/src/main/resources/id/co/gtc/erhacam/capture-view-dermies.fxml b/src/main/resources/id/co/gtc/erhacam/capture-view-dermies.fxml new file mode 100644 index 0000000..5411424 --- /dev/null +++ b/src/main/resources/id/co/gtc/erhacam/capture-view-dermies.fxml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/id/co/gtc/erhacam/setting-view.fxml b/src/main/resources/id/co/gtc/erhacam/setting-view.fxml index 57839c1..3ef4a42 100644 --- a/src/main/resources/id/co/gtc/erhacam/setting-view.fxml +++ b/src/main/resources/id/co/gtc/erhacam/setting-view.fxml @@ -62,77 +62,77 @@ - - - - - - + - + - + - + - + -