Skip to content

Commit

Permalink
commit4
Browse files Browse the repository at this point in the history
  • Loading branch information
@tainfante
tainfante committed Nov 11, 2017
1 parent 4af606a commit 15e7e2b
Show file tree
Hide file tree
Showing 7 changed files with 280 additions and 340 deletions.
329 changes: 115 additions & 214 deletions .idea/workspace.xml
View file

Large diffs are not rendered by default.

Binary file modified out/production/RealTimeSerialPlotter/application/Main.class
View file
Binary file not shown.
65 changes: 40 additions & 25 deletions out/production/RealTimeSerialPlotter/mainwindow/chart.fxml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import java.lang.*?>
<?import java.util.*?>
<?import javafx.scene.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>

<?import javafx.scene.chart.LineChart?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.chart.CategoryAxis?>
<?import javafx.scene.chart.LineChart?>
<?import javafx.scene.chart.NumberAxis?>
<AnchorPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="mainwindow.Chart"
prefHeight="180.0" prefWidth="200.0">
<children>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.CheckBox?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>

<BorderPane minHeight="325.0" minWidth="600.0" xmlns="http://javafx.com/javafx/8.0.121" xmlns:fx="http://javafx.com/fxml/1" fx:controller="mainwindow.Chart">
<center>
<LineChart layoutY="37.0" prefHeight="226.0" prefWidth="455.0">
<xAxis>
<CategoryAxis side="BOTTOM" />
Expand All @@ -22,18 +20,35 @@
<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>
</center>
<right>
<VBox spacing="10.0" BorderPane.alignment="CENTER">
<CheckBox alignment="CENTER" layoutX="474.0" layoutY="87.0" mnemonicParsing="false" text="Channel 3" />
<CheckBox layoutX="474.0" layoutY="104.0" mnemonicParsing="false" text="Channel 4" />
<CheckBox layoutX="474.0" layoutY="121.0" mnemonicParsing="false" text="Channel 5" />
<CheckBox layoutX="474.0" layoutY="142.0" mnemonicParsing="false" text="Channel 6" />
<CheckBox layoutX="474.0" layoutY="161.0" mnemonicParsing="false" text="Channel 7" />
<CheckBox layoutX="474.0" layoutY="178.0" mnemonicParsing="false" text="Channel 8" />
<CheckBox layoutX="474.0" layoutY="53.0" mnemonicParsing="false" text="Channel 1" />
<CheckBox layoutX="474.0" layoutY="70.0" mnemonicParsing="false" text="Channel 2" />
<BorderPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</BorderPane.margin>
<padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</padding>
</VBox>


</right>
<bottom>
<HBox spacing="10.0">
<Button layoutX="114.0" layoutY="263.0" mnemonicParsing="false" text="START" />
<Button layoutX="176.0" layoutY="263.0" mnemonicParsing="false" text="STOP" />
<BorderPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</BorderPane.margin>
</HBox>

</bottom>
</BorderPane>
79 changes: 41 additions & 38 deletions out/production/RealTimeSerialPlotter/mainwindow/mainwindow.fxml
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.control.Button?>
<?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.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>

<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.121" xmlns:fx="http://javafx.com/fxml/1">
<children>
<MenuBar layoutY="2.0" prefHeight="25.0" prefWidth="600.0">
<menus>
<Menu mnemonicParsing="false" text="File">
<items>
<MenuItem mnemonicParsing="false" text="Close" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Edit">
<items>
<MenuItem mnemonicParsing="false" text="Delete" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Help">
<items>
<MenuItem mnemonicParsing="false" text="About" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Unspecified Menu">
<items>
<MenuItem mnemonicParsing="false" text="Action 1" />
</items>
</Menu>
</menus>
</MenuBar>
<TabPane layoutY="52.0" prefHeight="350.0" prefWidth="600.0" tabClosingPolicy="UNAVAILABLE">
<?import javafx.scene.layout.VBox?>
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="400.0" minWidth="600.0" prefHeight="403.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.121" xmlns:fx="http://javafx.com/fxml/1">

<center>
<TabPane layoutY="52.0" prefHeight="314.0" prefWidth="600.0" tabClosingPolicy="UNAVAILABLE">
<tabs>
<Tab text="Chart">
<content>
Expand All @@ -63,8 +36,38 @@
</Tab>
</tabs>
</TabPane>
<HBox layoutY="27.0" prefHeight="25.0" prefWidth="600.0">
<fx:include source="comport.fxml" />
</HBox>
</children>
</AnchorPane>
</center>

<top>
<VBox prefHeight="50.0" prefWidth="600.0">
<MenuBar layoutY="2.0" prefHeight="25.0" prefWidth="600.0">
<menus>
<Menu mnemonicParsing="false" text="File">
<items>
<MenuItem mnemonicParsing="false" text="Exit" />
<MenuItem mnemonicParsing="false" text="" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Edit">
<items>
<MenuItem mnemonicParsing="false" text="Delete" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Help">
<items>
<MenuItem mnemonicParsing="false" text="About" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Unspecified Menu">
<items>
<MenuItem mnemonicParsing="false" text="Action 1" />
</items>
</Menu>
</menus>
</MenuBar>
<HBox layoutY="27.0" prefHeight="25.0" prefWidth="600.0">
<fx:include source="comport.fxml" />
</HBox>
</VBox>
</top>
</BorderPane>
3 changes: 3 additions & 0 deletions src/application/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ public void start(Stage primaryStage) throws Exception{
Parent root = FXMLLoader.load(getClass().getResource("/mainwindow/mainwindow.fxml"));
primaryStage.setTitle("Real Time Serial Plotter");
primaryStage.setScene(new Scene(root, 600, 400));
primaryStage.setMinHeight(450.0);
primaryStage.setMinWidth(620.0);

primaryStage.show();
}

Expand Down
65 changes: 40 additions & 25 deletions src/mainwindow/chart.fxml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import java.lang.*?>
<?import java.util.*?>
<?import javafx.scene.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>

<?import javafx.scene.chart.LineChart?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.chart.CategoryAxis?>
<?import javafx.scene.chart.LineChart?>
<?import javafx.scene.chart.NumberAxis?>
<AnchorPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="mainwindow.Chart"
prefHeight="180.0" prefWidth="200.0">
<children>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.CheckBox?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>

<BorderPane minHeight="325.0" minWidth="600.0" xmlns="http://javafx.com/javafx/8.0.121" xmlns:fx="http://javafx.com/fxml/1" fx:controller="mainwindow.Chart">
<center>
<LineChart layoutY="37.0" prefHeight="226.0" prefWidth="455.0">
<xAxis>
<CategoryAxis side="BOTTOM" />
Expand All @@ -22,18 +20,35 @@
<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>
</center>
<right>
<VBox spacing="10.0" BorderPane.alignment="CENTER">
<CheckBox alignment="CENTER" layoutX="474.0" layoutY="87.0" mnemonicParsing="false" text="Channel 3" />
<CheckBox layoutX="474.0" layoutY="104.0" mnemonicParsing="false" text="Channel 4" />
<CheckBox layoutX="474.0" layoutY="121.0" mnemonicParsing="false" text="Channel 5" />
<CheckBox layoutX="474.0" layoutY="142.0" mnemonicParsing="false" text="Channel 6" />
<CheckBox layoutX="474.0" layoutY="161.0" mnemonicParsing="false" text="Channel 7" />
<CheckBox layoutX="474.0" layoutY="178.0" mnemonicParsing="false" text="Channel 8" />
<CheckBox layoutX="474.0" layoutY="53.0" mnemonicParsing="false" text="Channel 1" />
<CheckBox layoutX="474.0" layoutY="70.0" mnemonicParsing="false" text="Channel 2" />
<BorderPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</BorderPane.margin>
<padding>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</padding>
</VBox>


</right>
<bottom>
<HBox spacing="10.0">
<Button layoutX="114.0" layoutY="263.0" mnemonicParsing="false" text="START" />
<Button layoutX="176.0" layoutY="263.0" mnemonicParsing="false" text="STOP" />
<BorderPane.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</BorderPane.margin>
</HBox>

</bottom>
</BorderPane>
79 changes: 41 additions & 38 deletions src/mainwindow/mainwindow.fxml
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.control.Button?>
<?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.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>

<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.121" xmlns:fx="http://javafx.com/fxml/1">
<children>
<MenuBar layoutY="2.0" prefHeight="25.0" prefWidth="600.0">
<menus>
<Menu mnemonicParsing="false" text="File">
<items>
<MenuItem mnemonicParsing="false" text="Close" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Edit">
<items>
<MenuItem mnemonicParsing="false" text="Delete" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Help">
<items>
<MenuItem mnemonicParsing="false" text="About" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Unspecified Menu">
<items>
<MenuItem mnemonicParsing="false" text="Action 1" />
</items>
</Menu>
</menus>
</MenuBar>
<TabPane layoutY="52.0" prefHeight="350.0" prefWidth="600.0" tabClosingPolicy="UNAVAILABLE">
<?import javafx.scene.layout.VBox?>
<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="400.0" minWidth="600.0" prefHeight="403.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.121" xmlns:fx="http://javafx.com/fxml/1">

<center>
<TabPane layoutY="52.0" prefHeight="314.0" prefWidth="600.0" tabClosingPolicy="UNAVAILABLE">
<tabs>
<Tab text="Chart">
<content>
Expand All @@ -63,8 +36,38 @@
</Tab>
</tabs>
</TabPane>
<HBox layoutY="27.0" prefHeight="25.0" prefWidth="600.0">
<fx:include source="comport.fxml" />
</HBox>
</children>
</AnchorPane>
</center>

<top>
<VBox prefHeight="50.0" prefWidth="600.0">
<MenuBar layoutY="2.0" prefHeight="25.0" prefWidth="600.0">
<menus>
<Menu mnemonicParsing="false" text="File">
<items>
<MenuItem mnemonicParsing="false" text="Exit" />
<MenuItem mnemonicParsing="false" text="" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Edit">
<items>
<MenuItem mnemonicParsing="false" text="Delete" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Help">
<items>
<MenuItem mnemonicParsing="false" text="About" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Unspecified Menu">
<items>
<MenuItem mnemonicParsing="false" text="Action 1" />
</items>
</Menu>
</menus>
</MenuBar>
<HBox layoutY="27.0" prefHeight="25.0" prefWidth="600.0">
<fx:include source="comport.fxml" />
</HBox>
</VBox>
</top>
</BorderPane>

0 comments on commit 15e7e2b

Please sign in to comment.