Ignore:
Timestamp:
Jul 26, 2010 9:13:23 PM (14 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:
3641881
Parents:
cb274d9e
Message:

fixed conflict w/new data-manager

File:
1 edited

Legend:

Unmodified
Added
Removed
  • invariantview/perspectives/invariant/invariant.py

    r343fdb6 r9c1f463  
    4747        #  for your plug-in. This defines your plug-in "perspective" 
    4848        self.perspective = [] 
     49         
     50        # is this data from *.inv file? 
     51        self.is_state_data = False 
    4952         
    5053        self.state_reader = None    
     
    235238        if data is None: 
    236239            return  
    237         # Store reference to data 
    238         self.__data = data 
    239         # Set the data set to be user for invariant calculation 
    240         self.invariant_panel.set_current_data(data=data) 
     240        if self.is_state_data: 
     241            self.is_state_data = False 
     242        else: 
     243            # Store reference to data 
     244            self.__data = data 
     245            # Set the data set to be user for invariant calculation 
     246            self.invariant_panel.set_current_data(data=data) 
    241247         
    242248    def save_file(self, filepath, state=None): 
     
    281287            self.parent.set_perspective(self.perspective) 
    282288            # set state 
    283             self.invariant_panel.set_state(state=temp_state,data=self.__data)               
     289            self.invariant_panel.set_state(state=temp_state,data=self.__data) 
     290            self.is_state_data = True             
    284291 
    285292        except: 
Note: See TracChangeset for help on using the changeset viewer.