Changeset 1d85b5e in sasview for src/sas/qtgui/DensityPanel.py

Timestamp:

Oct 20, 2016 9:11:19 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

9968d6a

Parents:

ef36eb2

Message:

Linked two new calculators to the Gui Manager.

File:

• src/sas/qtgui/DensityPanel.py (modified) (5 diffs)

src/sas/qtgui/DensityPanel.py

@@ -1 +1 @@
 # global
 import logging
+import functools
+
 from periodictable import formula as Formula
 
@@ -59 +61 @@
 
     def __init__(self, parent=None):
-        super(DensityPanel, self).__init__(parent)
+        super(DensityPanel, self).__init__()
 
         self.mode = None
-
+        self.manager = parent
         self.setupUi()
         self.setupModel()
@@ -79 +81 @@
 
         # signals
-        QtCore.QObject.connect(
-            self.ui.editMolarVolume,
-            QtCore.SIGNAL("textEdited(QString)"),
-            lambda text: self.setMode(MODES.VOLUME_TO_DENSITY))
-        QtCore.QObject.connect(
-            self.ui.editMassDensity,
-            QtCore.SIGNAL("textEdited(QString)"),
-            lambda text: self.setMode(MODES.DENSITY_TO_VOLUME))
-        QtCore.QObject.connect(
-            self.ui.buttonBox.button(QtGui.QDialogButtonBox.Reset),
-            QtCore.SIGNAL("clicked(bool)"),
-            lambda checked: self.modelReset())
+        self.ui.editMolarVolume.textEdited.connect(functools.partial(self.setMode, MODES.VOLUME_TO_DENSITY))
+        self.ui.editMassDensity.textEdited.connect(functools.partial(self.setMode, MODES.DENSITY_TO_VOLUME))
+
+        self.ui.buttonBox.button(QtGui.QDialogButtonBox.Reset).clicked.connect(self.modelReset)
+        self.ui.buttonBox.button(QtGui.QDialogButtonBox.Help).clicked.connect(self.displayHelp)
 
     def setupModel(self):
@@ -99 +94 @@
         self.model.setItem(MODEL.MASS_DENSITY     , QtGui.QStandardItem())
 
-        QtCore.QObject.connect(
-            self.model,
-            QtCore.SIGNAL("dataChanged(QModelIndex,QModelIndex)"),
-            self.dataChanged)
+        self.model.dataChanged.connect(self.dataChanged)
 
         self.modelReset()
@@ -170 +162 @@
             pass
             #self.model.endResetModel()
+
+    def displayHelp(self):
+        try:
+            location = self.manager.HELP_DIRECTORY_LOCATION + \
+                "/user/sasgui/perspectives/calculator/density_calculator_help.html"
+            self.manager._helpView.load(QtCore.QUrl(location))
+            self.manager._helpView.show()
+        except AttributeError:
+            # No manager defined - testing and standalone runs
+            pass