From 914a8ea1a467fd331cecd71260b49bbeccfcbebd Mon Sep 17 00:00:00 2001 From: Daniel Maclaren Date: Wed, 29 Nov 2023 10:38:51 +0000 Subject: [PATCH 1/3] gui bug where ui and model was not synced --- .../ibex/dae/dataacquisition/DaeSettings.java | 5 +++- .../dae/experimentsetup/ExperimentSetup.java | 3 ++- .../ExperimentSetupViewModel.java | 27 ++++++++++--------- script_definitions | 2 +- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.dae/src/uk/ac/stfc/isis/ibex/dae/dataacquisition/DaeSettings.java b/base/uk.ac.stfc.isis.ibex.dae/src/uk/ac/stfc/isis/ibex/dae/dataacquisition/DaeSettings.java index 58ccadfa4a..46bf404ac9 100644 --- a/base/uk.ac.stfc.isis.ibex.dae/src/uk/ac/stfc/isis/ibex/dae/dataacquisition/DaeSettings.java +++ b/base/uk.ac.stfc.isis.ibex.dae/src/uk/ac/stfc/isis/ibex/dae/dataacquisition/DaeSettings.java @@ -20,6 +20,7 @@ package uk.ac.stfc.isis.ibex.dae.dataacquisition; import uk.ac.stfc.isis.ibex.model.ModelObject; +import org.eclipse.swt.widgets.Display; /** * The settings for connecting to the DAE. @@ -147,7 +148,9 @@ public int monitorSpectrum() { * @param value The new monitor spectrum number */ public void setMonitorSpectrum(int value) { - firePropertyChange("monitorSpectrum", monitorSpectrum, monitorSpectrum = value); + Display.getDefault().asyncExec(() -> { + firePropertyChange("monitorSpectrum", monitorSpectrum, monitorSpectrum = value); + }); } /** diff --git a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetup.java b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetup.java index f72b6dcdd7..002be72717 100644 --- a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetup.java +++ b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetup.java @@ -239,7 +239,8 @@ public void widgetSelected(SelectionEvent e) { } private void resetChangeLabels() { - addChangeListeners(); + updateChangeListeners(); ///seems to remove the yellow is it reset the compared values cache, however the changed value remains + addChangeListeners(); changeLabelsIfDifferentFromCachedValues(); } diff --git a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetupViewModel.java b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetupViewModel.java index e4da5257ac..eb1e28d506 100644 --- a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetupViewModel.java +++ b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetupViewModel.java @@ -30,6 +30,7 @@ import uk.ac.stfc.isis.ibex.ui.dae.experimentsetup.periods.PeriodsViewModel; import uk.ac.stfc.isis.ibex.ui.dae.experimentsetup.timechannels.TimeChannelsViewModel; + /** * The view model that contains the logic for displaying how the experiment is * set up on the DAE. @@ -291,17 +292,17 @@ private Map> getTableInstrumentCachedValues(String nam } /** - * Saves the current maps of cached values and loads the one related to the instrument that is being loaded. - * - * @param newInstrument - * The name of the instrument that is being loaded. - */ - public void switchInstrumentCachedValues(String newInstrument) { - setInstrumentCachedValues(currentInstrumentName); - cachedValues = getInstrumentCachedValues(newInstrument); - radioBtnsCachedValues = getRadioBtnsInstrumentCachedValues(newInstrument); - tableCachedValues = getTableInstrumentCachedValues(newInstrument); - currentInstrumentName = newInstrument; - } - + * Saves the current maps of cached values and loads the one related to the + * instrument that is being loaded. + * + * @param newInstrument The name of the instrument that is being loaded. + */ + public void switchInstrumentCachedValues(String newInstrument) { + setInstrumentCachedValues(currentInstrumentName); + cachedValues = getInstrumentCachedValues(newInstrument); + radioBtnsCachedValues = getRadioBtnsInstrumentCachedValues(newInstrument); + tableCachedValues = getTableInstrumentCachedValues(newInstrument); + currentInstrumentName = newInstrument; + + } } diff --git a/script_definitions b/script_definitions index 19f9d9ecea..eed0b02ebb 160000 --- a/script_definitions +++ b/script_definitions @@ -1 +1 @@ -Subproject commit 19f9d9ecea4a91cdb28cdf9cfe8ebf72d05eda18 +Subproject commit eed0b02ebbd3698f2994596eacc04153c243e601 From b6981688af695c8b366fdd27004a3ce375f507ce Mon Sep 17 00:00:00 2001 From: Daniel Maclaren Date: Wed, 29 Nov 2023 10:41:31 +0000 Subject: [PATCH 2/3] removed comment --- .../stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetup.java b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetup.java index 002be72717..990283de89 100644 --- a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetup.java +++ b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetup.java @@ -239,7 +239,7 @@ public void widgetSelected(SelectionEvent e) { } private void resetChangeLabels() { - updateChangeListeners(); ///seems to remove the yellow is it reset the compared values cache, however the changed value remains + updateChangeListeners(); addChangeListeners(); changeLabelsIfDifferentFromCachedValues(); } From 59acd46f95bf318fcfc9167a19c7f042fc8ea71d Mon Sep 17 00:00:00 2001 From: Daniel Maclaren Date: Mon, 8 Jan 2024 15:50:55 +0000 Subject: [PATCH 3/3] removed whitespace --- .../uk/ac/stfc/isis/ibex/dae/dataacquisition/DaeSettings.java | 1 - 1 file changed, 1 deletion(-) diff --git a/base/uk.ac.stfc.isis.ibex.dae/src/uk/ac/stfc/isis/ibex/dae/dataacquisition/DaeSettings.java b/base/uk.ac.stfc.isis.ibex.dae/src/uk/ac/stfc/isis/ibex/dae/dataacquisition/DaeSettings.java index c46129c942..c7a9baa7c2 100644 --- a/base/uk.ac.stfc.isis.ibex.dae/src/uk/ac/stfc/isis/ibex/dae/dataacquisition/DaeSettings.java +++ b/base/uk.ac.stfc.isis.ibex.dae/src/uk/ac/stfc/isis/ibex/dae/dataacquisition/DaeSettings.java @@ -171,7 +171,6 @@ public int monitorSpectrum() { */ public void setMonitorSpectrum(int value) { firePropertyChange(MONITOR_SPECTRUM, monitorSpectrum, monitorSpectrum = value); - } /**