From 5a1e168d0eafaa3e86325654f33ab2003b413e15 Mon Sep 17 00:00:00 2001
From: Ewan Cook <5237234+ewancook@users.noreply.github.com>
Date: Thu, 9 Aug 2018 11:12:25 +0100
Subject: [PATCH] refs #23115 fix table_changed bug, removed SpinBox functions
---
scripts/Elemental_Analysis.py | 7 -------
.../GUI/ElementalAnalysis/PeriodicTable/periodic_table.py | 6 ++++++
.../PeriodicTable/periodic_table_presenter.py | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/scripts/Elemental_Analysis.py b/scripts/Elemental_Analysis.py
index ed3307039ec..f921eb9f275 100644
--- a/scripts/Elemental_Analysis.py
+++ b/scripts/Elemental_Analysis.py
@@ -38,15 +38,8 @@ class ElementalAnalysisGui(QtGui.QMainWindow):
def table_changed(self, items):
print("Table Changed: {}".format([i.symbol for i in items]))
- def spinbox_changed(self, val):
- print("SpinBox Value Changed: {}".format(val))
-
- def spinbox_submit(self, val):
- print("SpinBox Submitted: {}".format(val))
-
def select_data_file(self):
filename = str(QtGui.QFileDialog.getOpenFileName())
- print(filename)
if filename != "":
self.ptable.set_peak_datafile(str(filename))
diff --git a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table.py b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table.py
index 3e0fe08ac1a..2b2d0fe5b5c 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table.py
@@ -496,6 +496,12 @@ class PeriodicTable(qt.QWidget):
self.__addElement(elmt)
self.elements = elements
+ def silentSetElementSelected(self, symbol, state):
+ """
+ Identical to setElementSelected, but doesn't emit sigSelectionChanged
+ """
+ self._eltButtons[symbol].setSelected(state)
+
def enableElementButton(self, element):
try:
self._eltButtons[element].setEnabled(True)
diff --git a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_presenter.py b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_presenter.py
index c39fd52b939..c2c7517ae4f 100644
--- a/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_presenter.py
+++ b/scripts/Muon/GUI/ElementalAnalysis/PeriodicTable/periodic_table_presenter.py
@@ -17,7 +17,7 @@ class PeriodicTablePresenter(object):
def set_buttons(self):
for el in self.view.ptable.elements:
- self.view.ptable.setElementSelected(el.symbol, False)
+ self.view.ptable.silentSetElementSelected(el.symbol, False)
if el.symbol in self.model.peak_data:
self.view.ptable.enableElementButton(el.symbol)
else:
--
GitLab