Changeset 9d130f3 in sasview

Timestamp:

Sep 25, 2018 3:54:04 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

6f6e8e4

Parents:

91f4884

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (09/25/18 03:51:38)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (09/25/18 03:54:04)

Message:

Replace method names for C&S fit calls. SASVIEW-1159

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingPerspective.py (modified) (2 diffs)
• FittingWidget.py (modified) (1 diff)

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

@@ -298 +298 @@
             page_name = "Page%s"%tab_object.tab_id
             if any([page_name in tab for tab in tabs_for_fitting]):
-                tab_object.setFittingStarted()
+                tab_object.disableInteractiveElements()
 
         pass
@@ -315 +315 @@
             page_name = "Page%s"%tab_object.tab_id
             if any([page_name in tab for tab in tabs_for_fitting]):
-                tab_object.setFittingStopped()
+                tab_object.enableInteractiveElements()
 
         pass

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

@@ -1538 +1538 @@
 
         elapsed = result[1]
-        if self.calc_fit._interrupting:
+        if self.calc_fit is not None and self.calc_fit._interrupting:
             msg = "Fitting cancelled by user after: %s s." % GuiUtils.formatNumber(elapsed)
             logger.warning("\n"+msg+"\n")