Changeset 85e665e in sasview for calculatorview


Ignore:
Timestamp:
May 4, 2010 2:31:24 PM (15 years ago)
Author:
Gervaise Alina <gervyh@…>
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:
c5dca87
Parents:
ad6f597
Message:

working on data editor

File:
1 edited

Legend:

Unmodified
Added
Removed
  • calculatorview/perspectives/calculator/collimation_editor.py

    rad6f597 r85e665e  
    229229        self.enable_collimation()  
    230230        self.bt_add_aperture.Enable() 
     231        self.set_values() 
    231232         
    232233    def remove_collimation(self, event): 
     
    246247                        position -= 1  
    247248                    self.collimation_cbox.SetSelection(position) 
    248                     
     249        if not self._collimation and self.collimation_cbox.GetCount() == 0:        
     250            self.bt_add_aperture.Disable()   
     251            self.name_tcl.Clear() 
     252            self.length_tcl.Clear() 
     253            self.length_unit_tcl.Clear() 
     254            self.aperture_cbox.Clear() 
     255            self.aperture_cbox.Disable() 
    249256        #disable or enable the combo box when necessary 
    250257        self.enable_collimation() 
     258        self.enable_aperture() 
    251259         
    252260    def enable_collimation(self): 
     
    266274            self.collimation_cbox.Disable() 
    267275            self.bt_remove_collimation.Disable() 
    268             self.bt_add_aperture.Disable() 
    269276            collimation_hint_txt = 'No collimation is available for this data.' 
    270277        self.collimation_txt.SetLabel(collimation_hint_txt) 
     
    504511 
    505512    app  = wx.App() 
    506   
    507513    dlg = CollimationDialog(collimation=[Collimation()]) 
    508514    dlg.ShowModal() 
Note: See TracChangeset for help on using the changeset viewer.