Changeset 06ce180 in sasview for src/sas

Timestamp:

Oct 24, 2017 7:03:29 AM (7 years ago)

Author:

krzywon

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:

14fa542

Parents:

d6b234b

Message:

Basic GPU options window created and GUI hooks added to Fitting menu.

Location:

src/sas/qtgui

Files:

• MainWindow/GuiManager.py (modified) (2 diffs)
• MainWindow/UI/MainWindowUI.ui (modified) (3 diffs)
• Perspectives/Fitting/FittingPerspective.py (modified) (2 diffs)
• Perspectives/Fitting/GPUOptions.py (added)
• Perspectives/Fitting/UI/GPUOptionsUI.ui (added)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -384 +384 @@
         self._workspace.actionCombine_Batch_Fit.triggered.connect(self.actionCombine_Batch_Fit)
         self._workspace.actionFit_Options.triggered.connect(self.actionFit_Options)
+        self._workspace.actionGPU_Options.triggered.connect(self.actionGPU_Options)
         self._workspace.actionFit_Results.triggered.connect(self.actionFit_Results)
         self._workspace.actionChain_Fitting.triggered.connect(self.actionChain_Fitting)
@@ -620 +621 @@
         pass
 
+    def actionGPU_Options(self):
+        """
+        """
+        print("actionGPU_Options TRIGGERED")
+        if getattr(self._current_perspective, "gpu_options_widget"):
+            self._current_perspective.gpu_options_widget.show()
+        pass
+
     def actionFit_Results(self):
         """

src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

@@ -25 +25 @@
      <y>0</y>
      <width>915</width>
-     <height>21</height>
+     <height>26</height>
     </rect>
    </property>
@@ -103 +103 @@
     <addaction name="separator"/>
     <addaction name="actionFit_Options"/>
+    <addaction name="actionGPU_Options"/>
     <addaction name="actionFit_Results"/>
     <addaction name="separator"/>
@@ -499 +500 @@
    </property>
   </action>
+  <action name="actionGPU_Options">
+   <property name="text">
+    <string>GPU Options</string>
+   </property>
+   <property name="softKeyRole">
+    <enum>QAction::NoSoftKey</enum>
+   </property>
+  </action>
  </widget>
  <resources/>

src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

@@ -11 +11 @@
 from sas.qtgui.Perspectives.Fitting.FittingWidget import FittingWidget
 from sas.qtgui.Perspectives.Fitting.FittingOptions import FittingOptions
+from sas.qtgui.Perspectives.Fitting.GPUOptions import GPUOptions
 from sas.qtgui.Perspectives.Fitting import ModelUtilities
 
@@ -60 +61 @@
         # Listen to GUI Manager signal updating fit options
         self.fit_options_widget.fit_option_changed.connect(self.onFittingOptionsChange)
+
+        # GPU Options
+        self.gpu_options_widget = GPUOptions()
 
         self.menu_manager = ModelUtilities.ModelManager()