Merge pull request #14 from opetany93/poprawki_Agaty

Fixed capturing of data
tainfante · Jan 31, 2018 · 6c84d01 · 6c84d01
2 parents 8d93999 + fb80deb
commit 6c84d01
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 7 deletions.
diff --git a/.idea/artifacts/RealTimeSerialPlotter_jar.xml b/.idea/artifacts/RealTimeSerialPlotter_jar.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Class-Path: purejavacomm-1.0.2.RELEASE.jar
+Main-Class: application.Main
+
diff --git a/src/application/Main.java b/src/application/Main.java
@@ -4,6 +4,7 @@
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import mainwindow.CaptureController;
 import plot.Plot;
@@ -22,6 +23,9 @@ public void start(Stage primaryStage) throws Exception
         primaryStage.setMinHeight(450.0);
         primaryStage.setMinWidth(620.0);
 
+        Image applicationIcon = new Image(getClass().getResourceAsStream("icon.png"));
+        primaryStage.getIcons().add(applicationIcon);
+
         primaryStage.setOnCloseRequest(event ->
         {
             CaptureController.isActiveExport = false;

diff --git a/src/application/RealTimeSerialPlotter_box.png b/src/application/RealTimeSerialPlotter_box.png
diff --git a/src/application/icon.png b/src/application/icon.png
diff --git a/src/mainwindow/CaptureController.java b/src/mainwindow/CaptureController.java
@@ -85,7 +85,7 @@ public void startOverwriteClick()
     {
         file = new File(filePathTextField.getText());
 
-        if(file.exists())
+        if(file.getPath().substring(file.getPath().length() - 3, file.getPath().length()).equals("txt"))
         {
             if(PortReader.getInstance().isOpen())
             {
@@ -155,7 +155,7 @@ public void startOverwriteClick()
         }
         else
         {
-            showErrorAlert("Podana ścieżka jest niepoprawna!");
+            showErrorAlert("Given path is wrong!");
         }
     }
 

diff --git a/src/mainwindow/PortController.java b/src/mainwindow/PortController.java
@@ -1,5 +1,6 @@
 package mainwindow;
 
+import javafx.scene.control.Alert;
 import plot.Plot;
 import port.PortReader;
 import javafx.fxml.FXML;
@@ -115,6 +116,17 @@ public void onActionConnectButton()
                     PortReader.getInstance().startReading();
                     Plot.getInstance().startPlotting();
                 }
+                else
+                {
+                    Log.getInstance().log("An attempt to open the port was unsuccessful.");
+
+                    Alert alert = new Alert(Alert.AlertType.WARNING);
+
+                    alert.setTitle("Real Time Serial Plotter");
+                    alert.setHeaderText(null);
+                    alert.setContentText("Port is already in use. Cannot open.");
+                    alert.showAndWait();
+                }
             }
         }
         else

diff --git a/src/mainwindow/captureView.fxml b/src/mainwindow/captureView.fxml
@@ -33,7 +33,7 @@
                         <Font size="11.0" />
                      </font>
                   </Label>
-                  <TextField fx:id="filePathTextField" focusTraversable="false" minHeight="20.0" prefHeight="10.0" prefWidth="268.0" text="C:\captureOfData.txt">
+                  <TextField fx:id="filePathTextField" editable="false" focusTraversable="false" minHeight="20.0" prefHeight="10.0" prefWidth="268.0" text="C:\captureOfData.txt">
                      <HBox.margin>
                         <Insets left="5.0" right="5.0" />
                      </HBox.margin>

diff --git a/src/port/Port.java b/src/port/Port.java
@@ -100,9 +100,6 @@ public boolean open(String serialPortName, int dataBits, int stopBits, int parit
         }
         catch (Throwable thwble)
         {
-            Log.getInstance().log("An attempt to open the port was unsuccessful.");
-            thwble.printStackTrace();
-
             return false;
         }
     }