Changeset 848913c in sasview for calculatorview

Timestamp:

Jun 21, 2012 7:33:44 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:

19b9e43

Parents:

f5500b3

Message:

fixing more Mac bugs

Location:

calculatorview/src/sans/perspectives/calculator

Files:

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

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

@@ -100 +100 @@
         self.data1_cbox = wx.ComboBox(self, -1, size=(_BOX_WIDTH, 25), 
                                       style=wx.CB_READONLY)
-        self.operator_cbox = wx.ComboBox(self, -1, size=(50, 25), 
+        self.operator_cbox = wx.ComboBox(self, -1, size=(50, -1), 
                                          style=wx.CB_READONLY)
         operation_tip = "Add: +, Subtract: -, "
@@ -152 +152 @@
             self.numberctr.Show(False)
         else:
-            self.numberctr.Disable()
+            self.numberctr.Enable(False)
         wx.EVT_TEXT_ENTER(self.data_namectr, -1, self.on_name)
         wx.EVT_TEXT_ENTER(self.numberctr, -1, self.on_number) 
@@ -262 +262 @@
         text = item.GetLabel().strip().lower()
         if ON_MAC:
-            self.numberctr.Enable()
+            self.numberctr.Enable(text=='number')
         else:
             self.numberctr.Show(text=='number')
@@ -268 +268 @@
         pos = item.GetSelection()
         data = item.GetClientData(pos)
-        if not self.numberctr.IsShown():
+        content = "?"
+        if not self.numberctr.IsShown() or self.numberctr.Disabled():
             if data == None:
                 content = "?"

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

@@ -381 +381 @@
         item = event.GetEventObject()
         text = item.GetValue().strip()
-        if text == '+':
+        if text == '*':
+            name = 'Multi'
+            factor = 'BackGround'
+            f_oper = '+'
+        elif text == '+':
             name = 'Sum'
             factor = 'scale_factor'
             f_oper = '*'
-        elif text == '*':
-            name = 'Multi'
-            factor = 'BackGround'
-            f_oper = '+'
+        
         else:
-            raise
+            text = '+'
+            name = 'Sum'
+            factor = 'scale_factor'
+            f_oper = '*'
         self.factor = str(factor)
         self.operator = text