Changeset c8654a3 in sasview for calculatorview

Timestamp:

Jun 22, 2012 1:09:26 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:

30bc3045

Parents:

19b9e43

Message:

fixed operator cbox problem on MAC

File:

• calculatorview/src/sans/perspectives/calculator/model_editor.py (modified) (3 diffs)

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

@@ -248 +248 @@
         title = self.name_tcl.GetValue().lstrip().rstrip()
         if title == '':
-            text = self.operator_cbox.GetLabel().strip()
-            if text == '+':
+            text = self.operator
+            if text.count('+') > 0:
                 mname = 'Sum'
-            elif text == '*':
+            else:
                 mname = 'Multi'
-            else:
-                text = '+'
-                mname = 'Sum'
             mname += M_NAME
             title = mname
@@ -381 +378 @@
         if event != None:
             event.Skip()
-            
+        name = ''    
         item = event.GetEventObject()
-        text = item.GetValue().strip()
-        if text == '*':
+        text = item.GetValue()
+        if text.count('*') > 0:
             name = 'Multi'
             factor = 'BackGround'
             f_oper = '+'
-        elif text == '+':
+        else:
             name = 'Sum'
             factor = 'scale_factor'
             f_oper = '*'
-        else:
-            text = '+'
-            name = 'Sum'
-            factor = 'scale_factor'
-            f_oper = '*'
-        self.factor = str(factor)
+
+        self.factor = factor
         self.operator = text
         self.explanation = "  Custom Model = %s %s (model1 %s model2)\n"% \
@@ -430 +423 @@
             description = name1 + self.operator + name2
         name = self.name_tcl.GetValue().lstrip().rstrip()
-        text = self.operator_cbox.GetLabel().strip()
-        if text == '+':
+        text = self.operator_cbox.GetValue()
+        if text.count('+') > 0:
             factor = 'scale_factor'
             f_oper = '*'
             default_val = '1.0'
-        elif text == '*':
+        else:
             factor = 'BackGround'
             f_oper = '+'
             default_val = '0.0'
-        else:
-            text = '+'
-            factor = 'scale_factor'
-            f_oper = '*'
-            default_val = '1.0'
         path = self.fname
         try: