Changeset f2261c2 in sasview

Timestamp:

Oct 10, 2016 3:29:56 PM (8 years ago)

Author:

krzywon

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3e1c9e5

Parents:

f22b43c (diff), 5223602 (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)
• fitpage.py (modified) (1 diff)

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

@@ -1397 +1397 @@
         self.state.npts = self.npts_x
 
-    def _onparamEnter_helper(self, is_modified=False):
+    def _onparamEnter_helper(self,is_modified = False):
         """
         check if values entered by the user are changed and valid to replot
@@ -3053 +3053 @@
         """
         content = ''
+        bound_hi = ''
+        bound_lo = ''
         # go through the str params
         for item in param:
@@ -3084 +3086 @@
                     value = item[2].GetValue()
 
+            # Bounds
+            try:
+                bound_lo = item[5].GetValue()
+                bound_hi = item[6].GetValue()
+            except Exception:
+                # harmless - need to just pass
+                pass
+
             # add to the content
             if disfunc != '':
@@ -3099 +3109 @@
             except Exception:
                 logging.error(traceback.format_exc())
-            content += name + ',' + str(check) + ',' + value + disfunc + ':'
+            content += name + ',' + str(check) + ',' +\
+                    value + disfunc + ',' + bound_lo + ',' +\
+                    bound_hi + ':'
 
         return content
@@ -3150 +3162 @@
                 # Transfer the text to content[dictionary]
                 context[name] = [check, value]
+
+                # limits
+                limit_lo = item[3]
+                context[name].append(limit_lo)
+                limit_hi = item[4]
+                context[name].append(limit_hi)
+
             # ToDo: PlugIn this poly disp function for pasting
             try:
-                poly_func = item[3]
+                poly_func = item[5]
                 context[name].append(poly_func)
                 try:
                     # take the vals and weights for  array
-                    array_values = item[4].split(' ')
-                    array_weights = item[5].split(' ')
+                    array_values = item[6].split(' ')
+                    array_weights = item[7].split(' ')
                     val = [float(a_val) for a_val in array_values[1:]]
                     weit = [float(a_weit) for a_weit in array_weights[1:]]
@@ -3205 +3224 @@
                 name = item[1]
                 if name in content.keys():
-                    check = content[name][0]
-                    pd = content[name][1]
+                    values = content[name]
+                    check = values[0]
+                    pd = values[1]
+
                     if name.count('.') > 0:
                         # If this is parameter.width, then pd may be a floating
@@ -3229 +3250 @@
                             fun_val = self.model.fun_list[content[name][1]]
                             self.model.setParam(name, fun_val)
+                    try:
+                        item[5].SetValue(str(values[-3]))
+                        item[6].SetValue(str(values[-2]))
+                    except Exception:
+                        # passing as harmless non-update
+                        pass
 
                     value = content[name][1:]
@@ -3273 +3300 @@
                                 self.model.setParam(name, fun_val)
                                 # save state
+                        try:
+                            item[5].SetValue(str(value[-3]))
+                            item[6].SetValue(str(value[-2]))
+                        except Exception:
+                            # passing as harmless non-update
+                            pass
+
                         self._paste_poly_help(item, value)
                         if check == 'True':
@@ -3307 +3341 @@
         """
         # Do nothing if not setting polydispersity
-        if len(value[1]) == 0:
+        if len(value[3]) == 0:
             return
 

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

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