Changes in src/sas/sasgui/perspectives/fitting/basepage.py [f22b43c:313c5c9] in sasview

File:

• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (11 diffs)

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
@@ -2032 +2032 @@
 
         if  struct_factor != None:
-            from sas.sascalc.fit.MultiplicationModel import MultiplicationModel
+            from sasmodels.sasview_model import MultiplicationModel
             self.model = MultiplicationModel(form_factor(self.multi_factor),
                                              struct_factor())
@@ -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':
@@ -3283 +3317 @@
                             item[0].SetValue(is_true)
 
+        self.select_param(event=None)
+        self.Refresh()
+
     def _paste_poly_help(self, item, value):
         """
@@ -3307 +3344 @@
         """
         # Do nothing if not setting polydispersity
-        if len(value[1]) == 0:
+        if len(value[3]) == 0:
             return