Merge dev into master for BooleanField Hotfix 2.0.1

serivesmejia · Dec 18, 2020 · 4e38538 · 4e38538
2 parents b4570f5 + 4b90422
commit 4e38538
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/gui/tuner/TunableFieldPanel.java b/EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/gui/tuner/TunableFieldPanel.java
@@ -72,6 +72,10 @@ public void setFieldValue(int index, Object value) {
         fields[index].setText(value.toString());
     }
 
+    public void setComboBoxSelection(int index, Object selection) {
+        comboBoxes[index].setSelectedItem(selection.toString());
+    }
+
     public void setOnlyNumbers(boolean isOnlyNumbers) {
         this.isOnlyNumbers = isOnlyNumbers;
     }

diff --git a/EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/tuner/TunerManager.java b/EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/tuner/TunerManager.java
@@ -49,7 +49,11 @@ public void init() {
     public void update() {
         //update all fields
         for (TunableField field : fields) {
-            field.update();
+            try {
+                field.update();
+            } catch(Exception ex) {
+                Log.error("Error while updating field " + field.getFieldName(), ex);
+            }
         }
     }
 

diff --git a/EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/tuner/field/BooleanField.java b/EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/tuner/field/BooleanField.java
@@ -40,7 +40,7 @@ public void update() {
 
     @Override
     public void updateGuiFieldValues() {
-        fieldPanel.setFieldValue(0, value);
+        fieldPanel.setComboBoxSelection(0, value);
     }
 
     @Override