Ignore:
Timestamp:
Jul 27, 2010 6:23:27 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:
d318616
Parents:
8898e963
Message:

fixed conflicts w/datamanager

Location:
invariantview/perspectives/invariant
Files:
3 edited

Legend:

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

    r9c1f463 r51fb7ab  
    280280            self.__data.group_id = datainfo.filename 
    281281            self.__data.id = datainfo.filename 
    282  
     282             
    283283            temp_state = copy.deepcopy(state) 
    284284             
  • invariantview/perspectives/invariant/invariant_panel.py

    r330c63b r51fb7ab  
    120120        data, path = self.data_cbbox.GetClientData(n) 
    121121        self._manager.compute_helper(data=data) 
    122         title = "Untitled" 
    123         if hasattr(data,"title"): 
    124             title = str(data.title.lstrip().rstrip()) 
    125             if title == "": 
    126                 title = str(data.name) 
    127         else: 
    128             title = str(data.name) 
    129         wx.PostEvent(self.parent, NewPlotEvent(plot=data, title=title)) 
     122        
    130123     
    131124    def set_data(self, list=[], state=None): 
     
    144137            self.data_cbbox.Enable() 
    145138            self.on_select_data(event=None) 
    146              
    147     def set_current_data(self, data): 
     139            title = "Untitled" 
     140            if hasattr(data,"title"): 
     141                title = str(data.title.lstrip().rstrip()) 
     142                if title == "": 
     143                    title = str(data.name) 
     144            else: 
     145                title = str(data.name) 
     146 
     147            wx.PostEvent(self.parent, NewPlotEvent(plot=data, title=title)) 
     148             
     149    def set_current_data(self, data, path=None): 
    148150        """ 
    149151        Set the data 
     
    167169            data_qmin = min (self._data.x) 
    168170            data_qmax = max (self._data.x) 
    169             print "set_current_data",self.data_cbbox.GetCount() 
     171 
    170172            if data.name not in self.data_cbbox.GetItems(): 
    171173                self.data_cbbox.Insert(pos=0, clientData=(data, None),  
     
    220222            self.new_state = True 
    221223            self.state = state    
    222  
     224             
    223225            num = self.state.saved_state['state_num'] 
    224226             
  • invariantview/perspectives/invariant/invariant_state.py

    rb281210 r51fb7ab  
    9191        self.compute_num = 0 
    9292        self.state_num = 0 
    93         self.timestamp = "('00:00:00', '00/00/0000')" 
     93        self.timestamp = ('00:00:00', '00/00/0000') 
    9494        self.container = None 
    9595        #plot image 
Note: See TracChangeset for help on using the changeset viewer.