Merge pull request #265 from clanghout/EMERGENCY_FIX

get visualization fxml from state matrix branch
clanghout · Jun 19, 2015 · df4924a · df4924a
2 parents 6750f75 + fd14886
commit df4924a
Showing 1 changed file with 25 additions and 15 deletions.
diff --git a/src/main/resources/tab_visualization.fxml b/src/main/resources/tab_visualization.fxml
@@ -12,21 +12,31 @@
 					<children>
 						<VBox styleClass="space">
 							<children>
-								<Button
-										fx:id="makeGraphButton"
-										styleClass="visualization-button"
-										onAction="#handlePopupButtonAction"
-										text="Make graph"/>
-								<Button
-										fx:id="clearViewButton"
-										styleClass="visualization-button"
-										onAction="#handleClearButtonAction"
-										text="Clear graph"/>
-								<Button
-										fx:id="saveButton"
-										styleClass="visualization-button"
-										onAction="#handleSaveButtonAction"
-										text="Save graph"/>
+								<Label fx:id="errorLabel"/>
+								<HBox styleClass="buttons">
+									<children>
+										<Button
+												fx:id="makeGraphButton"
+												styleClass="visualization-button"
+												onAction="#handlePopupButtonAction"
+												text="Make graph"/>
+										<Button
+												fx:id="makeMatrixButton"
+												styleClass="visualization-button"
+												onAction="#handlePopupMatrixButtonAction"
+												text="Make matrix"/>
+										<Button
+												fx:id="clearViewButton"
+												styleClass="visualization-button"
+												onAction="#handleClearButtonAction"
+												text="Clear graph"/>
+										<Button
+												fx:id="saveButton"
+												styleClass="visualization-button"
+												onAction="#handleSaveButtonAction"
+												text="Save graph"/>
+									</children>
+								</HBox>
 							</children>
 						</VBox>
 						<VBox fx:id="visualizationGraph">