Added possibility of choice format data to capture.

tainfante · Jan 24, 2018 · 13a08c7 · 13a08c7
1 parent 47b6d96
commit 13a08c7
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 25 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/src/application/Main.java b/src/application/Main.java
@@ -5,6 +5,7 @@
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
+import mainwindow.CaptureController;
 import port.PortReader;
 
 public class Main extends Application
@@ -20,7 +21,11 @@ public void start(Stage primaryStage) throws Exception
         primaryStage.setMinHeight(450.0);
         primaryStage.setMinWidth(620.0);
 
-        primaryStage.setOnCloseRequest(event -> PortReader.getInstance().setStopReading(true));
+        primaryStage.setOnCloseRequest(event ->
+        {
+            CaptureController.isActiveExport = false;
+            PortReader.getInstance().setStopReading(true);
+        });
 
         primaryStage.show();
     }

diff --git a/src/classes/Frame.java b/src/classes/Frame.java
@@ -51,15 +51,22 @@ public Date getTime() {
         return date;
     }
 
-    public String toString(boolean checks[])
+    public String toString(boolean checks[], String format)
     {
         StringBuilder s = new StringBuilder();
 
         for(short i = 0; i < numberOfChannels;i++)
         {
             if (checks[i])
             {
-                s.append(channelData.get(i).toString()).append(" ");
+                if(format.equals("hex"))
+                {
+                    s.append(Integer.toHexString(channelData.get(i))).append(" ");
+                }
+                else if(format.equals("decimal"))
+                {
+                    s.append(channelData.get(i).toString()).append(" ");
+                }
             }
             else
             {

diff --git a/src/mainwindow/CaptureController.java b/src/mainwindow/CaptureController.java
@@ -24,8 +24,9 @@ public class CaptureController implements Initializable
     public Button startAppendButton;
     public Button stopButton;
 
-    public RadioButton asHexRadioButton;
     public RadioButton asDecimalRadioButton;
+    public RadioButton asHexRadioButton;
+    private ToggleGroup formatOfValuesGroup;
 
     public CheckBox channel1CheckBox;
     public CheckBox channel2CheckBox;
@@ -38,7 +39,7 @@ public class CaptureController implements Initializable
 
     private ArrayList<CheckBox> channelCheckBoxes;
 
-    private volatile boolean isActiveExport;
+    public static volatile boolean isActiveExport;
 
     private File file;
 
@@ -55,6 +56,14 @@ public void initialize(URL location, ResourceBundle resources)
         channelCheckBoxes.add(channel6CheckBox);
         channelCheckBoxes.add(channel7CheckBox);
         channelCheckBoxes.add(channel8CheckBox);
+
+        formatOfValuesGroup = new ToggleGroup();
+        asDecimalRadioButton.setToggleGroup(formatOfValuesGroup);
+        asDecimalRadioButton.setSelected(true);
+        asDecimalRadioButton.setUserData("decimal");
+
+        asHexRadioButton.setToggleGroup(formatOfValuesGroup);
+        asHexRadioButton.setUserData("hex");
     }
 
     public void chooseFileClick()
@@ -83,11 +92,15 @@ public void startOverwriteClick()
                 PortReader.getInstance().setExportBufferEnabled(true);
                 isActiveExport = true;
 
+                Log.getInstance().log("Capturing is started.");
+
                 stopButton.setDisable(false);
                 //startAppendButton.setDisable(true);
                 startOverwriteButton.setDisable(true);
+                asHexRadioButton.setDisable(true);
+                asDecimalRadioButton.setDisable(true);
 
-                new Thread(() ->
+                Thread capturingThread = new Thread(() ->
                 {
                     int i;
 
@@ -120,7 +133,7 @@ public void startOverwriteClick()
                                     checks[i] = channelCheckBoxes.get(i).isSelected();
                                 }
 
-                                printWriter.println(frame.toString(checks));
+                                printWriter.println(frame.toString(checks, formatOfValuesGroup.getSelectedToggle().getUserData().toString()));
                             }
                         }
 
@@ -131,8 +144,9 @@ public void startOverwriteClick()
                         e.printStackTrace();
                     }
 
-                }).start();
-
+                });
+                capturingThread.setName("Capturing Thread");
+                capturingThread.start();
             }
             else
             {
@@ -155,7 +169,6 @@ public void startAppendClick()
             stopButton.setDisable(false);
             startAppendButton.setDisable(true);
             startOverwriteButton.setDisable(true);
-
         }
         else
         {
@@ -178,6 +191,10 @@ public void stopClick()
             Platform.runLater(() -> channelCheckBoxes.get(finalI).setDisable(false));
         }
 
+        asHexRadioButton.setDisable(false);
+        asDecimalRadioButton.setDisable(false);
+
+        Log.getInstance().log("Capturing is stopped.");
     }
 
     private void showInformationAlert(String information)

diff --git a/src/mainwindow/captureView.fxml b/src/mainwindow/captureView.fxml
@@ -72,12 +72,12 @@
                   </Button>
                </children>
             </HBox>
-            <RadioButton fx:id="asHexRadioButton" focusTraversable="false" mnemonicParsing="false" text="as hex">
+            <RadioButton fx:id="asDecimalRadioButton" focusTraversable="false" mnemonicParsing="false" text="as decimal">
                <font>
                   <Font size="11.0" />
                </font>
             </RadioButton>
-            <RadioButton fx:id="asDecimalRadioButton" focusTraversable="false" mnemonicParsing="false" text="as decimal">
+            <RadioButton fx:id="asHexRadioButton" focusTraversable="false" mnemonicParsing="false" text="as hex">
                <font>
                   <Font size="11.0" />
                </font>

diff --git a/src/port/PortReader.java b/src/port/PortReader.java
@@ -86,12 +86,9 @@ private Frame readFrame()
 
                         if ( CRC16.checksumIsAgree(bufferIn) )
                         {
-                            System.out.println("The checksums agrees.");
-
                             try
                             {
                                 frame = mapBufferToFrame(bufferIn);
-                                System.out.println("Buffer is mapped to object of Frame type.");
                                 listening = false;
                             }
                             catch (Exception e)
@@ -104,7 +101,6 @@ private Frame readFrame()
                         }
                         else
                         {
-                            Log.getInstance().log("The checksums doesn't agrees.");
                             listening = false;
                         }
                     }
@@ -183,8 +179,6 @@ public void startReading()
         // create a new thread and listen for frame, then add to frame buffer
         Thread readingThread = new Thread(() ->
         {
-            System.out.println("Started reading thread.");
-
             while (!stopReading)
             {
                 try
@@ -199,23 +193,19 @@ public void startReading()
                         {
                             exportFrameBuffer.put(frame);
                         }
-
-                        System.out.println("New frame is added to the queue.");
                     }
                     else
                     {
-                        System.out.println("Read frame is a null.");
+                        //System.out.println("Read frame is a null.");
                     }
                 }
                 catch (InterruptedException e)
                 {
                     e.printStackTrace();
                 }
             }
-
-            System.out.println("Stopped reading thread.");
         });
-        readingThread.setName("FrameReadingThread");
+        readingThread.setName("Frame Reading Thread");
         readingThread.start();
     }