Changeset 60a4e71 in sasview for src/sas/qtgui

Timestamp:

Sep 11, 2018 2:50:23 AM (6 years ago)

Author:

GitHub <noreply@…>

Parents:

343d7fd (diff), 8e674ccf (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.

git-author:

Ingo Breßler <dev@…> (09/11/18 02:50:23)

git-committer:

GitHub <noreply@…> (09/11/18 02:50:23)

Message:

Merge 8e674ccf5c2f4e357295344dc59f2796cd7de805 into 343d7fd60f1eda3abfbbd120c048168e649876be

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (3 diffs)
• Perspectives/Fitting/FittingWidget.py (modified) (5 diffs)
• Perspectives/Fitting/FittingUtilities.py (modified) (1 diff)
• Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (1 diff)
• Plotting/PlotterBase.py (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -95 +95 @@
         self.communicator.activeGraphsSignal.connect(self.updateGraphCount)
         self.communicator.activeGraphName.connect(self.updatePlotName)
-        self.communicator.plotUpdateSignal.connect(self.updatePlot)
+        self.communicator.plotUpdateSignal.connect(self.displayData)
         self.communicator.maskEditorSignal.connect(self.showEditDataMask)
         self.communicator.extMaskEditorSignal.connect(self.extShowEditDataMask)
@@ -572 +572 @@
         # Each fitpage contains the name based on fit widget number
         fitpage_name = "" if id is None else "M"+str(id)
-        new_plots = []
+        # groups plots which move into an own window
+        new_plots = dict(int = [], res = [], pd = [])
         for item, plot in plots.items():
-            if self.updatePlot(plot) and filename != plot.name:
+            if (self.updatePlot(plot) and filename != plot.name) or plot.hidden:
                 continue
             # Don't plot intermediate results, e.g. P(Q), S(Q)
             match = GuiUtils.theory_plot_ID_pattern.match(plot.id)
-            # 2nd match group contains the identifier for the intermediate result, if present (e.g. "[P(Q)]")
+            # 2nd match group contains the identifier for the intermediate
+            # result, if present (e.g. "[P(Q)]")
             if match and match.groups()[1] != None:
                 continue
-            # Don't include plots from different fitpages, but always include the original data
+            # Don't include plots from different fitpages,
+            # but always include the original data
             if fitpage_name in plot.name or filename == plot.name:
                 # 'sophisticated' test to generate standalone plot for residuals
+                # this should be done by some kind of grouping by lists
+                # which helps to indicate which go into a single plot window
                 if 'esiduals' in plot.title:
-                    plot.yscale='linear'
-                    self.plotData([(item, plot)])
+                    plot.yscale = 'linear'
+                    new_plots['res'].append((item, plot))
+                elif 'olydispersity' in plot.title:
+                    plot.yscale = 'linear'
+                    new_plots['pd'].append((item, plot))
                 else:
-                    new_plots.append((item, plot))
-
-        if new_plots:
-            self.plotData(new_plots)
+                    new_plots['int'].append((item, plot))
+
+        # create entirely new plots for those which could not be updated
+        for plots in new_plots.values():
+            if len(plots):
+                self.plotData(plots)
 
     def displayData(self, data_list, id=None):
@@ -597 +607 @@
         Forces display of charts for the given data set
         """
-        plot_to_show = data_list[0]
-        # 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
-        self.displayFile(filename=filename, is_data=plot_to_show.is_data, id=id)
+        for plot_to_show in data_list:
+            # may there be duplicates? list(OrderedDict.fromkeys(data_list))
+            # 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
+            self.displayFile(filename=filename, is_data=plot_to_show.is_data, id=id)
 
     def addDataPlot2D(self, plot_set, item):

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

@@ -1088 +1088 @@
             return True
 
+    def updateDataVisibility(self, updateOnly):
+        self.dataUpdateOnly = updateOnly
+        for dataitem in self.all_data:
+            data = GuiUtils.dataFromItem(dataitem)
+            data.hidden = self.dataUpdateOnly
+            self.updateModelIndex(data)
+
     def updateData(self):
         """
@@ -1093 +1100 @@
         """
         # Update the chart
+        self.updateDataVisibility(True)
         if self.data_is_loaded:
             self.cmdPlot.setText("Show Plot")
@@ -1815 +1823 @@
         self.cmdPlot.setText("Show Plot")
         # Force data recalculation so existing charts are updated
-        self.showPlot()
+#        self.showPlot()
         # This is an important processEvent.
         # This allows charts to be properly updated in order
         # of plots being applied.
-        QtWidgets.QApplication.processEvents()
+#        QtWidgets.QApplication.processEvents()
         self.recalculatePlotData()
 
@@ -2272 +2280 @@
         Create a model or theory index with passed Data1D/Data2D
         """
+        # set some flag which decides if new plots should be created or
+        # just existing ones updated, selectively hiding indiv. plot will also work
+        fitted_data.hidden = getattr(self, 'dataUpdateOnly', True)
         if self.data_is_loaded:
             if not fitted_data.name:
@@ -2442 +2453 @@
         for plot in new_plots:
             self.communicate.plotUpdateSignal.emit([plot])
+        # enable plots to be shown next time if updateData() wasn't called
+        self.updateDataVisibility(False)
 
     def complete2D(self, return_data):

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

@@ -128 +128 @@
 
             # Find param in volume_params
-            for p in parameters.form_volume_parameters:
+            poly_pars = parameters.form_volume_parameters
+            if is2D:
+                poly_pars += parameters.orientation_parameters
+            for p in poly_pars:
                 if p.name != param.name:
                     continue

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -613 +613 @@
 
         # Check that the number of rows increased
+        # (note that n == 1 by default in core_multi_shell so this increases index by 2)
         more_rows = self.widget._model_model.rowCount() - last_row
-        self.assertEqual(more_rows, 6) # 6 new rows: 2 params per index
-
-        # Back to 0
+        self.assertEqual(more_rows, 4) # 4 new rows: 2 params per index
+
+        # Set to 0
         self.widget.lstParams.indexWidget(func_index).setCurrentIndex(0)
-        self.assertEqual(self.widget._model_model.rowCount(), last_row)
+        self.assertEqual(self.widget._model_model.rowCount(), last_row - 2) # 2 fewer rows than default
 
     def testPlotTheory(self):

src/sas/qtgui/Plotting/PlotterBase.py

@@ -10 +10 @@
 
 import matplotlib.pyplot as plt
+from matplotlib import rcParams
 
 DEFAULT_CMAP = pylab.cm.jet
@@ -29 +30 @@
         self.manager = manager
         self.quickplot = quickplot
+
+        # Set auto layout so x/y axis captions don't get cut off
+        rcParams.update({'figure.autolayout': True})
 
         #plt.style.use('ggplot')