Merge pull request #322 from EasternEdgeRobotics/distance-tool-remove-node

Distance tool remove node and scale x axis

Author: cal-pratt

src/main/java/com/easternedgerobotics/rov/fx/DistanceCalculatorView.java

@@ -6,6 +6,7 @@
 import javafx.geometry.Insets;
 import javafx.scene.Parent;
 import javafx.scene.control.Button;
+import javafx.scene.control.TextField;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.Border;
@@ -52,6 +53,8 @@ public final class DistanceCalculatorView implements View {
 
     final Button calculateButton = new Button("Calculate");
 
+    final TextField xAxisLength = new TextField();
+
     final ImageView imageView = new ImageView();
 
     final StackPane imageStack = new StackPane();
@@ -70,6 +73,9 @@ public DistanceCalculatorView() {
         buttonPanel.getChildren().addAll(buttons);
         calculateButton.setPrefHeight(BUTTON_HEIGHT);
         calculateButton.prefWidthProperty().bind(buttonPanel.widthProperty());
+        xAxisLength.setPrefHeight(BUTTON_HEIGHT);
+        xAxisLength.prefWidthProperty().bind(buttonPanel.widthProperty());
+        xAxisLength.setPromptText("X Axis Length");
 
         galleryBorderPane.setBorder(new Border(new BorderStroke(Color.GRAY,
             BorderStrokeStyle.SOLID, new CornerRadii(RADIUS), BorderWidths.DEFAULT)));
@@ -78,7 +84,7 @@ public DistanceCalculatorView() {
 
         imageSelectionPanel.setPadding(new Insets(PADDING, PADDING, PADDING, PADDING));
         imageSelectionPanel.setSpacing(PADDING);
-        imageSelectionPanel.getChildren().addAll(buttonPanel, calculateButton, galleryBorderPane);
+        imageSelectionPanel.getChildren().addAll(buttonPanel, xAxisLength, calculateButton, galleryBorderPane);
         imageSelectionPanel.setMaxWidth(SELECTION_WIDTH);
         imageSelectionPanel.setMinWidth(SELECTION_WIDTH);
 

src/main/java/com/easternedgerobotics/rov/fx/DistanceCalculatorViewController.java

@@ -177,10 +177,17 @@ public void setImageFromPath(final Path path) {
             }
             final Observable<Boolean> calcPress = JavaFxObservable.valuesOf(view.calculateButton.pressedProperty());
             currentDistanceSubscriptions.add(calcPress.filter(x -> !x).skip(1).subscribe(x -> {
+                final String scalarString = view.xAxisLength.getText();
+                final float scalar;
+                try {
+                    scalar = Float.parseFloat(scalarString);
+                } catch (final NumberFormatException e) {
+                    return;
+                }
                 final AxisValue axis = view.axisNode.get().getAxis();
                 final List<PointValue> pixelPoints = view.imagePoints
                     .stream().map(TextNode::getPoint).collect(Collectors.toList());
-                distanceCalculator.calculate(axis, pixelPoints, cameraName).ifPresent(objectPoints -> {
+                distanceCalculator.calculate(axis, pixelPoints, cameraName, scalar).ifPresent(objectPoints -> {
                     for (int i = 0; i < objectPoints.size(); i++) {
                         view.imagePoints.get(i).setText(String.format("(%.2f, %.2f)",
                             objectPoints.get(i).getX(), objectPoints.get(i).getY()));
@@ -214,17 +221,31 @@ public void setImageFromPath(final Path path) {
                 .share();
 
             currentDistanceSubscriptions.add(JavaFxObservable.actionEventsOf(axis).withLatestFrom(events, (a, e) -> e)
-                .subscribe(event -> {
+                .take(1).subscribe(event -> {
                     final AxisNode axisNode = new AxisNode();
                     view.axisNode.set(axisNode);
                     shapeScene.add(axisNode, event.getX(), event.getY());
+                    contextMenu.getItems().remove(axis);
                 }));
 
             currentDistanceSubscriptions.add(JavaFxObservable.actionEventsOf(point).withLatestFrom(events, (a, e) -> e)
                 .subscribe(event -> {
-                    final TextNode imagePoint = new TextNode(new Circle(7, Color.CHARTREUSE));
+                    final TextNode imagePoint = new TextNode(new Circle(7, Color.DEEPPINK));
                     view.imagePoints.add(imagePoint);
                     shapeScene.add(imagePoint, event.getX(), event.getY());
+                    final ContextMenu pointMenu = new ContextMenu();
+                    final MenuItem delete = new MenuItem("Delete");
+                    pointMenu.getItems().addAll(delete);
+                    currentDistanceSubscriptions.add(JavaFxObservable
+                        .eventsOf(imagePoint.getHandleShape(), EventType.ROOT)
+                        .filter(e -> e.getEventType().equals(MouseEvent.MOUSE_CLICKED))
+                        .cast(MouseEvent.class)
+                        .filter(e -> e.getButton().equals(MouseButton.SECONDARY))
+                        .subscribe(e -> pointMenu.show(imagePoint.getHandleShape(), e.getScreenX(), e.getScreenY())));
+                    currentDistanceSubscriptions.add(JavaFxObservable.actionEventsOf(delete).take(1).subscribe(e -> {
+                        view.imagePoints.remove(imagePoint);
+                        shapeScene.remove(imagePoint);
+                    }));
                 }));
 
         } catch (final IOException e) {

src/main/java/com/easternedgerobotics/rov/fx/MainViewController.java

@@ -95,7 +95,7 @@ public final void onCreate() {
         JavaFxObservable.valuesOf(view.resetCameraButton.pressedProperty()).filter(x -> !x)
             .subscribe(v -> videoDecoder.restart());
         JavaFxObservable.valuesOf(view.distanceButton.pressedProperty()).filter(x -> !x)
-            .subscribe(v -> viewLoader.load(DistanceCalculatorView.class, "Distance Calculator"));
+            .subscribe(v -> viewLoader.load(DistanceCalculatorView.class, "Deep Pink Distance Tool"));
         JavaFxObservable.valuesOf(view.calibrationButton.pressedProperty()).filter(x -> !x)
             .subscribe(v -> viewLoader.load(CameraCalibrationView.class, "California Camera Calibration by Cal"));
         JavaFxObservable.valuesOf(view.bluetoothButton.pressedProperty()).filter(x -> !x)

src/main/java/com/easternedgerobotics/rov/fx/distance/ShapeScene.java

@@ -62,6 +62,12 @@ public void add(final ShapeNode node, final double containerX, final double cont
         draw(node);
     }
 
+    public void remove(final ShapeNode node) {
+        children.remove(node);
+        stack.getChildren().removeAll(node.getDrawnShapes());
+        draw();
+    }
+
     /**
      * Set up movement subscriptions for the node and add drawables to the scene.
      *

src/main/java/com/easternedgerobotics/rov/math/DistanceCalculator.java

@@ -45,7 +45,8 @@ public DistanceCalculator(
     public Optional<List<PointValue>> calculate(
         final AxisValue axis,
         final List<PointValue> points,
-        final String cameraName
+        final String cameraName,
+        final float scalar
     ) {
         return store.get(cameraName).map(calibration -> {
             /**
@@ -242,7 +243,7 @@ public Optional<List<PointValue>> calculate(
 
                 final DoubleIndexer objectPointIndexer = objectPoint.createIndexer();
 
-                return new PointValue(objectPointIndexer.get(0, 0), objectPointIndexer.get(1, 0));
+                return new PointValue(objectPointIndexer.get(0, 0) * scalar, objectPointIndexer.get(1, 0) * scalar);
             }).collect(Collectors.toList());
         });
     }