Changes in channel settings

tainfante · Jan 31, 2018 · 8d93999 · 8d93999
1 parent d18cf72
commit 8d93999
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 30 deletions.
diff --git a/src/mainwindow/Channel.java b/src/mainwindow/Channel.java
@@ -46,35 +46,44 @@ public void initialize(URL location, ResourceBundle resources) {
     public void onNameKeyPressed(KeyEvent keyEvent) {
         if(keyEvent.getCode() == KeyCode.ENTER){
             try{
-                name=nameText.getText();
-                channel=channelBox.getSelectionModel().getSelectedItem();
-                channel=channelBox.getSelectionModel().getSelectedItem();
-                switch (channel) {
-                    case "Channel 1":
-                        Chart.getInstance().channelUpdateWithoutColor(1, name, units);
-                        break;
-                    case "Channel 2":
-                        Chart.getInstance().channelUpdateWithoutColor(2, name, units);
-                        break;
-                    case "Channel 3":
-                        Chart.getInstance().channelUpdateWithoutColor(3, name,units);
-                        break;
-                    case "Channel 4":
-                        Chart.getInstance().channelUpdateWithoutColor(4, name,units);
-                        break;
-                    case "Channel 5":
-                        Chart.getInstance().channelUpdateWithoutColor(5, name,units);
-                        break;
-                    case "Channel 6":
-                        Chart.getInstance().channelUpdateWithoutColor(6, name ,units);
-                        break;
-                    case "Channel 7":
-                        Chart.getInstance().channelUpdateWithoutColor(7, name,units);
-                        break;
-                    case "Channel 8":
-                        Chart.getInstance().channelUpdateWithoutColor(8, name,units);
-                        break;
+                if(!nameText.getText().isEmpty()){
+                    name=nameText.getText();
+                    channel=channelBox.getSelectionModel().getSelectedItem();
+                    if(!unitText.getText().isEmpty()){
+                        units="["+unitText.getText()+"]";
+                    }
+                    else{
+                        units="";
+                    }
+
+                    switch (channel) {
+                        case "Channel 1":
+                            Chart.getInstance().channelUpdateWithoutColor(1, name, units);
+                            break;
+                        case "Channel 2":
+                            Chart.getInstance().channelUpdateWithoutColor(2, name, units);
+                            break;
+                        case "Channel 3":
+                            Chart.getInstance().channelUpdateWithoutColor(3, name,units);
+                            break;
+                        case "Channel 4":
+                            Chart.getInstance().channelUpdateWithoutColor(4, name,units);
+                            break;
+                        case "Channel 5":
+                            Chart.getInstance().channelUpdateWithoutColor(5, name,units);
+                            break;
+                        case "Channel 6":
+                            Chart.getInstance().channelUpdateWithoutColor(6, name ,units);
+                            break;
+                        case "Channel 7":
+                            Chart.getInstance().channelUpdateWithoutColor(7, name,units);
+                            break;
+                        case "Channel 8":
+                            Chart.getInstance().channelUpdateWithoutColor(8, name,units);
+                            break;
+                    }
                 }
+
             }
             catch(NullPointerException exe){
                 Alert alert = new Alert(Alert.AlertType.ERROR);
@@ -91,6 +100,12 @@ public void onUnitKeyPressed(KeyEvent keyEvent) {
             try{
                 if(!unitText.getText().isEmpty()){
                     units="["+unitText.getText()+"]";
+                    if(!nameText.getText().isEmpty()){
+                        name=nameText.getText();
+                    }
+                    else{
+                        name="";
+                    }
                 }
                 channel=channelBox.getSelectionModel().getSelectedItem();
                 switch (channel) {

diff --git a/src/mainwindow/Chart.java b/src/mainwindow/Chart.java
@@ -460,7 +460,7 @@ public int numberOfSamples() {
 
     public boolean update() {
 
-        if (null != series1) {
+        if (null != series1 && series1.getData().size()>samples) {
             return series1.getData().size() > samples;
         }
         else return false;

diff --git a/src/plot/Plot.java b/src/plot/Plot.java
@@ -170,7 +170,7 @@ public void run() {
                                           break;
                                       case 4:
                                           if (null != series5.getData())
-                                              if (series5.getData().get(0) != null) {
+                                              if (series5.getData().get(0) != null ) {
                                                   series5.getData().remove(0, removeData);
                                               }
                                           break;