Merge pull request #6 from opetany93/master

Few improvements.
tainfante · Dec 7, 2017 · 4ad298b · 4ad298b
2 parents b684e5a + 20bba34
commit 4ad298b
Show file tree

Hide file tree

Showing 32 changed files with 642 additions and 487 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,49 @@
-# Compiled class file
-*.class
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# Output files
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
 out/
 
-\.idea/misc\.xml
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
 
-\.idea/workspace\.xml
+# Cursive Clojure plugin
+.idea/replstate.xml
 
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
diff --git a/.idea/dictionaries/opetany.xml b/.idea/dictionaries/opetany.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/libraries/jssc_2_8_0.xml → .idea/libraries/jSerialComm_1_3_11.xml b/.idea/libraries/jssc_2_8_0.xml → .idea/libraries/jSerialComm_1_3_11.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/RealTimeSerialPlotter.iml b/RealTimeSerialPlotter.iml
@@ -8,6 +8,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="jssc-2.8.0" level="project" />
+    <orderEntry type="library" name="jSerialComm-1.3.11" level="project" />
   </component>
 </module>
diff --git a/Resources/jSerialComm-1.3.11.jar b/Resources/jSerialComm-1.3.11.jar
diff --git a/Resources/jssc-2.8.0.jar b/Resources/jssc-2.8.0.jar
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/Chart.class b/out/production/RealTimeSerialPlotter/mainwindow/Chart.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
diff --git a/out/production/RealTimeSerialPlotter/mainwindow/chart.fxml b/out/production/RealTimeSerialPlotter/mainwindow/chart.fxml
diff --git a/out/production/RealTimeSerialPlotter/mainwindow/comPortLayout.fxml b/out/production/RealTimeSerialPlotter/mainwindow/comPortLayout.fxml
diff --git a/out/production/RealTimeSerialPlotter/mainwindow/export.fxml b/out/production/RealTimeSerialPlotter/mainwindow/export.fxml
diff --git a/out/production/RealTimeSerialPlotter/mainwindow/log.fxml b/out/production/RealTimeSerialPlotter/mainwindow/log.fxml
diff --git a/out/production/RealTimeSerialPlotter/mainwindow/mainWindowLayout.fxml b/out/production/RealTimeSerialPlotter/mainwindow/mainWindowLayout.fxml
diff --git a/out/production/RealTimeSerialPlotter/mainwindow/mainwindow.class b/out/production/RealTimeSerialPlotter/mainwindow/mainwindow.class
diff --git a/src/application/Main.java b/src/application/Main.java
@@ -12,7 +12,7 @@ public class Main extends Application {
     public void start(Stage primaryStage) throws Exception{
         Parent root = FXMLLoader.load(getClass().getResource("/mainwindow/mainWindowLayout.fxml"));
         primaryStage.setTitle("Real Time Serial Plotter");
-        primaryStage.setScene(new Scene(root, 600, 400));
+        primaryStage.setScene(new Scene(root, 640, 480));
         primaryStage.setMinHeight(450.0);
         primaryStage.setMinWidth(620.0);