From 027192c4f6eabe6712ed162bd04ee75d728ba892 Mon Sep 17 00:00:00 2001 From: Henri Payno Date: Wed, 7 Aug 2019 14:58:20 +0200 Subject: [PATCH 1/4] [orange_contrib][pre_edge] remove typo --- orangecontrib/xas/widgets/larch/pre_edge.py | 1 - 1 file changed, 1 deletion(-) diff --git a/orangecontrib/xas/widgets/larch/pre_edge.py b/orangecontrib/xas/widgets/larch/pre_edge.py index f4e3c4a..729aecf 100644 --- a/orangecontrib/xas/widgets/larch/pre_edge.py +++ b/orangecontrib/xas/widgets/larch/pre_edge.py @@ -171,7 +171,6 @@ class PreEdgeOW(_ProcessForOrangeMixIn, OWWidget): # setup the normalization process if _USE_THREAD: process_obj = QLarch_pre_edge() - process_obj.process(self._latest_xas_obj) process_obj._advancement.sigProgress.connect(self._setProgressValue) process_obj.setConfiguration({ '_larchSettings': self._window._parametersWindow.getParameters()}) -- GitLab From f20e715bca0748826646287dd27ee819236859bd Mon Sep 17 00:00:00 2001 From: Henri Payno Date: Wed, 7 Aug 2019 15:02:24 +0200 Subject: [PATCH 2/4] [orangecontrib] emit sigChanged when editing is finished, skip some processing --- xas/gui/larch/pre_edge.py | 2 +- xas/gui/larch/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xas/gui/larch/pre_edge.py b/xas/gui/larch/pre_edge.py index 174fe3e..a754aef 100644 --- a/xas/gui/larch/pre_edge.py +++ b/xas/gui/larch/pre_edge.py @@ -148,7 +148,7 @@ class _MPreEdgeParameters(qt.QWidget): self._norm1SB.sigChanged.connect(self._valueChanged) self._norm2SB.sigChanged.connect(self._valueChanged) self._nnorm.sigChanged.connect(self._valueChanged) - self._nvictSB.valueChanged.connect(self._valueChanged) + self._nvictSB.editingFinished.connect(self._valueChanged) self._makeFlatCB.toggled.connect(self._valueChanged) self._eminAreaSB.sigChanged.connect(self._valueChanged) diff --git a/xas/gui/larch/utils.py b/xas/gui/larch/utils.py index 250a5ce..d954259 100644 --- a/xas/gui/larch/utils.py +++ b/xas/gui/larch/utils.py @@ -57,7 +57,7 @@ class _OptionalQDoubleSpinBox(qt.QWidget): # connect signal / slot self._checkbox.toggled.connect(self._updateSpinBoxStatus) - self._spinBox.valueChanged.connect(self._valueChanged) + self._spinBox.editingFinished.connect(self._valueChanged) def getValue(self): if self._checkbox.isChecked(): -- GitLab From eaaeb75addf1c77f6f6fd7975084a45b464288fa Mon Sep 17 00:00:00 2001 From: Henri Payno Date: Wed, 7 Aug 2019 15:04:43 +0200 Subject: [PATCH 3/4] [orangecontrib] fix options passing to pre_edge from OW --- orangecontrib/xas/widgets/larch/pre_edge.py | 2 +- xas/core/process/larch/pre_edge.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/orangecontrib/xas/widgets/larch/pre_edge.py b/orangecontrib/xas/widgets/larch/pre_edge.py index 729aecf..5412383 100644 --- a/orangecontrib/xas/widgets/larch/pre_edge.py +++ b/orangecontrib/xas/widgets/larch/pre_edge.py @@ -172,7 +172,7 @@ class PreEdgeOW(_ProcessForOrangeMixIn, OWWidget): if _USE_THREAD: process_obj = QLarch_pre_edge() process_obj._advancement.sigProgress.connect(self._setProgressValue) - process_obj.setConfiguration({ + process_obj.setProperties({ '_larchSettings': self._window._parametersWindow.getParameters()}) # update the processing thread thread = self.getProcessingThread() diff --git a/xas/core/process/larch/pre_edge.py b/xas/core/process/larch/pre_edge.py index 1295432..d218bfc 100644 --- a/xas/core/process/larch/pre_edge.py +++ b/xas/core/process/larch/pre_edge.py @@ -97,8 +97,8 @@ class Larch_pre_edge(Process): Process.__init__(self, name='pre_edge') def setProperties(self, properties): - if '_pymcaSettings' in properties: - self._settings = properties['_pymcaSettings'] + if '_larchSettings' in properties: + self._settings = properties['_larchSettings'] def process(self, xas_obj): _xas_obj = self.getXasObject(xas_obj=xas_obj) -- GitLab From a030344ca56d35cbcc7f18dc1594dcdedd3a3c61 Mon Sep 17 00:00:00 2001 From: Henri Payno Date: Wed, 7 Aug 2019 15:10:05 +0200 Subject: [PATCH 4/4] [core][mback_norm] fix configuration read from mback_norm --- xas/core/process/larch/mback_norm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xas/core/process/larch/mback_norm.py b/xas/core/process/larch/mback_norm.py index 575d14b..ddea168 100644 --- a/xas/core/process/larch/mback_norm.py +++ b/xas/core/process/larch/mback_norm.py @@ -63,8 +63,8 @@ def process_spectr_mback_norm(spectrum, configuration, overwrite=True, return None, None _conf = configuration - if 'mback' in _conf: - _conf = _conf['mback'] + if 'mback_norm' in _conf: + _conf = _conf['mback_norm'] opts = {} for opt_name in ('z', 'edge', 'e0', 'pre1', 'pre2', 'norm1', 'norm2', 'nnorm', 'nvict'): -- GitLab