Changeset 85e665e in sasview for calculatorview/perspectives

Timestamp:

May 4, 2010 2:31:24 PM (14 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:

• calculatorview/perspectives/calculator/collimation_editor.py (modified) (4 diffs)

calculatorview/perspectives/calculator/collimation_editor.py

@@ -229 +229 @@
         self.enable_collimation() 
         self.bt_add_aperture.Enable()
+        self.set_values()
         
     def remove_collimation(self, event):
@@ -246 +247 @@
                         position -= 1 
                     self.collimation_cbox.SetSelection(position)
-                   
+        if not self._collimation and self.collimation_cbox.GetCount() == 0:       
+            self.bt_add_aperture.Disable()  
+            self.name_tcl.Clear()
+            self.length_tcl.Clear()
+            self.length_unit_tcl.Clear()
+            self.aperture_cbox.Clear()
+            self.aperture_cbox.Disable()
         #disable or enable the combo box when necessary
         self.enable_collimation()
+        self.enable_aperture()
         
     def enable_collimation(self):
@@ -266 +274 @@
             self.collimation_cbox.Disable()
             self.bt_remove_collimation.Disable()
-            self.bt_add_aperture.Disable()
             collimation_hint_txt = 'No collimation is available for this data.'
         self.collimation_txt.SetLabel(collimation_hint_txt)
@@ -504 +511 @@
 
     app  = wx.App()
- 
     dlg = CollimationDialog(collimation=[Collimation()])
     dlg.ShowModal()