From 92bca62646b834e4e7b1878d9919ebbef22b627b Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Tue, 29 Sep 2020 11:21:38 +0200 Subject: [PATCH] --- plugins/XPSSpectrum.form | 870 +++++++++++++++++++-------------------- plugins/XPSSpectrum.java | 32 +- 2 files changed, 455 insertions(+), 447 deletions(-) diff --git a/plugins/XPSSpectrum.form b/plugins/XPSSpectrum.form index d7e015be..e25d4422 100644 --- a/plugins/XPSSpectrum.form +++ b/plugins/XPSSpectrum.form @@ -1,435 +1,435 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/plugins/XPSSpectrum.java b/plugins/XPSSpectrum.java index bf86ebaf..84eb8ba0 100644 --- a/plugins/XPSSpectrum.java +++ b/plugins/XPSSpectrum.java @@ -120,19 +120,27 @@ public class XPSSpectrum extends Panel { tableChangeListener = new SwingUtils.TableChangeListener(rangeSelectionPanel.getTable()) { @Override protected void onTableChange(int row, int column, Object value, Object former) { - if ((column == indexEph) && isDefined (value) && isDefined (former)){ + if (column == indexEph){ try{ - double offset = ((Double)value) - ((Double)former); - Double lower = (Double) model.getValueAt(row, 0); - Double upper = (Double) model.getValueAt(row, indexTime-1); - if ( isDefined (lower) && isDefined (upper)){ - model.setValueAt(lower + offset, row, 0); - model.setValueAt(upper + offset, row, indexTime-1); - RangeSelection range = rangeSelectionPanel.getPlotRange(lower, null, upper); - if (range!=null){ - rangeSelectionPanel.getPlot().updateRange(range, lower + offset, upper + offset); - } - } + if (!isDefined (value)){ + value = XPSSpectrum.this.getDevice("Eph").take(); + } + if (!isDefined (former)){ + former = XPSSpectrum.this.getDevice("Eph").take(); + } + if (isDefined (value) && isDefined (former) && (!value.equals(former))){ + double offset = ((Double)value) - ((Double)former); + Double lower = (Double) model.getValueAt(row, 0); + Double upper = (Double) model.getValueAt(row, indexTime-1); + if ( isDefined (lower) && isDefined (upper)){ + model.setValueAt(lower + offset, row, 0); + model.setValueAt(upper + offset, row, indexTime-1); + RangeSelection range = rangeSelectionPanel.getPlotRange(lower, null, upper); + if (range!=null){ + rangeSelectionPanel.getPlot().updateRange(range, lower + offset, upper + offset); + } + } + } } catch (Exception ex) { showException(ex); }