Changes in src/sas/sasgui/perspectives/fitting/pagestate.py [27109e5:71601312] in sasview
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/fitting/pagestate.py
r27109e5 r71601312 74 74 ["dq_l", "dq_l", "float"], 75 75 ["dq_r", "dq_r", "float"], 76 ["dx_percent", "dx_percent", "float"], 76 ["dx_max", "dx_max", "float"], 77 ["dx_min", "dx_min", "float"], 77 78 ["dxl", "dxl", "float"], 78 79 ["dxw", "dxw", "float"]] … … 214 215 self.dq_l = None 215 216 self.dq_r = None 216 self.dx_ percent= None217 self.dx_ old = False217 self.dx_max = None 218 self.dx_min = None 218 219 self.dxl = None 219 220 self.dxw = None … … 342 343 obj.dq_l = copy.deepcopy(self.dq_l) 343 344 obj.dq_r = copy.deepcopy(self.dq_r) 344 obj.dx_ percent = copy.deepcopy(self.dx_percent)345 obj.dx_ old = copy.deepcopy(self.dx_old)345 obj.dx_max = copy.deepcopy(self.dx_max) 346 obj.dx_min = copy.deepcopy(self.dx_min) 346 347 obj.dxl = copy.deepcopy(self.dxl) 347 348 obj.dxw = copy.deepcopy(self.dxw) … … 561 562 rep += "dq_l : %s\n" % self.dq_l 562 563 rep += "dq_r : %s\n" % self.dq_r 563 rep += "dx_percent : %s\n" % str(self.dx_percent) 564 rep += "dx_max : %s\n" % str(self.dx_max) 565 rep += "dx_min : %s\n" % str(self.dx_min) 564 566 rep += "dxl : %s\n" % str(self.dxl) 565 567 rep += "dxw : %s\n" % str(self.dxw) … … 819 821 820 822 attr = newdoc.createAttribute("version") 821 from sasimport sasview823 import sasview 822 824 attr.nodeValue = sasview.__version__ 823 825 # attr.nodeValue = '1.0' … … 1046 1048 setattr(self, item[0], parse_entry_helper(node, item)) 1047 1049 1048 dx_old_node = get_content('ns:%s' % 'dx_min', entry)1049 1050 for item in LIST_OF_STATE_ATTRIBUTES: 1050 if item[0] == "dx_percent" and dx_old_node is not None: 1051 dxmin = ["dx_min", "dx_min", "float"] 1052 setattr(self, item[0], parse_entry_helper(dx_old_node, 1053 dxmin)) 1054 self.dx_old = True 1055 else: 1056 node = get_content('ns:%s' % item[0], entry) 1057 setattr(self, item[0], parse_entry_helper(node, item)) 1051 node = get_content('ns:%s' % item[0], entry) 1052 setattr(self, item[0], parse_entry_helper(node, item)) 1058 1053 1059 1054 for item in LIST_OF_STATE_PARAMETERS:
Note: See TracChangeset
for help on using the changeset viewer.