Changeset acc254f in sasview for calculatorview

Timestamp:

Jun 25, 2012 4:32:58 PM (13 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:

1da574d

Parents:

5a5bb29

Message:

more fix: dataoperator on MAC

File:

• calculatorview/src/sans/perspectives/calculator/data_operator.py (modified) (7 diffs)

calculatorview/src/sans/perspectives/calculator/data_operator.py

@@ -167 +167 @@
         if ON_MAC:
             ctrl.Enable(enable)
-            chidren = ctrl.GetChildren()
+            children = ctrl.GetChildren()
             if len(children) > 0:
                 ctrl.GetChildren()[0].SetBackGroundColour(\
@@ -217 +217 @@
         """
         if ON_MAC:
-            chidren = ctrl.GetChildren()
+            children = ctrl.GetChildren()
             if len(children) > 0:
                 ctrl.GetChildren()[0].SetBackgroundColour(color)  
@@ -252 +252 @@
             self.output.name = str(self.data_namectr.GetValue())
         self.draw_output(self.output)
+        self.name_sizer.Layout()
         
     def on_select_data1(self, event=None):
@@ -297 +298 @@
         item = event.GetEventObject()
         text = item.GetValue().strip().lower()
+        pos = item.GetCurrentSelection()
+        data = item.GetClientData(pos)
         self._show_numctrl(self.numberctr, text=='number')
-        
-        pos = item.GetSelection()
-        data = item.GetClientData(pos)
         content = "?"
         if not (self.numberctr.IsShown() and self.numberctr.IsEnabled()):
@@ -319 +319 @@
                     data = None
                 item.SetClientData(pos, content)
+                
             self.put_text_pic(self.data2_pic, content)   
         self.check_data_inputs()
@@ -333 +334 @@
         pic.add_text()
         pic.draw()
+        self.name_sizer.Layout()
                   
     def check_data_inputs(self):
@@ -475 +477 @@
         pos_pre1 = self.data1_cbox.GetCurrentSelection()
         pos_pre2 = self.data2_cbox.GetCurrentSelection()
-        current1 = self.data1_cbox.GetValue()
-        current2 = self.data2_cbox.GetValue()
+        current1 = self.data1_cbox.GetLabel()
+        current2 = self.data2_cbox.GetLabel()
         if pos_pre1 < 0:
             pos_pre1 = 0