Changeset b63dc6e in sasview for sansview/perspectives/fitting/fitting.py
- Timestamp:
- Aug 11, 2010 8:50:58 PM (14 years ago)
- 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:
- 7a07864
- Parents:
- 9b18735
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sansview/perspectives/fitting/fitting.py
r9b18735 rb63dc6e 119 119 self.temp_state = [] 120 120 self.state_index = 0 121 self.sfile_ext = None 121 122 # Log startup 122 123 logging.info("Fitting plug-in started") … … 295 296 pass 296 297 297 def set_state(self, state , datainfo=None):298 def set_state(self, state=None, datainfo=None, format=None): 298 299 """ 299 300 Call-back method for the fit page state reader. … … 303 304 : param datainfo: data 304 305 """ 305 # store fitting state in temp_state 306 self.temp_state.append(state) 306 if state != None: 307 # store fitting state in temp_state 308 self.temp_state.append(state) 309 else: 310 self.temp_state = [] 307 311 # index to start with for a new set_state 308 312 self.state_index = 0 313 # state file format 314 self.sfile_ext = format 309 315 310 316 def on_set_state_helper(self,event=None): … … 314 320 : event: FitStateUpdateEvent called by dataloader.plot_data from guiframe 315 321 """ 316 if self.temp_state == None or len(self.temp_state) == 0:322 if len(self.temp_state) == 0 and self.sfile_ext =='.svs': 317 323 if self.state_index==0 and len(self.mypanels) <= 0: 318 324 self.fit_panel.add_default_pages() 325 self.temp_state = [] 326 self.state_index = 0 319 327 return 320 328 … … 331 339 panel = self.fit_panel.add_page(page_info) 332 340 self.store_page(page=panel, data=state.data) 341 self.mypanels.append(panel) 333 342 334 343 # get ready for the next set_state … … 339 348 340 349 self.temp_state = [] 350 #self.state_index = 0 341 351 # Make sure the user sees the fitting panel after loading 342 352 self.parent.set_perspective(self.perspective) 343 353 except: 354 self.state_index==0 344 355 self.temp_state = [] 345 356 raise
Note: See TracChangeset
for help on using the changeset viewer.