Improve UI and increase tolerance for timer tests

Author: SamCarlberg

core/src/test/java/edu/wpi/grip/core/metrics/TimerTest.java

@@ -54,7 +54,7 @@ public void testTiming() throws InterruptedException {
     timer.started();
     Thread.sleep(1000);
     timer.stopped();
-    assertEquals("Elapsed time was out of tolerance", 1_000_000, timer.getElapsedTime(), 1000);
+    assertEquals("Elapsed time was out of tolerance", 1_000_000, timer.getElapsedTime(), 10_000);
   }
 
   @Test
@@ -73,7 +73,7 @@ private void onTimerEvent(TimerEvent event) {
     assertNotNull("No TimerEvent received", timerEvent.get());
     TimerEvent event = timerEvent.get();
     assertEquals("Event had an unexpected source", this, event.getSource());
-    assertEquals("Elapsed time was out of tolerance", 1_000_000, event.getElapsedTime(), 1000);
+    assertEquals("Elapsed time was out of tolerance", 1_000_000, event.getElapsedTime(), 10_000);
     Analysis analysis = event.getData();
     Statistics statistics = analysis.getStatistics();
     assertEquals("Analysis did not have 1 element", 1, analysis.getN());

ui/src/main/java/edu/wpi/grip/ui/MainWindowController.java

@@ -16,13 +16,10 @@
 import edu.wpi.grip.ui.components.StartStoppableButton;
 import edu.wpi.grip.ui.util.DPIUtility;
 
-import com.google.common.base.CaseFormat;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
 import com.google.common.util.concurrent.Service;
 
-import org.controlsfx.control.StatusBar;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.Optional;
@@ -35,12 +32,13 @@
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
 import javafx.scene.control.Label;
+import javafx.scene.control.MenuItem;
 import javafx.scene.control.SplitPane;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.Region;
-import javafx.scene.text.TextAlignment;
 import javafx.stage.FileChooser;
 import javafx.stage.FileChooser.ExtensionFilter;
 import javafx.stage.Modality;
@@ -53,7 +51,6 @@
  * The Controller for the application window.
  */
 public class MainWindowController {
-
   @FXML
   private Parent root;
   @FXML
@@ -67,8 +64,13 @@ public class MainWindowController {
   @FXML
   private Pane aboutPane;
   @FXML
-  private StatusBar statusBar;
-  private Label elapsedTimeLabel; // TODO improve the layout of this label
+  private MenuItem analyzeMenuItem;
+  @FXML
+  private HBox statusBar;
+  @FXML
+  private Label statusLabel;
+  @FXML
+  private Label elapsedTimeLabel;
   @Inject
   private EventBus eventBus;
   @Inject
@@ -90,20 +92,16 @@ public class MainWindowController {
 
   @FXML
   protected void initialize() {
-    elapsedTimeLabel = new Label();
-    updateElapsedTimeLabel(0);
-    elapsedTimeLabel.setTextAlignment(TextAlignment.CENTER);
     pipelineView.prefHeightProperty().bind(bottomPane.heightProperty());
-    statusBar.getLeftItems().add(startStoppableButtonFactory.create(pipelineRunner));
-    statusBar.getLeftItems().add(elapsedTimeLabel);
+    statusBar.getChildren().add(0, startStoppableButtonFactory.create(pipelineRunner));
     pipelineRunner.addListener(new SingleActionListener(() -> {
       final Service.State state = pipelineRunner.state();
       final String stateMessage =
           state.equals(Service.State.TERMINATED)
-              ? "Stopped"
-              : CaseFormat.UPPER_UNDERSCORE.converterTo(CaseFormat.UPPER_CAMEL).convert(state
-              .toString());
-      statusBar.setText(" Pipeline " + stateMessage);
+              ? "disabled "
+              : "enabled  ";
+      statusLabel.setText("Pipeline " + stateMessage);
+      analyzeMenuItem.setDisable(state.equals(Service.State.TERMINATED));
     }), Platform::runLater);
   }
 

ui/src/main/resources/edu/wpi/grip/ui/MainWindow.fxml

@@ -14,7 +14,10 @@
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.input.KeyCodeCombination?>
 <?import javafx.scene.layout.VBox?>
-<?import org.controlsfx.control.StatusBar?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Separator?>
 <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
       minWidth="-Infinity" styleClass="main-window"
       fx:controller="edu.wpi.grip.ui.MainWindowController"
@@ -135,7 +138,7 @@
                         </ImageView>
                     </graphic>
                 </MenuItem>
-                <MenuItem text="Analyze" onAction="#showAnalysis">
+                <MenuItem fx:id="analyzeMenuItem" text="Analyze" onAction="#showAnalysis">
                     <graphic>
                         <ImageView styleClass="menu-graphic">
                             <fitWidth>
@@ -180,7 +183,17 @@
                 </ScrollPane>
             </items>
         </SplitPane>
-        <StatusBar fx:id="statusBar" />
+        <HBox fx:id="statusBar" alignment="CENTER_LEFT" spacing="2">
+            <padding>
+                <Insets top="2" right="2" bottom="2" left="2" />
+            </padding>
+            <children>
+                <!-- Start/Stop button goes here (created programmatically and inserted) -->
+                <Label fx:id="statusLabel" text="Pipeline stopped" />
+                <Separator orientation="VERTICAL" />
+                <Label fx:id="elapsedTimeLabel" text="Did not run" />
+            </children>
+        </HBox>
     </children>
     <fx:define>
         <fx:include source="Deploy.fxml" fx:id="deployPane" />