commit3

tainfante · Nov 11, 2017 · 4af606a · 4af606a
1 parent 5fce7f6
commit 4af606a
Show file tree

Hide file tree

Showing 20 changed files with 358 additions and 207 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/out/production/RealTimeSerialPlotter/application/Main.class b/out/production/RealTimeSerialPlotter/application/Main.class
diff --git a/out/production/RealTimeSerialPlotter/mainwindow/COMPort.class b/out/production/RealTimeSerialPlotter/mainwindow/COMPort.class
diff --git a/out/production/RealTimeSerialPlotter/mainwindow/Channel.class b/out/production/RealTimeSerialPlotter/mainwindow/Channel.class
diff --git a/out/production/RealTimeSerialPlotter/mainwindow/Export.class b/out/production/RealTimeSerialPlotter/mainwindow/Export.class
diff --git a/out/production/RealTimeSerialPlotter/mainwindow/Log.class b/out/production/RealTimeSerialPlotter/mainwindow/Log.class
diff --git a/out/production/RealTimeSerialPlotter/mainwindow/channel.fxml b/out/production/RealTimeSerialPlotter/mainwindow/channel.fxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane xmlns="http://javafx.com/javafx"
+            xmlns:fx="http://javafx.com/fxml"
+            fx:controller="mainwindow.Channel"
+            prefHeight="400.0" prefWidth="600.0">
+        <children>
+            <TextField layoutX="46.0" layoutY="118.0" />
+            <TextField layoutX="217.0" layoutY="118.0" />
+            <ColorPicker layoutX="396.0" layoutY="118.0" />
+            <Button layoutX="45.0" layoutY="149.0" mnemonicParsing="false" text="Set" />
+            <ChoiceBox layoutX="45.0" layoutY="53.0" prefWidth="150.0" />
+            <Label layoutX="48.0" layoutY="26.0" prefHeight="17.0" prefWidth="149.0" text="Choose channel" />
+            <Label layoutX="45.0" layoutY="91.0" prefHeight="17.0" prefWidth="152.0" text="Set curve name" />
+            <Label layoutX="217.0" layoutY="91.0" prefHeight="17.0" prefWidth="151.0" text="Set units" />
+            <Label layoutX="396.0" layoutY="91.0" prefHeight="17.0" prefWidth="127.0" text="Set color" />
+        </children>
+</AnchorPane>
diff --git a/out/production/RealTimeSerialPlotter/mainwindow/chart.fxml b/out/production/RealTimeSerialPlotter/mainwindow/chart.fxml
@@ -6,9 +6,34 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
+<?import javafx.scene.chart.LineChart?>
+<?import javafx.scene.chart.CategoryAxis?>
+<?import javafx.scene.chart.NumberAxis?>
 <AnchorPane xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml"
             fx:controller="mainwindow.Chart"
-            prefHeight="400.0" prefWidth="600.0">
-
+            prefHeight="180.0" prefWidth="200.0">
+    <children>
+            <LineChart layoutY="37.0" prefHeight="226.0" prefWidth="455.0">
+                <xAxis>
+                    <CategoryAxis side="BOTTOM" />
+                </xAxis>
+                <yAxis>
+                    <NumberAxis side="LEFT" />
+                </yAxis>
+            </LineChart>
+            <RadioButton layoutX="474.0" layoutY="87.0" mnemonicParsing="false" text="Channel 3" />
+            <RadioButton layoutX="474.0" layoutY="104.0" mnemonicParsing="false" text="Channel 4" />
+            <RadioButton layoutX="474.0" layoutY="121.0" mnemonicParsing="false" text="Channel 5" />
+            <RadioButton layoutX="474.0" layoutY="142.0" mnemonicParsing="false" text="Channel 6" />
+            <RadioButton layoutX="474.0" layoutY="161.0" mnemonicParsing="false" text="Channel 7" />
+            <RadioButton layoutX="474.0" layoutY="178.0" mnemonicParsing="false" text="Channel 8" />
+            <RadioButton layoutX="474.0" layoutY="53.0" mnemonicParsing="false" text="Channel 1" />
+            <RadioButton layoutX="474.0" layoutY="70.0" mnemonicParsing="false" text="Channel 2" />
+            <Button layoutX="114.0" layoutY="263.0" mnemonicParsing="false" text="START" />
+            <Button layoutX="176.0" layoutY="263.0" mnemonicParsing="false" text="STOP" />
+            <CheckBox layoutX="475.0" layoutY="205.0" mnemonicParsing="false" text="CheckBox" />
+        </children>
 </AnchorPane>
+
+
diff --git a/out/production/RealTimeSerialPlotter/mainwindow/export.fxml b/out/production/RealTimeSerialPlotter/mainwindow/export.fxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane xmlns="http://javafx.com/javafx"
+            xmlns:fx="http://javafx.com/fxml"
+            fx:controller="mainwindow.Export"
+            prefHeight="400.0" prefWidth="600.0">
+
+</AnchorPane>
diff --git a/out/production/RealTimeSerialPlotter/mainwindow/log.fxml b/out/production/RealTimeSerialPlotter/mainwindow/log.fxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane xmlns="http://javafx.com/javafx"
+            xmlns:fx="http://javafx.com/fxml"
+            fx:controller="mainwindow.Log"
+            prefHeight="400.0" prefWidth="600.0">
+
+</AnchorPane>
diff --git a/out/production/RealTimeSerialPlotter/mainwindow/mainwindow.fxml b/out/production/RealTimeSerialPlotter/mainwindow/mainwindow.fxml
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.chart.CategoryAxis?>
-<?import javafx.scene.chart.LineChart?>
-<?import javafx.scene.chart.NumberAxis?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ChoiceBox?>
 <?import javafx.scene.control.ColorPicker?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Menu?>
 <?import javafx.scene.control.MenuBar?>
 <?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.ProgressBar?>
-<?import javafx.scene.control.RadioButton?>
 <?import javafx.scene.control.Tab?>
 <?import javafx.scene.control.TabPane?>
 <?import javafx.scene.control.TextField?>
@@ -45,72 +39,32 @@
             </Menu>
         </menus>
       </MenuBar>
-      <TabPane layoutY="76.0" prefHeight="326.0" prefWidth="600.0" tabClosingPolicy="UNAVAILABLE">
+      <TabPane layoutY="52.0" prefHeight="350.0" prefWidth="600.0" tabClosingPolicy="UNAVAILABLE">
         <tabs>
           <Tab text="Chart">
             <content>
-              <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
-                     <children>
-                        <LineChart layoutY="37.0" prefHeight="226.0" prefWidth="455.0">
-                          <xAxis>
-                            <CategoryAxis side="BOTTOM" />
-                          </xAxis>
-                          <yAxis>
-                            <NumberAxis side="LEFT" />
-                          </yAxis>
-                        </LineChart>
-                        <RadioButton layoutX="474.0" layoutY="87.0" mnemonicParsing="false" text="Channel 3" />
-                        <RadioButton layoutX="474.0" layoutY="104.0" mnemonicParsing="false" text="Channel 4" />
-                        <RadioButton layoutX="474.0" layoutY="121.0" mnemonicParsing="false" text="Channel 5" />
-                        <RadioButton layoutX="474.0" layoutY="142.0" mnemonicParsing="false" text="Channel 6" />
-                        <RadioButton layoutX="474.0" layoutY="161.0" mnemonicParsing="false" text="Channel 7" />
-                        <RadioButton layoutX="474.0" layoutY="178.0" mnemonicParsing="false" text="Channel 8" />
-                        <RadioButton layoutX="474.0" layoutY="53.0" mnemonicParsing="false" text="Channel 1" />
-                        <RadioButton layoutX="474.0" layoutY="70.0" mnemonicParsing="false" text="Channel 2" />
-                        <Button layoutX="114.0" layoutY="263.0" mnemonicParsing="false" text="START" />
-                        <Button layoutX="176.0" layoutY="263.0" mnemonicParsing="false" text="STOP" />
-                        <CheckBox layoutX="475.0" layoutY="205.0" mnemonicParsing="false" text="CheckBox" />
-                     </children>
-                  </AnchorPane>
+                <fx:include source="chart.fxml" />
             </content>
           </Tab>
           <Tab text="Channel settings">
             <content>
-              <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
-                     <children>
-                        <TextField layoutX="46.0" layoutY="118.0" />
-                        <TextField layoutX="217.0" layoutY="118.0" />
-                        <ColorPicker layoutX="396.0" layoutY="118.0" />
-                        <Button layoutX="45.0" layoutY="149.0" mnemonicParsing="false" text="Set" />
-                        <ChoiceBox layoutX="45.0" layoutY="53.0" prefWidth="150.0" />
-                        <Label layoutX="48.0" layoutY="26.0" prefHeight="17.0" prefWidth="149.0" text="Choose channel" />
-                        <Label layoutX="45.0" layoutY="91.0" prefHeight="17.0" prefWidth="152.0" text="Set curve name" />
-                        <Label layoutX="217.0" layoutY="91.0" prefHeight="17.0" prefWidth="151.0" text="Set units" />
-                        <Label layoutX="396.0" layoutY="91.0" prefHeight="17.0" prefWidth="127.0" text="Set color" />
-                     </children></AnchorPane>
+                <fx:include source="channel.fxml" />
             </content>
           </Tab>
             <Tab text="Export">
                 <content>
-                    <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
+                    <fx:include source="export.fxml" />
                 </content>
             </Tab>
             <Tab text="Log">
                 <content>
-                    <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
+                    <fx:include source="log.fxml" />
                 </content>
             </Tab>
         </tabs>
       </TabPane>
       <HBox layoutY="27.0" prefHeight="25.0" prefWidth="600.0">
-         <children>
-            <Button mnemonicParsing="false" text="Button" />
-            <ProgressBar prefHeight="25.0" prefWidth="200.0" progress="0.0" />
-            <Label prefHeight="25.0" prefWidth="348.0" text="Label" />
-         </children></HBox>
-      <HBox layoutY="52.0" prefHeight="25.0" prefWidth="600.0" >
-          <fx:include source="comport.fxml"/>
-
+          <fx:include source="comport.fxml" />
       </HBox>
    </children>
 </AnchorPane>
diff --git a/src/application/Main.java b/src/application/Main.java
@@ -10,9 +10,9 @@ public class Main extends Application {
 
     @Override
     public void start(Stage primaryStage) throws Exception{
-        Parent root = FXMLLoader.load(getClass().getResource("sample.fxml"));
-        primaryStage.setTitle("Hello World");
-        primaryStage.setScene(new Scene(root, 300, 275));
+        Parent root = FXMLLoader.load(getClass().getResource("/mainwindow/mainwindow.fxml"));
+        primaryStage.setTitle("Real Time Serial Plotter");
+        primaryStage.setScene(new Scene(root, 600, 400));
         primaryStage.show();
     }
 

diff --git a/src/mainwindow/Channel.java b/src/mainwindow/Channel.java
@@ -0,0 +1,4 @@
+package mainwindow;
+
+public class Channel {
+}
diff --git a/src/mainwindow/Export.java b/src/mainwindow/Export.java
@@ -0,0 +1,4 @@
+package mainwindow;
+
+public class Export {
+}
diff --git a/src/mainwindow/Log.java b/src/mainwindow/Log.java
@@ -0,0 +1,4 @@
+package mainwindow;
+
+public class Log {
+}
diff --git a/src/mainwindow/channel.fxml b/src/mainwindow/channel.fxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane xmlns="http://javafx.com/javafx"
+            xmlns:fx="http://javafx.com/fxml"
+            fx:controller="mainwindow.Channel"
+            prefHeight="400.0" prefWidth="600.0">
+        <children>
+            <TextField layoutX="46.0" layoutY="118.0" />
+            <TextField layoutX="217.0" layoutY="118.0" />
+            <ColorPicker layoutX="396.0" layoutY="118.0" />
+            <Button layoutX="45.0" layoutY="149.0" mnemonicParsing="false" text="Set" />
+            <ChoiceBox layoutX="45.0" layoutY="53.0" prefWidth="150.0" />
+            <Label layoutX="48.0" layoutY="26.0" prefHeight="17.0" prefWidth="149.0" text="Choose channel" />
+            <Label layoutX="45.0" layoutY="91.0" prefHeight="17.0" prefWidth="152.0" text="Set curve name" />
+            <Label layoutX="217.0" layoutY="91.0" prefHeight="17.0" prefWidth="151.0" text="Set units" />
+            <Label layoutX="396.0" layoutY="91.0" prefHeight="17.0" prefWidth="127.0" text="Set color" />
+        </children>
+</AnchorPane>
diff --git a/src/mainwindow/chart.fxml b/src/mainwindow/chart.fxml
@@ -6,9 +6,34 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
+<?import javafx.scene.chart.LineChart?>
+<?import javafx.scene.chart.CategoryAxis?>
+<?import javafx.scene.chart.NumberAxis?>
 <AnchorPane xmlns="http://javafx.com/javafx"
             xmlns:fx="http://javafx.com/fxml"
             fx:controller="mainwindow.Chart"
-            prefHeight="400.0" prefWidth="600.0">
-
+            prefHeight="180.0" prefWidth="200.0">
+    <children>
+            <LineChart layoutY="37.0" prefHeight="226.0" prefWidth="455.0">
+                <xAxis>
+                    <CategoryAxis side="BOTTOM" />
+                </xAxis>
+                <yAxis>
+                    <NumberAxis side="LEFT" />
+                </yAxis>
+            </LineChart>
+            <RadioButton layoutX="474.0" layoutY="87.0" mnemonicParsing="false" text="Channel 3" />
+            <RadioButton layoutX="474.0" layoutY="104.0" mnemonicParsing="false" text="Channel 4" />
+            <RadioButton layoutX="474.0" layoutY="121.0" mnemonicParsing="false" text="Channel 5" />
+            <RadioButton layoutX="474.0" layoutY="142.0" mnemonicParsing="false" text="Channel 6" />
+            <RadioButton layoutX="474.0" layoutY="161.0" mnemonicParsing="false" text="Channel 7" />
+            <RadioButton layoutX="474.0" layoutY="178.0" mnemonicParsing="false" text="Channel 8" />
+            <RadioButton layoutX="474.0" layoutY="53.0" mnemonicParsing="false" text="Channel 1" />
+            <RadioButton layoutX="474.0" layoutY="70.0" mnemonicParsing="false" text="Channel 2" />
+            <Button layoutX="114.0" layoutY="263.0" mnemonicParsing="false" text="START" />
+            <Button layoutX="176.0" layoutY="263.0" mnemonicParsing="false" text="STOP" />
+            <CheckBox layoutX="475.0" layoutY="205.0" mnemonicParsing="false" text="CheckBox" />
+        </children>
 </AnchorPane>
+
+
diff --git a/src/mainwindow/export.fxml b/src/mainwindow/export.fxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane xmlns="http://javafx.com/javafx"
+            xmlns:fx="http://javafx.com/fxml"
+            fx:controller="mainwindow.Export"
+            prefHeight="400.0" prefWidth="600.0">
+
+</AnchorPane>
diff --git a/src/mainwindow/log.fxml b/src/mainwindow/log.fxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane xmlns="http://javafx.com/javafx"
+            xmlns:fx="http://javafx.com/fxml"
+            fx:controller="mainwindow.Log"
+            prefHeight="400.0" prefWidth="600.0">
+
+</AnchorPane>