Changeset 60a4e71 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

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

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (5 diffs)

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):