Changeset fc1761b in sasview for fittingview/src/sans/perspectives

Timestamp:

Oct 18, 2011 6:21:47 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

46c4ccb

Parents:

f438e529

Message:

more fixs in check box

File:

• fittingview/src/sans/perspectives/fitting/basepage.py (modified) (9 diffs)

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -2538 +2538 @@
             # Make sure the check box updated when all checked
             if self.cb1.GetValue():
-                self.select_all_param(None)
+                #self.select_all_param(None)
+                self.get_all_checked_params()
 
             # update params
@@ -2913 +2914 @@
             # 2D
             if self.data.__class__.__name__== "Data2D":
+                try:
+                    check = item[0].GetValue()
+                except:
+                    check = None
                 name = item[1]
                 value = item[2].GetValue()
@@ -2919 +2924 @@
                 ## for 1D all parameters except orientation
                 if not item[1] in orient_param:
+                    try:
+                        check = item[0].GetValue()
+                    except:
+                        check = None
                     name = item[1]
                     value = item[2].GetValue()
@@ -2938 +2947 @@
                 pass
             #if disfunc.count('array') == 0:
-            content += name + ',' + value + disfunc + ':'
+            content +=  name + ',' + str(check) + ',' + value + disfunc + ':'
 
         return content
@@ -2982 +2991 @@
             if len(line) != 0:
                 item =line.split(',')
+                check = item[1]
                 name = item[0]
-                value = item[1]
+                value = item[2]
                 # Transfer the text to content[dictionary]
-                context[name] = [value]
+                context[name] = [check, value]
             # ToDo: PlugIn this poly disp function for pasting
             try:
-                poly_func = item[2]
+                poly_func = item[3]
                 context[name].append(poly_func)
                 try:
                     # take the vals and weights for  array 
-                    array_values = item[3].split(' ')
-                    array_weights = item[4].split(' ')
+                    array_values = item[4].split(' ')
+                    array_weights = item[5].split(' ')
                     val = [float(a_val) for a_val in array_values[1:]]
                     weit = [float(a_weit) for a_weit in array_weights[1:]]
@@ -3040 +3050 @@
                 name = item[1]
                 if name in content.keys():
-                    pd = content[name][0]
+                    check = content[name][0]
+                    pd = content[name][1]
                     if name.count('.') > 0:
                         try:
@@ -3053 +3064 @@
                         item[2].Enable(False)
                     if item[2].__class__.__name__ == "ComboBox":
-                        if self.model.fun_list.has_key(content[name][0]):
-                            fun_val = self.model.fun_list[content[name][0]]
+                        if self.model.fun_list.has_key(content[name][1]):
+                            fun_val = self.model.fun_list[content[name][1]]
                             self.model.setParam(name,fun_val)
                     
-                    value = content[name]
+                    value = content[name][1:]
                     self._paste_poly_help(item, value)
-        # 1D
+                    if check == 'True':
+                        is_true = True
+                    elif check == 'False':
+                        is_true = False
+                    else:
+                        is_true = None
+                    if is_true != None:
+                        item[0].SetValue(is_true)
+            # 1D
             else:
                 ## for 1D all parameters except orientation
@@ -3065 +3084 @@
                     name = item[1]
                     if name in content.keys():
+                        check = content[name][0]
                         # Avoid changing combox content which needs special care
-                        value = content[name]
+                        value = content[name][1:]
                         pd = value[0]
                         if name.count('.') > 0:
@@ -3087 +3107 @@
                                 #    self.state.str_parameters)
                         self._paste_poly_help(item, value)
+                        if check == 'True':
+                            is_true = True
+                        elif check == 'False':
+                            is_true = False
+                        else:
+                            is_true = None
+                        if is_true != None:
+                            item[0].SetValue(is_true)
                         
     def _paste_poly_help(self, item, value):