Merge pull request #130 from ThomasJClark/preview-gui

JLLeitschuh · JLLeitschuh · commit 3019fb50e3e6 · 2015-11-11T19:32:27.000-05:00
Add more preview enhancements
diff --git a/src/main/java/edu/wpi/grip/ui/preview/BlobsSocketPreviewView.java b/src/main/java/edu/wpi/grip/ui/preview/BlobsSocketPreviewView.java
@@ -8,6 +8,7 @@
 import edu.wpi.grip.ui.util.ImageConverter;
 import javafx.application.Platform;
 import javafx.geometry.Orientation;
+import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.Separator;
 import javafx.scene.image.Image;
@@ -27,6 +28,7 @@ public class BlobsSocketPreviewView extends SocketPreviewView<BlobsReport> {
     private final ImageView imageView = new ImageView();
     private final Label infoLabel = new Label();
     private final Mat tmp = new Mat();
+    private boolean showInputImage = false;
 
     /**
      * @param eventBus The EventBus used by the application
@@ -35,11 +37,15 @@ public class BlobsSocketPreviewView extends SocketPreviewView<BlobsReport> {
     public BlobsSocketPreviewView(EventBus eventBus, OutputSocket<BlobsReport> socket) {
         super(eventBus, socket);
 
-        final VBox content = new VBox();
+        final CheckBox show = new CheckBox("Show Input Image");
+        show.setSelected(this.showInputImage);
+        show.selectedProperty().addListener(observable -> {
+            this.showInputImage = show.isSelected();
+            this.convertImage();
+        });
+
+        final VBox content = new VBox(this.imageView, new Separator(Orientation.HORIZONTAL), this.infoLabel, show);
         content.getStyleClass().add("preview-box");
-        content.getChildren().add(this.imageView);
-        content.getChildren().add(new Separator(Orientation.HORIZONTAL));
-        content.getChildren().add(this.infoLabel);
         this.setContent(content);
 
         this.convertImage();
@@ -60,10 +66,16 @@ private void convertImage() {
             // If there were lines found, draw them on the image before displaying it
             if (!blobsReport.getBlobs().isEmpty()) {
                 if (input.channels() == 3) {
-                    input = input.clone();
+                    input.copyTo(tmp);
                 } else {
                     cvtColor(input, tmp, CV_GRAY2BGR);
-                    input = tmp;
+                }
+
+                input = tmp;
+
+                // If we don't want to see the background image, set it to black
+                if (!this.showInputImage) {
+                    bitwise_xor(tmp, tmp, tmp);
                 }
 
                 // For each line in the report, draw a line along with the starting and ending points
diff --git a/src/main/java/edu/wpi/grip/ui/preview/LinesSocketPreviewView.java b/src/main/java/edu/wpi/grip/ui/preview/LinesSocketPreviewView.java
@@ -8,12 +8,12 @@
 import edu.wpi.grip.ui.util.ImageConverter;
 import javafx.application.Platform;
 import javafx.geometry.Orientation;
+import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.Separator;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.VBox;
-import javafx.stage.Screen;
 import org.bytedeco.javacpp.opencv_core;
 
 import java.util.List;
@@ -31,6 +31,7 @@ public class LinesSocketPreviewView extends SocketPreviewView<LinesReport> {
     private final ImageView imageView = new ImageView();
     private final Label infoLabel = new Label();
     private final Mat tmp = new Mat();
+    private boolean showInputImage = false;
 
     /**
      * @param eventBus The EventBus used by the application
@@ -39,11 +40,16 @@ public class LinesSocketPreviewView extends SocketPreviewView<LinesReport> {
     public LinesSocketPreviewView(EventBus eventBus, OutputSocket<LinesReport> socket) {
         super(eventBus, socket);
 
-        final VBox content = new VBox();
+        // Add a checkbox to set if the preview should just show the lines, or also the input image
+        final CheckBox show = new CheckBox("Show Input Image");
+        show.setSelected(this.showInputImage);
+        show.selectedProperty().addListener(observable -> {
+            this.showInputImage = show.isSelected();
+            this.convertImage();
+        });
+
+        final VBox content = new VBox(this.imageView, new Separator(Orientation.HORIZONTAL), this.infoLabel, show);
         content.getStyleClass().add("preview-box");
-        content.getChildren().add(this.imageView);
-        content.getChildren().add(new Separator(Orientation.HORIZONTAL));
-        content.getChildren().add(this.infoLabel);
         this.setContent(content);
 
         this.convertImage();
@@ -65,10 +71,16 @@ private void convertImage() {
             // If there were lines found, draw them on the image before displaying it
             if (!linesReport.getLines().isEmpty()) {
                 if (input.channels() == 3) {
-                    input = input.clone();
+                    input.copyTo(tmp);
                 } else {
                     cvtColor(input, tmp, CV_GRAY2BGR);
-                    input = tmp;
+                }
+
+                input = tmp;
+
+                // If we don't want to see the background image, set it to black
+                if (!this.showInputImage) {
+                    bitwise_xor(tmp, tmp, tmp);
                 }
 
                 // For each line in the report, draw a line along with the starting and ending points
diff --git a/src/main/java/edu/wpi/grip/ui/preview/PointSizeSocketPreviewView.java b/src/main/java/edu/wpi/grip/ui/preview/PointSizeSocketPreviewView.java
@@ -0,0 +1,61 @@
+package edu.wpi.grip.ui.preview;
+
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+import edu.wpi.grip.core.OutputSocket;
+import edu.wpi.grip.core.events.SocketChangedEvent;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import org.bytedeco.javacpp.IntPointer;
+
+import static org.bytedeco.javacpp.opencv_core.*;
+
+/**
+ * A {@link SocketPreviewView} for OpenCV points and sizes
+ */
+public class PointSizeSocketPreviewView extends SocketPreviewView<IntPointer> {
+
+    private final TextField x, y;
+
+    /**
+     * @param eventBus The EventBus used by the application
+     * @param socket   An output socket to preview
+     */
+    public PointSizeSocketPreviewView(EventBus eventBus, OutputSocket<IntPointer> socket) {
+        super(eventBus, socket);
+
+        x = new TextField();
+        x.setEditable(false);
+        y = new TextField();
+        y.setEditable(false);
+
+        final GridPane gridPane = new GridPane();
+        gridPane.add(x, 1, 0);
+        gridPane.add(y, 1, 1);
+
+        // The only difference between point and size previews is the labels
+        if (socket.getSocketHint().getType().equals(Point.class)) {
+            gridPane.add(new Label("x: "), 0, 0);
+            gridPane.add(new Label("y: "), 0, 1);
+        } else if (socket.getSocketHint().getType().equals(Size.class)) {
+            gridPane.add(new Label("width: "), 0, 0);
+            gridPane.add(new Label("height: "), 0, 1);
+        }
+
+        this.updateTextFields();
+        this.setContent(gridPane);
+    }
+
+    @Subscribe
+    public void onSocketChanged(SocketChangedEvent event) {
+        if (event.getSocket() == this.getSocket()) {
+            this.updateTextFields();
+        }
+    }
+
+    private void updateTextFields() {
+        this.x.setText("" + this.getSocket().getValue().get(0));
+        this.y.setText("" + this.getSocket().getValue().get(1));
+    }
+}
diff --git a/src/main/java/edu/wpi/grip/ui/preview/SocketPreviewViewFactory.java b/src/main/java/edu/wpi/grip/ui/preview/SocketPreviewViewFactory.java
@@ -4,9 +4,14 @@
 import edu.wpi.grip.core.OutputSocket;
 import edu.wpi.grip.core.operations.composite.BlobsReport;
 import edu.wpi.grip.core.operations.composite.LinesReport;
+import org.bytedeco.javacpp.IntPointer;
 
 import static org.bytedeco.javacpp.opencv_core.Mat;
 
+import static org.bytedeco.javacpp.opencv_core.Point;
+import static org.bytedeco.javacpp.opencv_core.Size;
+
+
 /**
  * Factory for constructing {@link SocketPreviewView}s
  */
@@ -21,6 +26,8 @@ public class SocketPreviewViewFactory {
     public static <T> SocketPreviewView<T> createPreviewView(EventBus eventBus, OutputSocket<T> socket) {
         if (socket.getSocketHint().getType() == Mat.class) {
             return (SocketPreviewView) new ImageSocketPreviewView(eventBus, (OutputSocket<Mat>) socket);
+        } else if (socket.getSocketHint().getType() == Point.class || socket.getSocketHint().getType() == Size.class) {
+            return (SocketPreviewView) new PointSizeSocketPreviewView(eventBus, (OutputSocket<IntPointer>) socket);
         } else if (socket.getSocketHint().getType() == LinesReport.class) {
             return (SocketPreviewView) new LinesSocketPreviewView(eventBus, (OutputSocket<LinesReport>) socket);
         } else if (socket.getSocketHint().getType() == BlobsReport.class) {
