Changeset 4036cb0 in sasview for src/sas/sasgui/perspectives

Timestamp:

Aug 31, 2016 11:08:23 AM (8 years ago)

Author:

ajj

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

7b15990, a3f1c11e

Parents:

2c60f304 (diff), ee4b3cb (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 'master' of ​https://github.com/SasView/sasview

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (9 diffs)
• batchfitpage.py (modified) (1 diff)
• fitpage.py (modified) (1 diff)

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

@@ -1504 +1504 @@
             is_2Ddata = True
         if self.model != None:
-            try:
-                is_modified = self._check_value_enter(self.fittable_param,
-                                                      is_modified)
-                is_modified = self._check_value_enter(self.fixed_param,
-                                                      is_modified)
-                is_modified = self._check_value_enter(self.parameters,
-                                                      is_modified)
-            except Exception:
-                logging.error(traceback.format_exc())
+            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.
@@ -1561 +1555 @@
         flag = True
         self.fitrange = True
-        is_modified = False
 
         #wx.PostEvent(self._manager.parent, StatusEvent(status=" \
@@ -1574 +1567 @@
                                                                 [self.data])
             ##Check the values
-            self._check_value_enter(self.fittable_param, is_modified)
-            self._check_value_enter(self.fixed_param, is_modified)
-            self._check_value_enter(self.parameters, is_modified)
+            self._check_value_enter(self.fittable_param)
+            self._check_value_enter(self.fixed_param)
+            self._check_value_enter(self.parameters)
 
             # If qmin and qmax have been modified, update qmin and qmax and
@@ -1660 +1653 @@
         return flag
 
-    def _is_modified(self, is_modified):
-        """
-        return to self._is_modified
-        """
-        return is_modified
-
     def _reset_parameters_state(self, listtorestore, statelist):
         """
@@ -1964 +1951 @@
         wx.PostEvent(self.parent, StatusEvent(status=msg))
         # Flag to register when a parameter has changed.
-        #is_modified = False
         if tcrtl.GetValue().lstrip().rstrip() != "":
             try:
@@ -1994 +1980 @@
                     if temp_npts != self.num_points:
                         self.num_points = temp_npts
-                        #is_modified = True
                 else:
                     msg = "Cannot plot: No points in Q range!!!  "
@@ -2170 +2155 @@
         self.Layout()
 
+
     def _validate_qrange(self, qmin_ctrl, qmax_ctrl):
         """
@@ -2276 +2262 @@
         return flag
 
-    def _check_value_enter(self, list, modified):
+    def _check_value_enter(self, list):
         """
         :param list: model parameter and panel info
@@ -2286 +2272 @@
                 parameter's maximum value ,
                 parameter's units]
-        """
-        is_modified = modified
-        if len(list) == 0:
-            return is_modified
+
+        Returns True if the model parameters have changed.
+        """
+        is_modified = False
         for item in list:
             #skip angle parameters for 1D
-            if not self.enable2D:
-                if item in self.orientation_params:
-                    continue
-            #try:
+            if not self.enable2D and item in self.orientation_params:
+                continue
+
             name = str(item[1])
-
-            if string.find(name, ".npts") == -1 and \
-                                        string.find(name, ".nsigmas") == -1:
-                ## check model parameters range
-                param_min = None
-                param_max = None
-
-                ## check minimun value
-                if item[5] != None and item[5] != "":
-                    if item[5].GetValue().lstrip().rstrip() != "":
-                        try:
-                            param_min = float(item[5].GetValue())
-                            if not self._validate_qrange(item[5], item[2]):
-                                if numpy.isfinite(param_min):
-                                    item[2].SetValue(format_number(param_min))
-
-                            item[5].SetBackgroundColour(wx.WHITE)
-                            item[2].SetBackgroundColour(wx.WHITE)
-
-                        except:
-                            msg = "Wrong fit parameter range entered"
-                            wx.PostEvent(self._manager.parent,
-                                         StatusEvent(status=msg))
-                            raise ValueError, msg
-                        is_modified = True
-                ## check maximum value
-                if item[6] != None and item[6] != "":
-                    if item[6].GetValue().lstrip().rstrip() != "":
-                        try:
-                            param_max = float(item[6].GetValue())
-                            if not self._validate_qrange(item[2], item[6]):
-                                if numpy.isfinite(param_max):
-                                    item[2].SetValue(format_number(param_max))
-
-                            item[6].SetBackgroundColour(wx.WHITE)
-                            item[2].SetBackgroundColour(wx.WHITE)
-                        except:
-                            msg = "Wrong Fit parameter range entered "
-                            wx.PostEvent(self._manager.parent,
-                                         StatusEvent(status=msg))
-                            raise ValueError, msg
-                        is_modified = True
-
-                if param_min != None and param_max != None:
-                    if not self._validate_qrange(item[5], item[6]):
-                        msg = "Wrong Fit range entered for parameter "
-                        msg += "name %s of model %s " % (name, self.model.name)
-                        wx.PostEvent(self._manager.parent,
-                                     StatusEvent(status=msg))
-
-                if name in self.model.details.keys():
-                    self.model.details[name][1:3] = param_min, param_max
-                    is_modified = True
-                else:
-                    self.model.details[name] = ["", param_min, param_max]
-                    is_modified = True
-            try:
-                # Check if the textctr is enabled
-                if item[2].IsEnabled():
-                    value = float(item[2].GetValue())
-                    item[2].SetBackgroundColour("white")
-                    # If the value of the parameter has changed,
-                    # +update the model and set the is_modified flag
-                    if value != self.model.getParam(name) and \
-                                                numpy.isfinite(value):
-                        self.model.setParam(name, value)
-            except:
-                item[2].SetBackgroundColour("pink")
-                msg = "Wrong Fit parameter value entered "
-                wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
+            if name.endswith(".npts") or name.endswith(".nsigmas"):
+                continue
+
+            # Check that min, max and value are floats
+            value_ctrl, min_ctrl, max_ctrl = item[2], item[5], item[6]
+            min_str = min_ctrl.GetValue().strip()
+            max_str = max_ctrl.GetValue().strip()
+            value_str = value_ctrl.GetValue().strip()
+            validity = check_float(value_ctrl)
+            if min_str != "":
+                validity = validity and check_float(min_ctrl)
+            if max_str != "":
+                validity = validity and check_float(max_ctrl)
+            if not validity:
+                continue
+
+            # Check that min is less than max
+            low = -numpy.inf if min_str == "" else float(min_str)
+            high = numpy.inf if max_str == "" else float(max_str)
+            if high < low:
+                min_ctrl.SetBackgroundColour("pink")
+                min_ctrl.Refresh()
+                max_ctrl.SetBackgroundColour("pink")
+                max_ctrl.Refresh()
+                #msg = "Invalid fit range for %s: min must be smaller than max"%name
+                #wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
+                continue
+
+            # Force value between min and max
+            value = float(value_str)
+            if value < low:
+                value = low
+                value_ctrl.SetValue(format_number(value))
+            elif value > high:
+                value = high
+                value_ctrl.SetValue(format_number(value))
+
+            # Update value in model if it has changed
+            if value != self.model.getParam(name):
+                self.model.setParam(name, value)
+                is_modified = True
+
+            if name not in self.model.details.keys():
+                self.model.details[name] = ["", None, None]
+            old_low, old_high = self.model.details[name][1:3]
+            if old_low != low or old_high != high:
+                # The configuration has changed but it won't change the
+                # computed curve so no need to set is_modified to True
+                #is_modified = True
+                self.model.details[name][1:3] = low, high
 
         return is_modified

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

@@ -256 +256 @@
 #         if self.model != None:           
 #             ##Check the values
-#             self._check_value_enter( self.fittable_param, is_modified)
-#             self._check_value_enter( self.fixed_param, is_modified)
-#             self._check_value_enter( self.parameters, is_modified)
+#             self._check_value_enter( self.fittable_param)
+#             self._check_value_enter( self.fixed_param)
+#             self._check_value_enter( self.parameters)
 # 
 #             # If qmin and qmax have been modified, update qmin and qmax and 

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

@@ -1365 +1365 @@
             try:
                 tcrtl.SetBackgroundColour(wx.WHITE)
-                self._check_value_enter(self.fittable_param, is_modified)
-                self._check_value_enter(self.parameters, is_modified)
+                self._check_value_enter(self.fittable_param)
+                self._check_value_enter(self.parameters)
             except:
                 tcrtl.SetBackgroundColour("pink")