Changeset 02c11b04 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Oct 26, 2017 3:34:19 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:

9e54199

Parents:

9ea43c82 (diff), f629e62f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI_OpenCL_Dialog' into ESS_GUI

Location:

src/sas/qtgui/MainWindow

Files:

• GuiManager.py (modified) (2 diffs)
• UI/MainWindowUI.ui (modified) (3 diffs)
• DataExplorer.py (modified) (6 diffs)
• UnitTesting/DataExplorerTest.py (modified) (3 diffs)

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):
+        """
+        Load the OpenCL selection dialog if the fitting perspective is active
+        """
+        if hasattr(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/MainWindow/DataExplorer.py

@@ -463 +463 @@
         Forces display of charts for the given filename
         """
-        # Assure no multiple plots for the same ID
         plot_to_show = data_list[0]
-        if plot_to_show.id in PlotHelper.currentPlots():
-            return
-
-        # Now query the model item for available plots
+
+        # passed plot is used ONLY to figure out its title,
+        # so all the charts related by it can be pulled from 
+        # the data explorer indices.
         filename = plot_to_show.filename
         model = self.model if plot_to_show.is_data else self.theory_model
+
+        # Now query the model item for available plots
         plots = GuiUtils.plotsFromFilename(filename, model)
+        item = GuiUtils.itemFromFilename(filename, model)
+
+        new_plots = []
         for plot in plots:
             plot_id = plot.id
@@ -477 +481 @@
                 self.active_plots[plot_id].replacePlot(plot_id, plot)
             else:
-                self.plotData([(None, plot)])
+                # 'sophisticated' test to generate standalone plot for residuals
+                if 'esiduals' in plot.title:
+                    self.plotData([(item, plot)])
+                else:
+                    new_plots.append((item, plot))
+
+        if new_plots:
+            self.plotData(new_plots)
 
     def addDataPlot2D(self, plot_set, item):
@@ -487 +498 @@
         plot2D.plot(plot_set)
         self.addPlot(plot2D)
+        self.active_plots[plot2D.data.id] = plot2D
         #============================================
         # Experimental hook for silx charts
@@ -507 +519 @@
         # Call show on requested plots
         # All same-type charts in one plot
-        #if isinstance(plot_set, Data1D):
-        #    new_plot = Plotter(self)
-
         for item, plot_set in plots:
             if isinstance(plot_set, Data1D):
@@ -515 +524 @@
                     new_plot = Plotter(self)
                 new_plot.plot(plot_set)
+                # active_plots may contain multiple charts
+                self.active_plots[plot_set.id] = new_plot
             elif isinstance(plot_set, Data2D):
                 self.addDataPlot2D(plot_set, item)
@@ -556 +567 @@
 
         # Update the active chart list
-        self.active_plots[new_plot.data.id] = new_plot
+        #self.active_plots[new_plot.data.id] = new_plot
 
     def appendPlot(self):

src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py

@@ -25 +25 @@
 import sas.qtgui.Plotting.PlotHelper as PlotHelper
 
-#if not QApplication.instance():
-app = QApplication(sys.argv)
+if not QApplication.instance():
+    app = QApplication(sys.argv)
 
 class DataExplorerTest(unittest.TestCase):
@@ -37 +37 @@
             def allowBatch(self):
                 return False
-            def setData(self, data_item=None):
+            def setData(self, data_item=None, is_batch=False):
                 return None
             def title(self):
@@ -170 +170 @@
 
         # Populate the model
-        #filename = ["cyl_400_20.txt", "P123_D2O_10_percent.dat", "cyl_400_20.txt"]
-        filename = ["cyl_400_20.txt", "cyl_400_20.txt", "P123_D2O_10_percent.dat"]
+        filename = ["cyl_400_20.txt", "cyl_400_20.txt", "cyl_400_20.txt"]
         self.form.readData(filename)
-
-        self.form.show()
-        app.exec_()
 
         # Assure the model contains three items