Changeset 814a253 in sasview for src/sas/qtgui/Perspectives

Timestamp:

Oct 24, 2017 6:23:48 AM (7 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:

def64a0

Parents:

88e1f57 (diff), 7ffa5ee9 (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' of ​https://github.com/SasView/sasview into ESS_GUI

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• ViewDelegate.py (modified) (1 diff)
• FittingWidget.py (modified) (1 diff)

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

@@ -128 +128 @@
 
     def editableParameters(self):
-        return [self.poly_min, self.poly_max, self.poly_npts, self.poly_nsigs]
+        return [self.poly_pd, self.poly_min, self.poly_max, self.poly_npts, self.poly_nsigs]
 
     def columnDict(self):

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

@@ -1038 +1038 @@
         # Regardless of previous state, this should now be `plot show` functionality only
         self.cmdPlot.setText("Show Plot")
-        if not self.data_is_loaded:
-            self.recalculatePlotData()
+        # Force data recalculation so existing charts are updated
+        self.recalculatePlotData()
         self.showPlot()