Permalink
Browse files

Final design adjustments of LogPanel

Signed-off-by: Victor Hertel <victor.hertel@web.de>
  • Loading branch information...
vhertel committed Aug 22, 2017
1 parent eb90e79 commit f851b66bfcc49f375c8ac92e455f60a169add14c
@@ -453,7 +453,7 @@ public static void logPanelBuilder(String filePath, String configPath) throws Fi
+ "<?import javafx.scene.*?> \n"
+ "<?import javafx.scene.control.*?> \n"
+ "<?import javafx.scene.layout.*?> \n");
writer.println("<TabPane xmlns=\"http://javafx.com/javafx/8\" xmlns:fx=\"http://javafx.com/fxml/1\" fx:controller = \"com.ksatstuttgart.usoc.gui.controller.LogPanelController\" maxWidth=\"350.0\" minWidth=\"300.0\" prefWidth=\"350.0\" tabClosingPolicy=\"UNAVAILABLE\" BorderPane.alignment=\"CENTER\"> \n"
writer.println("<TabPane xmlns=\"http://javafx.com/javafx/8\" xmlns:fx=\"http://javafx.com/fxml/1\" fx:controller = \"com.ksatstuttgart.usoc.gui.controller.LogPanelController\" maxWidth=\"265.0\" minWidth=\"265.0\" prefWidth=\"265.0\" tabClosingPolicy=\"UNAVAILABLE\" BorderPane.alignment=\"CENTER\"> \n"
+ " <tabs>");
// Writes FXML structure if the serial panel is required
@@ -5,7 +5,7 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<TabPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller = "com.ksatstuttgart.usoc.gui.controller.LogPanelController" maxWidth="350.0" minWidth="300.0" prefWidth="350.0" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER">
<TabPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller = "com.ksatstuttgart.usoc.gui.controller.LogPanelController" maxWidth="265.0" minWidth="265.0" prefWidth="265.0" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER">
<tabs>
<Tab text="Serial">
<content>
@@ -16,30 +16,30 @@
<GridPane alignment="TOP_CENTER" BorderPane.alignment="CENTER">
<padding><Insets bottom="5" /></padding>
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="120.0" minWidth="120.0" prefWidth="120.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="120.0" minWidth="120.0" prefWidth="120.0" />
<ColumnConstraints hgrow="SOMETIMES" />
<ColumnConstraints hgrow="SOMETIMES" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Button text="Connect" onAction="#serialConnect" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="120.0" minWidth="120.0" prefWidth="120.0" mnemonicParsing="false" GridPane.halignment="CENTER" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Button text="Send Command" onAction="#serialSendCommand" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="120.0" minWidth="120.0" prefWidth="120.0" mnemonicParsing="false" GridPane.halignment="CENTER" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<ComboBox fx:id="comboBox1" GridPane.columnIndex="0" GridPane.rowIndex="0" prefWidth="230.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" >
<Button text="Connect" onAction="#serialConnect" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="-Infinity" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" mnemonicParsing="false" />
<Button text="Send Command" onAction="#serialSendCommand" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="-Infinity" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" mnemonicParsing="false" />
<ComboBox fx:id="comboBox1" promptText="Baudrates" GridPane.columnIndex="0" GridPane.rowIndex="0" maxWidth="135.0" minWidth="135.0" prefWidth="135.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" >
<items>
<FXCollections fx:factory="observableArrayList">
</FXCollections>
</items>
</ComboBox>
<ComboBox fx:id="comboBox2" GridPane.columnIndex="0" GridPane.rowIndex="1" prefWidth="230.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES">
<ComboBox fx:id="comboBox2" promptText="Ports" GridPane.columnIndex="0" GridPane.rowIndex="1" maxWidth="135.0" minWidth="135.0" prefWidth="135.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES">
<items>
<FXCollections fx:factory="observableArrayList">
</FXCollections>
</items>
</ComboBox>
<ComboBox fx:id="comboBox3" GridPane.columnIndex="0" GridPane.rowIndex="2" prefWidth="230.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES">
<ComboBox fx:id="comboBox3" promptText="Commands" GridPane.columnIndex="0" GridPane.rowIndex="2" maxWidth="135.0" minWidth="135.0" prefWidth="135.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES">
<items>
<FXCollections fx:factory="observableArrayList">
</FXCollections>
@@ -64,8 +64,8 @@
<GridPane alignment="TOP_CENTER" BorderPane.alignment="CENTER">
<padding><Insets bottom="5" /></padding>
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="120.0" prefWidth="90.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -79,22 +79,21 @@
</rowConstraints>
<children>
<Label text="Last message from:" GridPane.columnIndex="0" GridPane.rowIndex="0" />
<Label text="Subject:" GridPane.columnIndex="0" GridPane.rowIndex="1" />
<Label text="Filename:" GridPane.columnIndex="0" GridPane.rowIndex="2" />
<Label text="Received at:" GridPane.columnIndex="0" GridPane.rowIndex="3" />
<Label text="Add file:" GridPane.columnIndex="0" GridPane.rowIndex="4" />
<Button text="Clear Data" onAction="#iridiumClearData" GridPane.columnIndex="0" GridPane.rowIndex="5" />
<Label text="#Masseges on reconnect:" GridPane.columnIndex="0" GridPane.rowIndex="6" />
<Button text="exportCSV" onAction="#iridiumExportCSV" GridPane.columnIndex="0" GridPane.rowIndex="7" />
<Label text="" GridPane.columnIndex="1" GridPane.rowIndex="0" />
<Label text="" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<Label text="" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<Label text="" GridPane.columnIndex="1" GridPane.rowIndex="3" />
<Button text="Open" onAction="#iridiumOpen" GridPane.columnIndex="1" GridPane.rowIndex="4" />
<Label text="" GridPane.columnIndex="1" GridPane.rowIndex="5" />
<TextField text="0" GridPane.columnIndex="1" GridPane.rowIndex="6" />
<Button text="Reconnect" onAction="#iridiumReconnect" GridPane.columnIndex="1" GridPane.rowIndex="7" />
<Label text="Last message from:" GridPane.columnIndex="0" GridPane.rowIndex="0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="Subject:" GridPane.columnIndex="0" GridPane.rowIndex="1" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="Filename:" GridPane.columnIndex="0" GridPane.rowIndex="2" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="Received at:" GridPane.columnIndex="0" GridPane.rowIndex="3" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="Add file:" GridPane.columnIndex="0" GridPane.rowIndex="4" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Button text="Clear Data" onAction="#iridiumClearData" GridPane.columnIndex="0" GridPane.rowIndex="5" prefWidth="90.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="#Masseges on reconnect:" GridPane.columnIndex="0" GridPane.rowIndex="6" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Button text="exportCSV" onAction="#iridiumExportCSV" GridPane.columnIndex="0" GridPane.rowIndex="7" prefWidth="90.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="Label1" fx:id="iridiumLastMessage" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="Label2" fx:id="iridiumSubject" GridPane.columnIndex="1" GridPane.rowIndex="1" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="Label3" fx:id="iridiumFilename" GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="Label4" fx:id="iridiumReceived" GridPane.columnIndex="1" GridPane.rowIndex="3" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Button text="Open" onAction="#iridiumOpen" GridPane.columnIndex="1" GridPane.rowIndex="4" prefWidth="60.0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<TextField text="0" GridPane.columnIndex="1" GridPane.rowIndex="6" GridPane.halignment="RIGHT" maxWidth="60.0" prefWidth="60.0" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Button text="Reconnect" onAction="#iridiumReconnect" GridPane.columnIndex="1" GridPane.rowIndex="7" prefWidth="90.0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
</children>
</GridPane>
@@ -4,8 +4,8 @@
<GridPane alignment="TOP_CENTER" BorderPane.alignment="CENTER">
<padding><Insets bottom="5" /></padding>
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="120.0" prefWidth="90.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -19,22 +19,21 @@
</rowConstraints>
<children>
<Label text="Last message from:" GridPane.columnIndex="0" GridPane.rowIndex="0" />
<Label text="Subject:" GridPane.columnIndex="0" GridPane.rowIndex="1" />
<Label text="Filename:" GridPane.columnIndex="0" GridPane.rowIndex="2" />
<Label text="Received at:" GridPane.columnIndex="0" GridPane.rowIndex="3" />
<Label text="Add file:" GridPane.columnIndex="0" GridPane.rowIndex="4" />
<Button text="Clear Data" onAction="#iridiumClearData" GridPane.columnIndex="0" GridPane.rowIndex="5" />
<Label text="#Masseges on reconnect:" GridPane.columnIndex="0" GridPane.rowIndex="6" />
<Button text="exportCSV" onAction="#iridiumExportCSV" GridPane.columnIndex="0" GridPane.rowIndex="7" />
<Label text="" GridPane.columnIndex="1" GridPane.rowIndex="0" />
<Label text="" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<Label text="" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<Label text="" GridPane.columnIndex="1" GridPane.rowIndex="3" />
<Button text="Open" onAction="#iridiumOpen" GridPane.columnIndex="1" GridPane.rowIndex="4" />
<Label text="" GridPane.columnIndex="1" GridPane.rowIndex="5" />
<TextField text="0" GridPane.columnIndex="1" GridPane.rowIndex="6" />
<Button text="Reconnect" onAction="#iridiumReconnect" GridPane.columnIndex="1" GridPane.rowIndex="7" />
<Label text="Last message from:" GridPane.columnIndex="0" GridPane.rowIndex="0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="Subject:" GridPane.columnIndex="0" GridPane.rowIndex="1" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="Filename:" GridPane.columnIndex="0" GridPane.rowIndex="2" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="Received at:" GridPane.columnIndex="0" GridPane.rowIndex="3" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="Add file:" GridPane.columnIndex="0" GridPane.rowIndex="4" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Button text="Clear Data" onAction="#iridiumClearData" GridPane.columnIndex="0" GridPane.rowIndex="5" prefWidth="90.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="#Masseges on reconnect:" GridPane.columnIndex="0" GridPane.rowIndex="6" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Button text="exportCSV" onAction="#iridiumExportCSV" GridPane.columnIndex="0" GridPane.rowIndex="7" prefWidth="90.0" GridPane.halignment="LEFT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="Label1" fx:id="iridiumLastMessage" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="Label2" fx:id="iridiumSubject" GridPane.columnIndex="1" GridPane.rowIndex="1" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="Label3" fx:id="iridiumFilename" GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Label text="Label4" fx:id="iridiumReceived" GridPane.columnIndex="1" GridPane.rowIndex="3" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Button text="Open" onAction="#iridiumOpen" GridPane.columnIndex="1" GridPane.rowIndex="4" prefWidth="60.0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<TextField text="0" GridPane.columnIndex="1" GridPane.rowIndex="6" GridPane.halignment="RIGHT" maxWidth="60.0" prefWidth="60.0" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
<Button text="Reconnect" onAction="#iridiumReconnect" GridPane.columnIndex="1" GridPane.rowIndex="7" prefWidth="90.0" GridPane.halignment="RIGHT" GridPane.hgrow="SOMETIMES" GridPane.valignment="CENTER" GridPane.vgrow="SOMETIMES" />
</children>
</GridPane>
Oops, something went wrong.

0 comments on commit f851b66

Please sign in to comment.