Compare commits

...

3 Commits

Author SHA1 Message Date
rdkartono
d2e7d1155d revisi 09/05/2025
Detectors.java :
* scaleFactor 1.05 become 1.2
* minNeighbors 3 become 5
* haarcascade_frontalface_default.xml become haarcascade_frontalface_alt.xml
CaptureView.java :
OpenCVFrameGrabber grabber = new OpenCVFrameGrabber(devicenumber) become OpenCVFrameGrabber grabber = new OpenCVFrameGrabber(CAP_DSHOW+devicenumber);

MainApplication.java :
stage.setTitle("MultiCam Capture App for ERHA 09052025-001")
2025-05-09 08:51:13 +07:00
rdkartono
52360dde5f Merge branch 'master' of https://gitea.rdkartono.my.id/rdkartono/ErhaCam
# Conflicts:
#	src/main/java/id/co/gtc/erhacam/MainApplication.java
2025-05-05 15:49:11 +07:00
rdkartono
02a213f17b commit 11/04/2025 2025-05-05 15:48:38 +07:00
5 changed files with 18 additions and 5 deletions

View File

@@ -131,6 +131,7 @@ public class AudioPlayer {
currentFile = ""; currentFile = "";
currentFileHandle = 0; currentFileHandle = 0;
}); });
pl.setName("PlaybackStatus Monitor Thread");
pl.setDaemon(true); pl.setDaemon(true);
pl.start(); pl.start();

View File

@@ -268,6 +268,7 @@ public class SecureDongle {
} else System.out.println("Canceled Monitoring, UserID not found"); } else System.out.println("Canceled Monitoring, UserID not found");
}); });
tx.setName("SecureDongle Monitor Thread");
tx.setDaemon(true); tx.setDaemon(true);
tx.start(); tx.start();
} }

View File

@@ -37,6 +37,7 @@ import org.bytedeco.opencv.opencv_core.Size;
import org.tinylog.Logger; import org.tinylog.Logger;
import static Config.SomeCodes.*; import static Config.SomeCodes.*;
import static org.bytedeco.opencv.global.opencv_videoio.CAP_DSHOW;
public class CaptureView { public class CaptureView {
@@ -614,6 +615,7 @@ public class CaptureView {
}); });
Thread uploadThread = new Thread(uploadtask); Thread uploadThread = new Thread(uploadtask);
uploadThread.setName("UploadThread MedicalRecordID="+prefix);
uploadThread.setDaemon(true); uploadThread.setDaemon(true);
uploadThread.start(); uploadThread.start();
@@ -698,6 +700,7 @@ public class CaptureView {
if (indexleft90!=-1){ if (indexleft90!=-1){
final int finalindex = indexleft90; final int finalindex = indexleft90;
Thread c1 = new Thread(()-> SetupCameraWithController(image1, camleft90, finalindex)); Thread c1 = new Thread(()-> SetupCameraWithController(image1, camleft90, finalindex));
c1.setName("SetupCameraWithController "+camleft90);
c1.setDaemon(true); c1.setDaemon(true);
c1.start(); c1.start();
} }
@@ -712,6 +715,7 @@ public class CaptureView {
if (indexleft45!=-1) { if (indexleft45!=-1) {
final int finalindex = indexleft45; final int finalindex = indexleft45;
Thread c2 = new Thread(()-> SetupCameraWithController(image2, camleft45, finalindex)); Thread c2 = new Thread(()-> SetupCameraWithController(image2, camleft45, finalindex));
c2.setName("SetupCameraWithController "+camleft45);
c2.setDaemon(true); c2.setDaemon(true);
c2.start(); c2.start();
} }
@@ -726,6 +730,7 @@ public class CaptureView {
if (indexcenter!=-1) { if (indexcenter!=-1) {
final int finalindex = indexcenter; final int finalindex = indexcenter;
Thread c3 = new Thread(()-> SetupCameraWithController(image3, camcenter, finalindex)); Thread c3 = new Thread(()-> SetupCameraWithController(image3, camcenter, finalindex));
c3.setName("SetupCameraWithController "+camcenter);
c3.setDaemon(true); c3.setDaemon(true);
c3.start(); c3.start();
} }
@@ -740,6 +745,7 @@ public class CaptureView {
if (indexright45!=-1) { if (indexright45!=-1) {
final int finalindex = indexright45; final int finalindex = indexright45;
Thread c4 = new Thread(()-> SetupCameraWithController(image4, camright45, finalindex)); Thread c4 = new Thread(()-> SetupCameraWithController(image4, camright45, finalindex));
c4.setName("SetupCameraWithController "+camright45);
c4.setDaemon(true); c4.setDaemon(true);
c4.start(); c4.start();
} }
@@ -755,6 +761,7 @@ public class CaptureView {
if (indexright90!=-1) { if (indexright90!=-1) {
final int finalindex = indexright90; final int finalindex = indexright90;
Thread c5 = new Thread(()-> SetupCameraWithController(image5, camright90, finalindex)); Thread c5 = new Thread(()-> SetupCameraWithController(image5, camright90, finalindex));
c5.setName("SetupCameraWithController "+camright90);
c5.setDaemon(true); c5.setDaemon(true);
c5.start(); c5.start();
} }
@@ -836,7 +843,9 @@ public class CaptureView {
Platform.runLater(()-> image.setCameraTitle(title)); Platform.runLater(()-> image.setCameraTitle(title));
if (devicenumber!=-1){ if (devicenumber!=-1){
OpenCVFrameGrabber grabber = new OpenCVFrameGrabber(devicenumber); // revisi 09/05/2025 dari new OpenCVFrameGrabber(devicenumber)
OpenCVFrameGrabber grabber = new OpenCVFrameGrabber(CAP_DSHOW+devicenumber);
// default // default
int livewidth = 640; int livewidth = 640;
int liveheight = 480; int liveheight = 480;
@@ -991,6 +1000,7 @@ public class CaptureView {
}); });
Thread checkpatientIDThread = new Thread(checkpatientID); Thread checkpatientIDThread = new Thread(checkpatientID);
checkpatientIDThread.setName("CheckPatientID barcode="+barCode);
checkpatientIDThread.setDaemon(true); checkpatientIDThread.setDaemon(true);
checkpatientIDThread.start(); checkpatientIDThread.start();

View File

@@ -14,8 +14,8 @@ public class Detectors {
private static CascadeClassifier eyeDetector; private static CascadeClassifier eyeDetector;
private static CascadeClassifier profilefaceDetector; private static CascadeClassifier profilefaceDetector;
private static double scaleFactor = 1.05; private static double scaleFactor = 1.2; // revisi 09/05/2025, dari nilai 1.05
private final static int minNeighbors = 3; private final static int minNeighbors = 5; // revisi 09/05/2025, dari nilai 3
private final static int flags = 0; private final static int flags = 0;
private static Size FaceminSize; private static Size FaceminSize;
private static Size FacemaxSize; private static Size FacemaxSize;
@@ -30,7 +30,8 @@ public class Detectors {
} }
private static void LoadFrontalFaceDetector(){ private static void LoadFrontalFaceDetector(){
String filename = SomeCodes.ExtractResource("/haarcascade_frontalface_default.xml"); // revisi 09/05/2025, dari filename = SomeCodes.ExtractResource("/haarcascade_frontalface_default.xml");
String filename = SomeCodes.ExtractResource("/haarcascade_frontalface_alt.xml");
if (filename!=null) { if (filename!=null) {
Logger.info("Face Detector file : " + filename); Logger.info("Face Detector file : " + filename);
if (frontalfaceDetector==null) { if (frontalfaceDetector==null) {

View File

@@ -46,7 +46,7 @@ public class MainApplication extends Application {
Screen screen = Screen.getPrimary(); Screen screen = Screen.getPrimary();
Rectangle2D screenbound = screen.getBounds(); Rectangle2D screenbound = screen.getBounds();
Scene scene = new Scene(fxmlLoader.load(), screenbound.getWidth(), screenbound.getHeight()); Scene scene = new Scene(fxmlLoader.load(), screenbound.getWidth(), screenbound.getHeight());
stage.setTitle("MultiCam Capture App for ERHA 25042025-013"); stage.setTitle("MultiCam Capture App for ERHA 09052025-001");
stage.setScene(scene); stage.setScene(scene);
stage.setResizable(true); stage.setResizable(true);
stage.setMaximized(true); stage.setMaximized(true);