diff --git a/database.db b/database.db index 2f470de..7bc9b66 100644 Binary files a/database.db and b/database.db differ diff --git a/out/artifacts/ErhaCam_jar/ErhaCam.jar b/out/artifacts/ErhaCam_jar/ErhaCam.jar index 1fd27ad..9e7a7b1 100644 Binary files a/out/artifacts/ErhaCam_jar/ErhaCam.jar and b/out/artifacts/ErhaCam_jar/ErhaCam.jar differ diff --git a/src/main/java/id/co/gtc/erhacam/AutoCloseAlert.java b/src/main/java/id/co/gtc/erhacam/AutoCloseAlert.java index 3519846..a9635cf 100644 --- a/src/main/java/id/co/gtc/erhacam/AutoCloseAlert.java +++ b/src/main/java/id/co/gtc/erhacam/AutoCloseAlert.java @@ -46,9 +46,9 @@ public class AutoCloseAlert { public static void init(){ String f_01 = ExtractResource("/IU photoboth-01.jpg"); - System.out.println("Banner 01 extracted as file: "+f_01); + //System.out.println("Banner 01 extracted as file: "+f_01); String f_02 = ExtractResource("/IU photoboth-02.jpg"); - System.out.println("Banner 02 extracted as file: "+f_02); + //System.out.println("Banner 02 extracted as file: "+f_02); banner_01 = LoadImage(f_01); if (banner_01!=null) System.out.println("Banner 01 loaded"); else System.out.println("Banner 01 not loaded"); banner_02 = LoadImage(f_02); diff --git a/src/main/java/id/co/gtc/erhacam/Cameradetail.java b/src/main/java/id/co/gtc/erhacam/Cameradetail.java index 1f6bd58..e4bf810 100644 --- a/src/main/java/id/co/gtc/erhacam/Cameradetail.java +++ b/src/main/java/id/co/gtc/erhacam/Cameradetail.java @@ -271,9 +271,14 @@ public class Cameradetail { } public void setSharpness_indicator(double value){ - if (value >= config.getSharpnessThreshold()){ + if (value < 0){ + // not defined + LabelSetText(sharpness_indicator, "",""); + } else if (value >= config.getSharpnessThreshold()){ + // sharpness is good LabelSetText(sharpness_indicator, "OK","-fx-text-fill: green; -fx-border-color: black"); } else { + // sharpness is bad LabelSetText(sharpness_indicator,"BAD","-fx-text-fill: red; -fx-border-color: black"); } } @@ -956,7 +961,7 @@ public class Cameradetail { if (eye_state.get()!=1){ // transisi dari tutup mata ke buka mata if (eye_state.get()==-1) { - System.out.println("First Eye Detected from camera "+title); + //System.out.println("First Eye Detected from camera "+title); eye_state.set(1); } else { eye_state.set(1); @@ -970,13 +975,13 @@ public class Cameradetail { long diff = now - last_blink.get(); // kalau beda waktu antara blink 1 dan blink 2 kurang dari 3 detik if (diff<=3000){ - System.out.println("Double Blink Detected from camera "+title); + //System.out.println("Double Blink Detected from camera "+title); if (event!=null) event.onDoubleBlink((int)diff); } waiting_for_second_blink.set(false); } else { waiting_for_second_blink.set(true); - System.out.println("First Blink Detected from camera "+title); + //System.out.println("First Blink Detected from camera "+title); } last_blink.set(now); } diff --git a/src/main/java/id/co/gtc/erhacam/CaptureView.java b/src/main/java/id/co/gtc/erhacam/CaptureView.java index 9994996..fda25c7 100644 --- a/src/main/java/id/co/gtc/erhacam/CaptureView.java +++ b/src/main/java/id/co/gtc/erhacam/CaptureView.java @@ -707,6 +707,11 @@ public class CaptureView { isTakingPhoto.set(false); TextAreaSetText(medicalRecordID,""); TextAreaSetText(PatientName,""); + if (image1!=null) image1.setSharpness_indicator(-1); + if (image2!=null) image2.setSharpness_indicator(-1); + if (image3!=null) image3.setSharpness_indicator(-1); + if (image4!=null) image4.setSharpness_indicator(-1); + if (image5!=null) image5.setSharpness_indicator(-1); if (barcodeData.getText().isBlank()){ // pancing supaya addlistener barcodeData trigger TextAreaSetText(barcodeData,"x"); diff --git a/src/main/java/id/co/gtc/erhacam/MainApplication.java b/src/main/java/id/co/gtc/erhacam/MainApplication.java index 0e44482..8051d54 100644 --- a/src/main/java/id/co/gtc/erhacam/MainApplication.java +++ b/src/main/java/id/co/gtc/erhacam/MainApplication.java @@ -49,7 +49,7 @@ public class MainApplication extends Application { Screen screen = Screen.getPrimary(); Rectangle2D screenbound = screen.getBounds(); Scene scene = new Scene(fxmlLoader.load(), screenbound.getWidth(), screenbound.getHeight()); - stage.setTitle("MultiCam Capture App for ERHA 27052025-005"); + stage.setTitle("MultiCam Capture App for ERHA 27052025-006"); stage.setScene(scene); stage.setResizable(true); stage.setMaximized(true);