Changeset f5500b3 in sasview

Timestamp:

Jun 21, 2012 5:59:54 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:

848913c

Parents:

9e00363

Message:

fixing mac bug on panel

Location:

calculatorview/src/sans/perspectives/calculator

Files:

• data_operator.py (modified) (11 diffs)
• model_editor.py (modified) (1 diff)

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

@@ -113 +113 @@
         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), 
+        self.data1_pic = SmallPanel(self, -1, True, 
+                                    size=(_BOX_WIDTH, _BOX_WIDTH), 
                              style=wx.NO_BORDER)
-        self.operator_pic = SmallPanel(self, -1, True, "+", size=(50, _BOX_WIDTH), 
-                             style=wx.NO_BORDER)
-        self.data2_pic = SmallPanel(self, -1, True, size=(_BOX_WIDTH, _BOX_WIDTH), 
+        self.operator_pic = SmallPanel(self, -1, True, 
+                                       '+', size=(50, _BOX_WIDTH), 
+                                       style=wx.NO_BORDER)
+        self.data2_pic = SmallPanel(self, -1, True, 
+                                    size=(_BOX_WIDTH, _BOX_WIDTH), 
                              style=wx.NO_BORDER)
         for ax in self.equal_pic.axes:
@@ -136 +139 @@
                                  (self.operator_pic, 0, wx.LEFT, 3)])
         data2_hori_sizer.AddMany([(self.data2_cbox, 0, wx.LEFT, 0),
-                                       (self.numberctr, 0, wx.LEFT, 0)])
+                                       (self.numberctr, 0, wx.RIGHT, 0)])
         old_data2_sizer.AddMany([(data2_name, 0, wx.LEFT, 3),
                                        (data2_hori_sizer, 0, wx.LEFT, 3),
@@ -146 +149 @@
                                        (old_data2_sizer, 0, wx.TOP, 5)])
         self.data2_cbox.Show(True)
-        self.numberctr.Hide()
+        if not ON_MAC:
+            self.numberctr.Show(False)
+        else:
+            self.numberctr.Disable()
         wx.EVT_TEXT_ENTER(self.data_namectr, -1, self.on_name)
         wx.EVT_TEXT_ENTER(self.numberctr, -1, self.on_number) 
@@ -157 +163 @@
         On data name typing
         """
+        if event != None:
+            event.Skip()
         item = event.GetEventObject()
         item.SetBackgroundColour('white')
@@ -188 +196 @@
         On selecting Number for Data2
         """
+        if event != None:
+            event.Skip()
         self.send_warnings('')
         self.numberctr.SetBackgroundColour('white')
@@ -211 +221 @@
         On select data1
         """
+        if event != None:
+            event.Skip()
         self.send_warnings('')
         item = event.GetEventObject()
@@ -229 +241 @@
         On Select an Operator
         """
+        if event != None:
+            event.Skip()
         self.send_warnings('')
         item = event.GetEventObject()
@@ -242 +256 @@
         On Selecting Data2
         """
+        if event != None:
+            event.Skip()
         self.send_warnings('')
         item = event.GetEventObject()
         text = item.GetLabel().strip().lower()
-        self.numberctr.Show(text=='number')
+        if ON_MAC:
+            self.numberctr.Enable()
+        else:
+            self.numberctr.Show(text=='number')
+        
         pos = item.GetSelection()
         data = item.GetClientData(pos)
@@ -296 +316 @@
             self.output = None
             return flag
-        if self.numberctr.IsShown():
+        if self.numberctr.IsShown() or (ON_MAC and self.numberctr.Enabled()):
             self.numberctr.SetBackgroundColour('white')
             try:
@@ -433 +453 @@
             pos3 = self.data2_cbox.Append("Number")
             val = None
-            if self.numberctr.IsShown():
+            if self.numberctr.IsShown() or \
+                                (ON_MAC and self.numberctr.Enabled()):
                 try:
-                    val = float(self.numberctr.GetLabel())
+                    val = float(self.numberctr.GetValue())
                 except:
                     val = None
@@ -446 +467 @@
         self.data2_cbox.SetSelection(pos2)
         self.data2_cbox.SetClientData(pos2, None)
-        pos3 = self.data2_cbox.Append("Number")
+        pos3 = self.data2_cbox.Append('Number')
         val = None
-        if self.numberctr.IsShown():
+        if self.numberctr.IsShown() or \
+                                (ON_MAC and self.numberctr.Enabled()):
             try:
-                val = float(self.numberctr.GetLabel())
+                val = float(self.numberctr.GetValue())
             except:
                 val = None

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

@@ -380 +380 @@
             
         item = event.GetEventObject()
-        text = item.GetLabel().strip()
+        text = item.GetValue().strip()
         if text == '+':
             name = 'Sum'
             factor = 'scale_factor'
             f_oper = '*'
-        else:
+        elif text == '*':
             name = 'Multi'
             factor = 'BackGround'
             f_oper = '+'
+        else:
+            raise
         self.factor = str(factor)
-        self.operator = str(text)
-        self.explanation = "  custom model = %s %s "% (self.factor, 
-                                                       f_oper)
-        self.explanation += "(model1 %s model2)\n"% self.operator
+        self.operator = text
+        self.explanation = "  Custom Model = %s %s (model1 %s model2)\n"% \
+                    (self.factor, f_oper, self.operator)
         self.explanationctr.SetLabel(self.explanation)
         self.name = name + M_NAME