Changeset 1d85b5e in sasview

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.

Location:

src/sas/qtgui

Files:

• DensityPanel.py (modified) (5 diffs)
• GuiManager.py (modified) (3 diffs, 1 prop)
• SldPanel.py (modified) (3 diffs)
• UI/DensityPanel.ui (modified) (3 diffs)
• UI/SldPanel.ui (modified) (3 diffs)
• UI/convert_all.sh (modified) (1 diff)

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

src/sas/qtgui/GuiManager.py

@@ -24 +24 @@
 from IPythonWidget import IPythonWidget
 from WelcomePanel import WelcomePanel
+from SldPanel import SldPanel
+from DensityPanel import DensityPanel
 
 # Perspectives
@@ -131 +133 @@
         self.ackWidget = Acknowledgements()
         self.aboutWidget = AboutBox()
+
+        # Add calculators - floating for usability
+        self.SLDCalculator = SldPanel(self)
+        self.DVCalculator = DensityPanel(self)
 
     def statusBarSetup(self):
@@ -513 +519 @@
         """
         """
-        print("actionSLD_Calculator TRIGGERED")
-        pass
+        self.SLDCalculator.show()
 
     def actionDensity_Volume_Calculator(self):
         """
         """
-        print("actionDensity_Volume_Calculator TRIGGERED")
-        pass
+        self.DVCalculator.show()
 
     def actionSlit_Size_Calculator(self):

src/sas/qtgui/SldPanel.py

@@ -118 +118 @@
 
     def __init__(self, parent=None):
-        super(SldPanel, self).__init__(parent)
+        super(SldPanel, self).__init__()
+
+        self.manager = parent
 
         self.setupUi()
@@ -149 +151 @@
 
         # signals
-        QtCore.QObject.connect(
-            self.ui.buttonBox.button(QtGui.QDialogButtonBox.Reset),
-            QtCore.SIGNAL("clicked(bool)"),
-            lambda checked: self.modelReset())
+        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):
@@ -232 +232 @@
             pass
             #self.model.endResetModel()
+
+    def displayHelp(self):
+        try:
+            location = self.manager.HELP_DIRECTORY_LOCATION + \
+                "/user/sasgui/perspectives/calculator/sld_calculator_help.html"
+            self.manager._helpView.load(QtCore.QUrl(location))
+            self.manager._helpView.show()
+        except AttributeError:
+            # No manager defined - testing and standalone runs
+            pass
+

src/sas/qtgui/UI/DensityPanel.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>633</width>
-    <height>293</height>
+    <width>290</width>
+    <height>178</height>
    </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
   </property>
   <property name="windowTitle">
    <string>Density/Volume Calculator</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="main_resources.qrc">
+    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
@@ -134 +144 @@
    <item row="2" column="0">
     <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Close|QDialogButtonBox::Reset</set>
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Help|QDialogButtonBox::Reset</set>
      </property>
      <property name="centerButtons">
@@ -154 +170 @@
   <tabstop>buttonBox</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="main_resources.qrc"/>
+ </resources>
  <connections>
   <connection>

src/sas/qtgui/UI/SldPanel.ui

@@ -7 +7 @@
     <x>0</x>
     <y>0</y>
-    <width>632</width>
-    <height>651</height>
+    <width>447</width>
+    <height>403</height>
    </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
   </property>
   <property name="windowTitle">
    <string>SLD Calculator</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="main_resources.qrc">
+    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
@@ -307 +317 @@
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Close|QDialogButtonBox::Reset</set>
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Help|QDialogButtonBox::Reset</set>
      </property>
      <property name="centerButtons">
@@ -331 +341 @@
   <tabstop>buttonBox</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="main_resources.qrc"/>
+ </resources>
  <connections>
   <connection>

src/sas/qtgui/UI/convert_all.sh

@@ -1 +1 @@
 # UI -> PY
 for filename in *.ui; do
-  pyuic4 $filename > "`basename "$filename" .ui`.py"
+  pyuic4.bat $filename > "`basename "$filename" .ui`.py"
 done