Changeset 5a5bb29 in sasview

Timestamp:

Jun 25, 2012 2:37:13 PM (12 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:

acc254f

Parents:

33c671e

Message:

better layout for MAC

File:

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

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

@@ -88 +88 @@
         data2_hori_sizer = wx.BoxSizer(wx.HORIZONTAL)
         data_name = wx.StaticText(self, -1, 'Output Data Name')  
-        equal_name = wx.StaticText(self, -1, ' =',  size=(50, 23)) 
+        equal_name = wx.StaticText(self, -1, ' =', size=(50, 25)) 
         data1_name = wx.StaticText(self, -1, 'Data1')
         operator_name = wx.StaticText(self, -1, 'Operator')
@@ -109 +109 @@
                                        style=wx.CB_READONLY)
 
-        self.out_pic = SmallPanel(self, -1, True, size=(_BOX_WIDTH, _BOX_WIDTH), 
-                             style=wx.NO_BORDER)
-        self.equal_pic = SmallPanel(self, -1, True, '=',  size=(50, _BOX_WIDTH), 
-                              style=wx.NO_BORDER)
+        self.out_pic = SmallPanel(self, -1, True, 
+                                    size=(_BOX_WIDTH, _BOX_WIDTH), 
+                                    style=wx.NO_BORDER)
+        self.equal_pic = SmallPanel(self, -1, True, '=',  
+                                    size=(50, _BOX_WIDTH), 
+                                    style=wx.NO_BORDER)
         self.data1_pic = SmallPanel(self, -1, True, 
                                     size=(_BOX_WIDTH, _BOX_WIDTH), 
-                             style=wx.NO_BORDER)
-        self.operator_pic = SmallPanel(self, -1, True, 
-                                       '+', size=(70, _BOX_WIDTH), 
-                                       style=wx.NO_BORDER)
+                                    style=wx.NO_BORDER)
+        self.operator_pic = SmallPanel(self, -1, True, '+',
+                                    size=(70, _BOX_WIDTH), 
+                                    style=wx.NO_BORDER)
         self.data2_pic = SmallPanel(self, -1, True, 
                                     size=(_BOX_WIDTH, _BOX_WIDTH), 
-                             style=wx.NO_BORDER)
+                                    style=wx.NO_BORDER)
         for ax in self.equal_pic.axes:
             ax.set_frame_on(False)
@@ -130 +132 @@
                                        (self.data_namectr, 0, wx.LEFT, 3),
                                        (self.out_pic, 0, wx.LEFT, 3)])
-        equal_sizer.AddMany([(13, 15), (equal_name, 0, wx.LEFT, 3),
+        equal_sizer.AddMany([(13, 13), (equal_name, 0, wx.LEFT, 3),
                                        (self.equal_pic, 0, wx.LEFT, 3)])
         old_data1_sizer.AddMany([(data1_name, 0, wx.LEFT, 3),
@@ -165 +167 @@
         if ON_MAC:
             ctrl.Enable(enable)
-            ctrl.GetChildren()[0].SetBackGroundColor(self.GetBackGroundColor())
-        else:
+            chidren = ctrl.GetChildren()
+            if len(children) > 0:
+                ctrl.GetChildren()[0].SetBackGroundColour(\
+                                                self.GetBackGroundColour())
+        else:
+            if not ctrl.IsEnabled():
+                ctrl.Enable(True)
             ctrl.Show(enable)
             
@@ -180 +187 @@
         else:
             self._set_textctrl_color(item, self.GetBackgroundColour())
-        text = item.GetLabel().strip()
+        text = item.GetValue().strip()
         self._check_newname(text)
     
@@ -190 +197 @@
         msg = ''
         if name == None:
-            text = self.data_namectr.GetLabel().strip()
+            text = self.data_namectr.GetValue().strip()
         else:
             text = name
@@ -210 +217 @@
         """
         if ON_MAC:
-            ctrl.GetChildren()[0].SetBackgroundColour(color)  
+            chidren = ctrl.GetChildren()
+            if len(children) > 0:
+                ctrl.GetChildren()[0].SetBackgroundColour(color)  
         else:
             ctrl.SetBackgroundColour(color)  
@@ -228 +237 @@
 
         item = event.GetEventObject()
-        text = item.GetLabel().strip()
+        text = item.GetValue().strip()
         try:
             val = float(text)
@@ -287 +296 @@
         self.send_warnings('')
         item = event.GetEventObject()
-        text = item.GetLabel().strip().lower()
+        text = item.GetValue().strip().lower()
         self._show_numctrl(self.numberctr, text=='number')
         
@@ -316 +325 @@
             self.output.name = str(self.data_namectr.GetValue())
         self.draw_output(self.output)
-    
+        
     def put_text_pic(self, pic=None, content=''):  
         """
@@ -350 +359 @@
             try:
                 float(data2)
-                if self.operator_cbox.GetLabel().strip() == '|':
+                if self.operator_cbox.GetValue().strip() == '|':
                     msg = "DataOperation: This operation can not accept "
                     msg += "a float number."
@@ -466 +475 @@
         pos_pre1 = self.data1_cbox.GetCurrentSelection()
         pos_pre2 = self.data2_cbox.GetCurrentSelection()
-        current1 = self.data1_cbox.GetLabel()
-        current2 = self.data2_cbox.GetLabel()
+        current1 = self.data1_cbox.GetValue()
+        current2 = self.data2_cbox.GetValue()
         if pos_pre1 < 0:
             pos_pre1 = 0