Changeset 199b515e in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Oct 10, 2016 4:02:19 PM (8 years ago)

Author:

GitHub <noreply@…>

Parents:

68669da (diff), 8662a58 (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:

Andrew Jackson <andrew.jackson@…> (10/10/16 16:02:19)

git-committer:

GitHub <noreply@…> (10/10/16 16:02:19)

Message:

Merge 8662a587350e2b5ad37342ca1d19a5aeb0e7fe8c into 68669da9154d53fe949cb741efa850cd516ce157

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (7 diffs)
• fitpage.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -1382 +1382 @@
         self.state.npts = self.npts_x
 
-    def _onparamEnter_helper(self):
+    def _onparamEnter_helper(self, is_modified=False):
         """
         check if values entered by the user are changed and valid to replot
@@ -1388 +1388 @@
         """
         # Flag to register when a parameter has changed.
-        is_modified = False
+        #is_modified = False
         self.fitrange = True
         is_2Ddata = False
@@ -1396 +1396 @@
             is_2Ddata = True
         if self.model != None:
-            is_modified = (self._check_value_enter(self.fittable_param)
-                           or self._check_value_enter(self.fixed_param)
-                           or self._check_value_enter(self.parameters))
+            #Either we get a is_modified = True passed in because
+            #_update_paramv_on_fit() has been called already or
+            # we need to check here ourselves.
+            if not is_modified:
+                is_modified = (self._check_value_enter(self.fittable_param)
+                               or self._check_value_enter(self.fixed_param)
+                               or self._check_value_enter(self.parameters))
 
             # Here we should check whether the boundaries have been modified.
@@ -1436 +1440 @@
                 self.Refresh()
 
-        logging.info("is_modified flag set to %g",is_modified)
+        #logging.info("is_modified flag set to %g",is_modified)
         return is_modified
 
@@ -1446 +1450 @@
         flag = True
         self.fitrange = True
+        is_modified = False
 
         #wx.PostEvent(self._manager.parent, StatusEvent(status=" \
@@ -1458 +1463 @@
                                                                 [self.data])
             ##Check the values
-            self._check_value_enter(self.fittable_param)
-            self._check_value_enter(self.fixed_param)
-            self._check_value_enter(self.parameters)
+            is_modified = (self._check_value_enter(self.fittable_param)
+                            or self._check_value_enter(self.fixed_param)
+                            or self._check_value_enter(self.parameters))
 
             # If qmin and qmax have been modified, update qmin and qmax and
@@ -1542 +1547 @@
             logging.error(traceback.format_exc())
 
-        return flag
+        return flag,is_modified
 
     def _reset_parameters_state(self, listtorestore, statelist):

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -996 +996 @@
             self.create_default_data()
         """
-        flag = self._update_paramv_on_fit()
-
-        wx.CallAfter(self._onparamEnter_helper)
+        flag,is_modified = self._update_paramv_on_fit()
+
+        wx.CallAfter(self._onparamEnter_helper(is_modified))
         if not flag:
             msg = "The parameters are invalid"