Changeset c5dca87 in sasview for calculatorview/perspectives/calculator/collimation_editor.py

Timestamp:

May 6, 2010 1:44:57 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:

e6093db

Parents:

85e665e

Message:

working on data editor

File:

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

calculatorview/perspectives/calculator/collimation_editor.py

@@ -69 +69 @@
         collimation_name_txt.SetToolTipString(hint_collimation_txt) 
         self.collimation_cbox = wx.ComboBox(self, -1, style=wx.CB_READONLY)
+        wx.EVT_COMBOBOX(self.collimation_cbox, -1, self.on_select_collimation) 
         hint_collimation_name_txt = 'Name of collimations.'
         self.collimation_cbox.SetToolTipString(hint_collimation_name_txt) 
@@ -229 +230 @@
         self.enable_collimation() 
         self.bt_add_aperture.Enable()
+        self.fill_aperture_combox()
+        self.enable_aperture()
         self.set_values()
         
@@ -258 +261 @@
         self.enable_aperture()
         
+    def on_select_collimation(self, event):
+        """
+           fill the control on the panel according to the current  selected collimation 
+        """
+        self.set_values()
+        self.fill_aperture_combox()
+        self.enable_aperture()
+    
     def enable_collimation(self):
         """
@@ -366 +377 @@
             n_aperture = self.aperture_cbox.GetCount()
             aperture_hint_txt = 'apertures available: %s '%str(n_aperture)
-            if len(collimation.aperture) > 1:
+            if len(collimation.aperture) > 0:
                 self.bt_remove_aperture.Enable()
             else:
@@ -393 +404 @@
             fill the current combobox with the available aperture
         """
+        self.aperture_cbox.Clear()
         collimation, _, _ = self.get_current_collimation()
         if collimation is None or not collimation.aperture:
             return
-        
         for aperture in collimation.aperture:
             pos = self.aperture_cbox.Append(str(aperture.name))