From d1f7bad75d075164b4e29361e610d7bb71a977e6 Mon Sep 17 00:00:00 2001 From: gac-x11ma Date: Thu, 17 Dec 2020 10:07:52 +0100 Subject: [PATCH] --- config/settings.properties | 2 +- plugins/DataAcquisition.form | 3 --- plugins/DataAcquisition.java | 22 ++++++++++++++-------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/config/settings.properties b/config/settings.properties index 1d8a79a..18def0c 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,4 +1,4 @@ -#Thu Dec 17 09:26:47 CET 2020 +#Thu Dec 17 10:02:51 CET 2020 HARMONIC_ID_1=1 RSYNC_USER= OUTLIERS_THRESHOLD=1000000000 diff --git a/plugins/DataAcquisition.form b/plugins/DataAcquisition.form index 7179917..d3f9476 100644 --- a/plugins/DataAcquisition.form +++ b/plugins/DataAcquisition.form @@ -1271,9 +1271,6 @@ - - - diff --git a/plugins/DataAcquisition.java b/plugins/DataAcquisition.java index b363b3d..f4c05e7 100644 --- a/plugins/DataAcquisition.java +++ b/plugins/DataAcquisition.java @@ -154,8 +154,7 @@ public class DataAcquisition extends Panel { textOutliersMask.setText(String.valueOf(getSetting("OUTLIERS_MASK_FILE"))); } catch (IOException ex) { showException(ex); - } - } + } } @Override public void onStateChange(State state, State former) { @@ -1226,7 +1225,6 @@ public class DataAcquisition extends Panel { return types [columnIndex]; } }); - tableRegions.setPreferredSize(new java.awt.Dimension(150, 0)); jScrollPane2.setViewportView(tableRegions); buttonAdd.setText("Add"); @@ -1594,14 +1592,22 @@ public class DataAcquisition extends Panel { }//GEN-LAST:event_buttonTriggerDetectorActionPerformed private void buttonAddActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAddActionPerformed - modelRegions.addRow(new Object[]{Double.NaN, Double.NaN, Double.NaN}); + try { + modelRegions.addRow(new Object[]{Double.NaN, Double.NaN, Double.NaN}); + } catch (Exception ex) { + showException(ex); + } }//GEN-LAST:event_buttonAddActionPerformed private void buttonRemoveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonRemoveActionPerformed - int row = tableRegions.getSelectedRow(); - if (row >= 0) { - modelRegions.removeRow(row); - } + try { + int row = tableRegions.getSelectedRow(); + if (row >= 0) { + modelRegions.removeRow(row); + } + } catch (Exception ex) { + showException(ex); + } }//GEN-LAST:event_buttonRemoveActionPerformed private void buttonSetNormActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonSetNormActionPerformed