Merge pull request #3 from Neutralizer/add-pause-button

Added pause toggle button that halts virtual button execution
Neutralizer · May 18, 2021 · a5556c0 · a5556c0
2 parents e67b820 + cb15ac3
commit a5556c0
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 0.1.3 - 18.05.2021
+* Added pause button to halt virtual button execution
+* Added pause textual indication on camera panel header (when paused)
+
 ### 0.1.2 - 03.06.2020
 * Added background learning rate slider (reducing the autofocus flicker problem)
 * Restructured slider UI

diff --git a/src/main/java/bgSubtraction/detector/movementDetector/MovementDetector.java b/src/main/java/bgSubtraction/detector/movementDetector/MovementDetector.java
@@ -32,6 +32,7 @@ public class MovementDetector implements Detector {
 	int detectionLimitPercentage = 75;
 	int totalMovementFoundPercentage = 0;
 	int backgroundUpdateRate = 5;//0-100
+	public boolean isPaused = false;
 
 	public MovementDetector() {
 		this.firstKernelErode = opencv_imgproc.getStructuringElement(opencv_imgproc.MORPH_RECT,
@@ -99,6 +100,14 @@ public void changebackgroundUpdateRate(int bgUpdateRate) {
 	public int getTotalMovementPercentage() {
 		return totalMovementFoundPercentage;
 	}
+
+	public boolean getIsPaused() {
+		return isPaused;
+	}
+
+	public void setIsPaused(boolean isPaused) {
+		this.isPaused = isPaused;
+	}
 
 	public void processImage(IplImage img, Mat bgResult) {
 		Mat imgMat = new Mat(img);
@@ -120,6 +129,14 @@ public String tellIfMovementDetectionIsBlocked() {
 		}
 	}
 
+	public String tellIfPaused() {
+		if(isPaused) {
+			return "PAUSED";
+		} else {
+			return "";
+		}
+	}
+
 	/**
 	 * 
 	 * If too much movement is detected on the whole screen, then it is a flicker and do not press buttons.

diff --git a/src/main/java/bgSubtraction/main/MainMovement.java b/src/main/java/bgSubtraction/main/MainMovement.java
@@ -107,17 +107,16 @@ public void run() {
 					roi.getListRoi().get(roi.getListRoi().size()-1).getKey().setKeyCode(keyWS);
 					}
 
-					if(!movementDetector.isMovementDetectedAndLimitReached(bgResult)) {
+					if(!movementDetector.isMovementDetectedAndLimitReached(bgResult) && !movementDetector.isPaused) {
 						roi.executeAllROI(bgResult);
 					}
 
-
 					display.drawAllROI(roi.getListRoi(), bgResult);
 					display.showImage(bgResult);
 
 					display.setTitle("Resolution: " + camera.getCameraWidthAndHeight() + "; FPS: "
 							+ Integer.toString(camera.getFPS()) + "; Total Movement: " + 
-							movementDetector.getTotalMovementPercentage() + "% " + 
+							movementDetector.getTotalMovementPercentage() + "% " + " " + movementDetector.tellIfPaused() +
 							movementDetector.tellIfMovementDetectionIsBlocked());
 
 //					display.attachMouseListener();//TODO attaches mouse listener

diff --git a/src/main/java/interfacePanel/panel/MainPanel.java b/src/main/java/interfacePanel/panel/MainPanel.java
@@ -1,5 +1,6 @@
 package interfacePanel.panel;
 
+import java.awt.Color;
 import java.awt.Frame;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -324,8 +325,34 @@ private void sliderTemplate(JPanel panelForm, GridBagConstraints c, JSlider slid
 	private void startExecution() {
 		comboBoxCamera.setEnabled(false);
 		comboBoxPresets.setEnabled(false);
-		buttonStartCamera.setEnabled(false);
-		buttonCameraProperties.setEnabled(false);
+		buttonStartCamera.setVisible(false);
+		buttonCameraProperties.setVisible(false);
+
+		//-- Pause button
+		c.gridx = 1;// 2nd col
+		c.gridy = 0;
+		final JButton buttonTogglePause = new JButton("Pause");
+		buttonTogglePause.setBackground(Color.GREEN);
+
+		buttonTogglePause.addActionListener(new ActionListener() {
+
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				//if it is not paused, pause it; else unpause it
+				if(!detector.getIsPaused()) {
+					detector.setIsPaused(true);
+					buttonTogglePause.setBackground(Color.RED);
+					buttonTogglePause.setText("Paused");
+				} else {
+					detector.setIsPaused(false);
+					buttonTogglePause.setBackground(Color.GREEN);
+					buttonTogglePause.setText("Pause");
+				}
+
+			}
+		});
+		panelForm.add(buttonTogglePause,c);
+		//--
 
 		int cameraNum = util.getCameraNum(cameras, comboBoxCamera.getSelectedItem().toString());
 		String selectedPropFile = comboBoxPresets.getSelectedItem().toString();

diff --git a/target/classes/META-INF/maven/cv/MovementControllerbyNeutralizer/pom.properties b/target/classes/META-INF/maven/cv/MovementControllerbyNeutralizer/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Tue Jun 02 23:11:20 EEST 2020
+#Mon May 17 23:10:06 EEST 2021
 version=0.0.1-SNAPSHOT
 groupId=cv
 m2e.projectName=MovementControllerByNeutralizer