Changeset fa81e94 in sasview for src/sas/sasgui/perspectives/invariant/invariant_state.py
- Timestamp:
- Nov 15, 2017 4:33:09 AM (7 years ago)
- Branches:
- 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
- Children:
- d4881f6a
- Parents:
- 7c487846
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/invariant/invariant_state.py
- Property mode changed from 100644 to 100755
r1fa4f736 rfa81e94 137 137 138 138 # text ctl general inputs ( excluding extrapolation text ctl) 139 for key, value in self.input_list.ite ritems():139 for key, value in self.input_list.items(): 140 140 if value == '': 141 141 continue … … 163 163 low_off = False 164 164 high_off = False 165 for key, value in self.input_list.ite ritems():165 for key, value in self.input_list.items(): 166 166 key_split = key.split('_') 167 167 max_ind = len(key_split) - 1 … … 213 213 # other outputs than Q* 214 214 name = item[0] + "_tcl" 215 if name in self.saved_state.keys():215 if name in list(self.saved_state.keys()): 216 216 value = self.saved_state[name] 217 217 … … 298 298 top_element.appendChild(state) 299 299 300 for name, value in self.saved_state.ite ritems():300 for name, value in self.saved_state.items(): 301 301 element = newdoc.createElement(str(name)) 302 302 element.appendChild(newdoc.createTextNode(str(value))) … … 307 307 top_element.appendChild(history) 308 308 309 for name, value in self.state_list.ite ritems():309 for name, value in self.state_list.items(): 310 310 history_element = newdoc.createElement('state_' + str(name)) 311 for state_name, state_value in value.ite ritems():311 for state_name, state_value in value.items(): 312 312 state_element = newdoc.createElement(str(state_name)) 313 313 child = newdoc.createTextNode(str(state_value)) … … 322 322 top_element.appendChild(bookmark) 323 323 item_list = ['time', 'date', 'state', 'comp_state'] 324 for name, value_list in self.bookmark_list.ite ritems():324 for name, value_list in self.bookmark_list.items(): 325 325 element = newdoc.createElement('mark_' + str(name)) 326 326 _, date, state, comp_state = value_list … … 331 331 state_list_element = newdoc.createElement('state') 332 332 comp_state_list_element = newdoc.createElement('comp_state') 333 for state_name, state_value in value_list[2].ite ritems():333 for state_name, state_value in value_list[2].items(): 334 334 state_element = newdoc.createElement(str(state_name)) 335 335 child = newdoc.createTextNode(str(state_value)) 336 336 state_element.appendChild(child) 337 337 state_list_element.appendChild(state_element) 338 for comp_name, comp_value in value_list[3].ite ritems():338 for comp_name, comp_value in value_list[3].items(): 339 339 comp_element = newdoc.createElement(str(comp_name)) 340 340 comp_element.appendChild(newdoc.createTextNode(str(comp_value))) … … 365 365 msg = "InvariantSate no longer supports non-CanSAS" 366 366 msg += " format for invariant files" 367 raise RuntimeError , msg367 raise RuntimeError(msg) 368 368 369 369 if node.get('version')\ … … 382 382 except: 383 383 msg = "InvariantSate.fromXML: Could not read" 384 msg += " timestamp\n %s" % sys.exc_ value384 msg += " timestamp\n %s" % sys.exc_info()[1] 385 385 logger.error(msg) 386 386 … … 454 454 # default string values 455 455 for num in range(1, 19): 456 exec "s_%s = 'NA'" % str(num)456 exec("s_%s = 'NA'" % str(num)) 457 457 lines = strings.split('\n') 458 458 # get all string values from __str__() … … 695 695 except: 696 696 msg = "XML document does not contain invariant" 697 msg += " information.\n %s" % sys.exc_ value697 msg += " information.\n %s" % sys.exc_info()[1] 698 698 logger.info(msg) 699 699 return state … … 737 737 output.append(sas_entry) 738 738 else: 739 raise RuntimeError , "%s is not a file" % path739 raise RuntimeError("%s is not a file" % path) 740 740 741 741 # Return output consistent with the loader's api … … 783 783 msg = "The cansas writer expects a Data1D" 784 784 msg += " instance: %s" % str(datainfo.__class__.__name__) 785 raise RuntimeError , msg785 raise RuntimeError(msg) 786 786 # make sure title and data run is filled up. 787 787 if datainfo.title is None or datainfo.title == '':
Note: See TracChangeset
for help on using the changeset viewer.