siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

unfinished changes in Detector

Browse Source
This commit is contained in:
Bastian Kohler 2023-06-13 20:55:30 +02:00
parent e98ae10267
commit bbd333426d
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/example/ueberwachungssystem/Detection/DetectionReport.java
View File

@ -9,13 +9,16 @@ public class DetectionReport {
public String timeStamp; public String timeStamp;
public String detectionType; public String detectionType;
public float detectedValue; public float detectedValue;
public String detectorID; public boolean detectionState;
//public String detectorID;
public DetectionReport(String detectorID, String detectionType, float detectedAmplitude) { public DetectionReport(boolean detectionState, String detectionType, float detectedAmplitude) {
this.timeStamp = String.valueOf(Calendar.getInstance().getTime()); this.timeStamp = String.valueOf(Calendar.getInstance().getTime());
this.detectionType = detectionType; this.detectionType = detectionType;
this.detectedValue = detectedAmplitude; this.detectedValue = detectedAmplitude;
this.detectorID = detectorID; this.detectionState = detectionState;
//this.detectorID = detectorID;
} }
@ -24,9 +27,9 @@ public class DetectionReport {
String time = "Time: " + "[" + this.timeStamp + "]"; String time = "Time: " + "[" + this.timeStamp + "]";
String type = "Type: " + "[" + this.detectionType + "]"; String type = "Type: " + "[" + this.detectionType + "]";
String value = "Value: " + "[" + this.detectedValue + "]"; String value = "Value: " + "[" + this.detectedValue + "]";
String id = "ID: " + "[" + this.detectorID + "]"; //String id = "ID: " + "[" + this.detectorID + "]";
return String.join("\t", time, type, value, id); return String.join("\t", time, type, value);
} }
/** Debug Report */ /** Debug Report */

5
app/src/main/java/com/example/ueberwachungssystem/Detection/Detector.java
View File

@ -20,16 +20,15 @@ abstract public class Detector {
/** Triggers onDetectionListener - call this to trigger violation/alarm */ /** Triggers onDetectionListener - call this to trigger violation/alarm */
public void reportViolation(String detectorID, String detectionType, float amplitude) { public void reportViolation(String detectionType, float amplitude) {
if (listener != null) { if (listener != null) {
DetectionReport detectionReport = new DetectionReport(detectorID, detectionType, amplitude); DetectionReport detectionReport = new DetectionReport(true, detectionType, amplitude);
listener.onDetection(detectionReport); listener.onDetection(detectionReport);
} else { } else {
throw new IllegalStateException("No listener set for violation reporting"); throw new IllegalStateException("No listener set for violation reporting");
} }
} }
/** Starts Detection (abstract method: needs to be overridden in child class) */ /** Starts Detection (abstract method: needs to be overridden in child class) */
public abstract void startDetection(); public abstract void startDetection();

1
app/src/main/java/com/example/ueberwachungssystem/Detection/VideoDetector.java
View File

@ -66,7 +66,6 @@ public class VideoDetector extends Detector {
private int frameCnt = 0; private int frameCnt = 0;
// Parameters // Parameters
private static final float PIXEL_THRESHOLD = 30f; // Luminosity (brightness channel of YUV_420_888) private static final float PIXEL_THRESHOLD = 30f; // Luminosity (brightness channel of YUV_420_888)
private static final int BLUR_KERNEL_SIZE = 5; private static final int BLUR_KERNEL_SIZE = 5;