Merge remote-tracking branch 'origin/Julian' into Jan

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/metrics/TestMetric.java

@@ -10,7 +10,7 @@ public class TestMetric implements ScopvizGraphMetric {
 
 	@Override
 	public boolean isSetupRequired() {
-		return false;
+		return true;
 	}
 
 	@Override

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/ButtonManager.java

@@ -107,6 +107,7 @@ public final class ButtonManager {
 			controller.pane.setMouseTransparent(false);
 			controller.swingNode.setMouseTransparent(false);
 			
+			
 		}
 	}
 
@@ -124,6 +125,10 @@ public final class ButtonManager {
 		setBorderStyle((Button) arg0.getSource());
 		
 		controller.getOpenButton().setText("Open...");
+		
+		//hide metricbox/update button
+		controller.metricbox.setVisible(false);
+		controller.updateMetricButton.setVisible(false);
 	}
 
 	/**
@@ -140,6 +145,10 @@ public final class ButtonManager {
 		setBorderStyle((Button) arg0.getSource());
 
 		controller.getOpenButton().setText("Open...");
+		
+		//hide metricbox/update button
+		controller.metricbox.setVisible(false);
+		controller.updateMetricButton.setVisible(false);
 	}
 
 	/**
@@ -156,6 +165,10 @@ public final class ButtonManager {
 		setBorderStyle((Button) arg0.getSource());
 
 		controller.getOpenButton().setText("Open Mapping...");
+		
+		//show metricbox/update button
+		controller.metricbox.setVisible(true);
+		controller.updateMetricButton.setVisible(true);
 	}
 
 	/**
@@ -173,6 +186,10 @@ public final class ButtonManager {
 
 			activateWorldView();
 			
+			//hide metricbox/update button
+			controller.metricbox.setVisible(false);
+			controller.updateMetricButton.setVisible(false);
+			
 		}
 
 		GraphDisplayManager.switchActiveGraph();

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/ToolboxManager.java

@@ -66,7 +66,9 @@ public final class ToolboxManager {
 		@SuppressWarnings("unchecked")
 		ObservableList<Pair<Object, String>> data = FXCollections.observableArrayList(
 				pair(new Image(MainApp.class.getResource("/png/standard.png").toString()), "Standard"),
+				pair(new Image(MainApp.class.getResource("/png/procEn.png").toString()), "ProcEn"),
 				pair(new Image(MainApp.class.getResource("/png/source.png").toString()), "Source"),
+				pair(new Image(MainApp.class.getResource("/png/sink.png").toString()), "Sink"),
 				pair(new Image(MainApp.class.getResource("/png/undirEdge.png").toString()), "Undirected"));
 
 		controller.toolbox.getItems().setAll(data);
@@ -76,8 +78,9 @@ public final class ToolboxManager {
 
 		@SuppressWarnings("unchecked")
 		ObservableList<Pair<Object, String>> data = FXCollections.observableArrayList(
+				pair(new Image(MainApp.class.getResource("/png/operator.png").toString()), "Operator"),
+				pair(new Image(MainApp.class.getResource("/png/source.png").toString()), "Source"),
 				pair(new Image(MainApp.class.getResource("/png/sink.png").toString()), "Sink"),
-				pair(new Image(MainApp.class.getResource("/png/procEn.png").toString()), "EnProc"),
 				pair(new Image(MainApp.class.getResource("/png/dirEdge.png").toString()), "Directed"));
 
 		controller.toolbox.getItems().setAll(data);
@@ -128,10 +131,10 @@ public final class ToolboxManager {
 				} else if (rowString.equals("Sink")) {
 					changeCreationMode(CreationMode.CREATE_SINK_NODE);
 
-				} else if (rowString.equals("EnProc")) {
+				} else if (rowString.equals("ProcEn")) {
 					changeCreationMode(CreationMode.CREATE_PROC_NODE);
 
-				} else if (rowString.equals("operator")) {
+				} else if (rowString.equals("Operator")) {
 					changeCreationMode(CreationMode.CREATE_OPERATOR_NODE);
 
 				} else if (rowString.equals("Directed")) {

scopviz/src/main/resources/MainWindow.fxml

@@ -12,7 +12,6 @@
 <?import javafx.scene.control.SplitPane?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
-<?import javafx.scene.input.KeyCodeCombination?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.StackPane?>
@@ -62,7 +61,7 @@
                            <children>
                             <AnchorPane fx:id="topLeftAPane" VBox.vgrow="NEVER">
                                  <children>
-                                    <TableView fx:id="toolbox" maxHeight="80.0" minHeight="0.0" prefHeight="80.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                    <TableView fx:id="toolbox" maxHeight="132.0" minHeight="0.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                                       <columns>
                                         <TableColumn fx:id="toolboxObjectColumn" editable="false" maxWidth="30.0" minWidth="30.0" prefWidth="30.0" sortable="false" />
                                         <TableColumn fx:id="toolboxStringColumn" editable="false" maxWidth="-1.0" minWidth="90.0" prefWidth="-1.0" sortable="false" />
@@ -147,7 +146,7 @@
                                           </AnchorPane>
                                           <AnchorPane VBox.vgrow="ALWAYS">
                                              <children>
-                                                <TableView fx:id="metricbox" editable="true" prefWidth="170.0" tableMenuButtonVisible="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="3.0">
+                                                <TableView fx:id="metricbox" editable="true" prefWidth="170.0" tableMenuButtonVisible="true" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="3.0">
                                                   <columns>
                                                     <TableColumn fx:id="metricBoxMetricColumn" editable="false" prefWidth="75.0" sortable="false" text="Metric" />
                                                     <TableColumn fx:id="metricBoxValueColumn" editable="false" prefWidth="75.0" sortable="false" text="Value" />
@@ -161,7 +160,7 @@
                                           </AnchorPane>
                                           <AnchorPane prefHeight="25.0">
                                              <children>
-                                                <Button fx:id="updateMetricButton" mnemonicParsing="false" prefHeight="25.0" text="Update metrics" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                                <Button fx:id="updateMetricButton" mnemonicParsing="false" prefHeight="25.0" text="Update metrics" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
                                              </children>
                                           </AnchorPane>
                                        </children>