gui change

fablab-fribourg · Mar 27, 2015 · 5255a94 · 5255a94
1 parent 2ed159f
commit 5255a94
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/GCodeSender/eggbot.conf b/GCodeSender/eggbot.conf
@@ -1,9 +1,9 @@
-#Fri Mar 27 19:34:22 CET 2015
+#Fri Mar 27 20:34:46 CET 2015
 last.yMin=-77.27272727272728
 last.xMin=-13.636363636363637
 last.yMax=79.09090909090907
-last.port=COM9
-last.file=C\:\\Users\\gaetan\\Documents\\output_test.gcode
+last.port=COM10
+last.file=C\:\\Users\\Ga\u00E9tan\\Documents\\output_0016.gcode
 last.servoMin=0.0
 mCommandWait=300
 last.xMax=12.727272727272727

diff --git a/GCodeSender/pom.xml b/GCodeSender/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>net.collaud.fablab</groupId>
 	<artifactId>GCodeSender</artifactId>
-	<version>0.3-SNAPSHOT</version>
+	<version>0.4-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>GCodeSender</name>

diff --git a/GCodeSender/src/main/java/net/collaud/fablab/gcodesender/controller/MainController.java b/GCodeSender/src/main/java/net/collaud/fablab/gcodesender/controller/MainController.java
@@ -283,8 +283,8 @@ public void initialize(URL url, ResourceBundle rb) {
 			sb.append("<div style=\"color:");
 			sb.append(msg.getType() == GcodeNotifyMessage.Type.ERROR ? "red" : "black");
 			sb.append(";\">");
-			sb.append(msg.getType().toString());
-			sb.append(" ");
+//			sb.append(msg.getType().toString());
+//			sb.append(" ");
 			sb.append(msg.getMessage());
 			sb.append("</div>");
 			logLines.add(sb.toString());

diff --git a/GCodeSender/src/main/resources/fxml/mainScene.fxml b/GCodeSender/src/main/resources/fxml/mainScene.fxml
@@ -76,8 +76,8 @@
 			<children>
 				<fx:include fx:id="controlPane" source="controlPanel.fxml" />
 				<fx:include fx:id="scalePane" source="scalePanel.fxml" />
-				<fx:include fx:id="manualGCodePane" source="manualGCode.fxml" />
 				<WebView fx:id="htmlLog" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
+				<fx:include fx:id="manualGCodePane" source="manualGCode.fxml" />
 			</children>
 		</VBox>
 	</center>