Merge branch 'MinimizeSteps' of https://github.com/osulacam/GRIP into osulacam-MinimizeSteps

Author: AustinShalit

ui/src/main/java/edu/wpi/grip/ui/pipeline/StepController.java

@@ -4,6 +4,7 @@
 import edu.wpi.grip.core.Step;
 import edu.wpi.grip.core.sockets.InputSocket;
 import edu.wpi.grip.core.sockets.OutputSocket;
+import edu.wpi.grip.core.sockets.SocketHint;
 import edu.wpi.grip.ui.Controller;
 import edu.wpi.grip.ui.annotations.ParametrizedController;
 import edu.wpi.grip.ui.components.ExceptionWitnessResponderButton;
@@ -16,16 +17,26 @@
 import com.google.inject.assistedinject.Assisted;
 
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.animation.TimelineBuilder;
+import javafx.beans.property.DoubleProperty;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
+import javafx.scene.control.Button;
 import javafx.scene.control.Labeled;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-
+import javafx.util.Duration;
 import javax.inject.Inject;
 
 /**
@@ -41,6 +52,8 @@ public class StepController implements Controller {
   private final ExceptionWitnessResponderButton.Factory exceptionWitnessResponderButtonFactory;
   private final StepDragService stepDragService;
   private final Step step;
+  private final List<InputSocketController> inputSockets;
+  private boolean expanded = true;
   @FXML
   private VBox root;
   @FXML
@@ -53,6 +66,10 @@ public class StepController implements Controller {
   private VBox inputs;
   @FXML
   private VBox outputs;
+  @FXML
+  private ImageView expandIcon;
+  @FXML
+  private Button expand;
   private ControllerMap<InputSocketController, Node> inputSocketMapManager;
   private ControllerMap<OutputSocketController, Node> outputSocketMapManager;
 
@@ -69,6 +86,7 @@ public class StepController implements Controller {
     this.exceptionWitnessResponderButtonFactory = exceptionWitnessResponderButtonFactory;
     this.stepDragService = stepDragService;
     this.step = step;
+    inputSockets = new ArrayList<>();
   }
 
   @FXML
@@ -82,9 +100,21 @@ private void initialize() {
         new Image(InputStream.class.cast(icon))));
     buttons.getChildren().add(0, exceptionWitnessResponderButtonFactory.create(step, "Step Error"));
 
+    if (step.getInputSockets().stream()
+        .allMatch(inputSocket -> inputSocket.getSocketHint().getView()
+            .equals(SocketHint.View.NONE))) {
+      expand.setManaged(false);
+    } else {
+      expandIcon.setImage(new Image("/edu/wpi/grip/ui/icons/up.png"));
+    }
+
     // Add a SocketControlView for each input socket and output socket
     for (InputSocket<?> inputSocket : step.getInputSockets()) {
-      inputSocketMapManager.add(inputSocketControllerFactory.create(inputSocket));
+      InputSocketController tempSocket = inputSocketControllerFactory.create(inputSocket);
+      inputSocketMapManager.add(tempSocket);
+      if (!inputSocket.getSocketHint().getView().equals(SocketHint.View.NONE)) {
+        inputSockets.add(tempSocket);
+      }
     }
 
     for (OutputSocket<?> outputSocket : step.getOutputSockets()) {
@@ -142,6 +172,91 @@ private void moveStepRight() {
     pipeline.moveStep(step, +1);
   }
 
+  @FXML
+  private void expand() {
+    if (expanded) {
+      for (InputSocketController input : inputSockets) {
+        inputs.setMaxHeight(inputs.getHeight());
+        inputs.setPrefHeight(inputs.getHeight());
+        if (input.getSocket().getConnections().isEmpty()) {
+          fadeOut(input);
+        }
+      }
+      closeUp();
+      expandIcon.setImage(new Image("/edu/wpi/grip/ui/icons/down.png"));
+      expanded = false;
+    } else {
+      for (InputSocketController input : inputSockets) {
+        fadeIn(input);
+      }
+      reopen();
+      expandIcon.setImage(new Image("/edu/wpi/grip/ui/icons/up.png"));
+      expanded = true;
+    }
+
+  }
+
+  /**
+   * Makes an animation to make an input socket fade out over 0.1 seconds.
+   *
+   * @param input the input socket controller that will be faded out.
+   */
+  private void fadeOut(InputSocketController input) {
+    DoubleProperty opacity = input.getRoot().opacityProperty();
+    Timeline fadeOut = new Timeline(
+        new KeyFrame(Duration.ZERO, new KeyValue(opacity, 1.0)),
+        new KeyFrame(new Duration(100), new KeyValue(opacity, 0.0)));
+    fadeOut.setOnFinished(new EventHandler<ActionEvent>() {
+      @Override
+      public void handle(ActionEvent event) {
+          input.getRoot().setVisible(false);
+          input.getRoot().setManaged(false);
+      }
+    });
+    fadeOut.play();
+  }
+
+  /**
+   * Makes an animation to make an input socket fade in over 0.1 seconds.
+   *
+   * @param input the input socket controller that will be faded out.
+   */
+  private void fadeIn(InputSocketController input) {
+    input.getRoot().setVisible(true);
+    DoubleProperty opacity = input.getRoot().opacityProperty();
+    Timeline fadeIn = new Timeline(
+        new KeyFrame(new Duration(100), new KeyValue(opacity, 1.0)));
+    fadeIn.setOnFinished(new EventHandler<ActionEvent>() {
+      @Override
+      public void handle(ActionEvent event) {
+        for (InputSocketController input : inputSockets) {
+          input.getRoot().setManaged(true);
+        }
+      }
+    });
+    fadeIn.play();
+  }
+
+  /**
+   * Makes an animation to make the input vbox slide closed over .25 seconds
+   */
+  private void closeUp() {
+    Timeline animation = TimelineBuilder.create().cycleCount(1).keyFrames(
+        new KeyFrame(Duration.seconds(0.25),
+            new KeyValue(inputs.prefHeightProperty(), 0))).build();
+    animation.play();
+  }
+
+  /**
+   * Makes an animation to make the input vbox slide open over .1 seconds
+   */
+  private void reopen() {
+    Timeline animation = TimelineBuilder.create().cycleCount(1).keyFrames(
+        new KeyFrame(Duration.seconds(0.1),
+            new KeyValue(inputs.prefHeightProperty(), inputs.getMaxHeight()))).build();
+    animation.play();
+  }
+
   /**
    * Used for assisted injects.  Guice will automatically create an instance of this interface so we
    * can create step controllers.  This lets us use injection with StepController even though it

ui/src/main/resources/edu/wpi/grip/ui/GRIP.css

@@ -122,6 +122,10 @@ Button.delete, Button.move-left, Button.move-right, .start-stoppable-button, .ex
     -fx-pref-width: 2em;
 }
 
+.expand {
+    -fx-background-color: transparent;
+}
+
 VBox.sockets {
     -fx-spacing: 0.5em;
 }

ui/src/main/resources/edu/wpi/grip/ui/icons/down.png

@@ -79,6 +79,19 @@
         </graphic>
     </Label>
     <Separator orientation="HORIZONTAL" />
+    <Button fx:id="expand" onMouseClicked="#expand" styleClass="expand"
+            maxWidth="Infinity" prefHeight="0" HBox.hgrow="ALWAYS">
+        <graphic>
+            <ImageView fx:id="expandIcon">
+                <fitHeight>
+                    <DPIUtility fx:constant="SMALL_ICON_SIZE" />
+                </fitHeight>
+            </ImageView>
+        </graphic>
+        <tooltip>
+            <Tooltip text="Minimizes/Maximizes the inputs in the step"/>
+        </tooltip>
+    </Button>
     <VBox fx:id="inputs" styleClass="sockets" />
     <Separator orientation="HORIZONTAL" />
     <VBox fx:id="outputs" styleClass="sockets" />

ui/src/main/resources/edu/wpi/grip/ui/icons/up.png

@@ -7,6 +7,8 @@
 import edu.wpi.grip.core.Pipeline;
 import edu.wpi.grip.core.Step;
 import edu.wpi.grip.core.SubtractionOperation;
+import edu.wpi.grip.core.operations.composite.BlurOperation;
+import edu.wpi.grip.core.operations.composite.DesaturateOperation;
 import edu.wpi.grip.core.sockets.InputSocket;
 import edu.wpi.grip.core.sockets.OutputSocket;
 import edu.wpi.grip.core.util.MockExceptionWitness;
@@ -39,6 +41,7 @@
 import javafx.stage.Stage;
 
 import static junit.framework.Assert.assertEquals;
+import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 import static org.testfx.api.FxAssert.verifyThat;
 import static org.testfx.api.FxAssert.verifyThatIter;
@@ -49,6 +52,8 @@ public class PipelineUITest extends ApplicationTest {
   private EventBus eventBus;
   private OperationMetaData additionOperation;
   private OperationMetaData subtractionOperation;
+  private OperationMetaData blurOperation;
+  private OperationMetaData desaturateOperation;
   private PipelineController pipelineController;
   private Pipeline pipeline;
 
@@ -66,6 +71,10 @@ public void start(Stage stage) {
         AdditionOperation(isf, osf));
     subtractionOperation = new OperationMetaData(SubtractionOperation.DESCRIPTION, () -> new
         SubtractionOperation(isf, osf));
+    blurOperation = new OperationMetaData(BlurOperation.DESCRIPTION, () -> new
+        BlurOperation(isf, osf));
+    desaturateOperation = new OperationMetaData(DesaturateOperation.DESCRIPTION, () -> new
+        DesaturateOperation(isf, osf));
     pipelineController = injector.getInstance(PipelineController.class);
     final Scene scene = new Scene(TestAnnotationFXMLLoader.load(pipelineController), 800, 600);
     stage.setScene(scene);
@@ -102,6 +111,24 @@ public void testConnectingTwoOperations() {
 
   }
 
+  @Test
+  public void testMinimizeButton() {
+    Step desaturateStep = addOperation(1, desaturateOperation);
+    Step blurStep = addOperation(1, blurOperation);
+    assertTrue("blur input socket size is:" + blurStep.getInputSockets().size(),
+        blurStep.getInputSockets().size() > 0);
+
+    drag(StyleClassNameUtility.cssSelectorForOutputSocketHandleOn(desaturateStep),  MouseButton
+        .PRIMARY).dropTo(StyleClassNameUtility.cssSelectorForInputSocketHandleOn(blurStep));
+
+    clickOn(".pipeline .blur-step .expand", MouseButton.PRIMARY);
+    clickOn(".pipeline .blur-step .expand", MouseButton.PRIMARY);
+
+    assertTrue("blur input socket size is:" + blurStep.getInputSockets().size(),
+        blurStep.getInputSockets().size() > 0);
+
+  }
+
   @Test
   public void testMoveOperation() {
     final Step step1 = MockStep.createMockStepWithOperation();