Changeset 1da574d in sasview for calculatorview

Timestamp:

Jun 25, 2012 5:44:51 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:

21bc81b

Parents:

acc254f

Message:

better flow on dataoperation

File:

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

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

@@ -209 +209 @@
         if self._notes:
             self.send_warnings(msg, 'error')
-        
+        self.name_sizer.Layout()
         self.Refresh()
     
@@ -228 +228 @@
         On selecting Number for Data2
         """
-        if event != None:
-            event.Skip()
         self.send_warnings('')
         if self.numberctr.IsEnabled():
@@ -248 +246 @@
             return
         self.put_text_pic(self.data2_pic, content=str(val)) 
-        self.check_data_inputs()
+        wx.CallAfter(self.check_data_inputs)
         if self.output != None:
             self.output.name = str(self.data_namectr.GetValue())
         self.draw_output(self.output)
-        self.name_sizer.Layout()
+        self.Refresh()
         
     def on_select_data1(self, event=None):
@@ -269 +267 @@
         else:
             self.data1_pic.add_image(data)
-        self.check_data_inputs()
+        wx.CallAfter(self.check_data_inputs)
         if self.output != None:
             self.output.name = str(self.data_namectr.GetValue())
@@ -278 +276 @@
         On Select an Operator
         """
-        if event != None:
-            event.Skip()
         self.send_warnings('')
         item = event.GetEventObject()
         text = item.GetValue().strip()
         self.put_text_pic(self.operator_pic, content=text) 
-        self.check_data_inputs()
+        self.check_data_inputs
         if self.output != None:
             self.output.name = str(self.data_namectr.GetValue())
@@ -293 +289 @@
         On Selecting Data2
         """
-        if event != None:
-            event.Skip()
         self.send_warnings('')
         item = event.GetEventObject()
         text = item.GetValue().strip().lower()
-        pos = item.GetCurrentSelection()
+        self._show_numctrl(self.numberctr, text=='number')
+        
+        pos = item.GetSelection()
         data = item.GetClientData(pos)
-        self._show_numctrl(self.numberctr, text=='number')
         content = "?"
         if not (self.numberctr.IsShown() and self.numberctr.IsEnabled()):
@@ -319 +314 @@
                     data = None
                 item.SetClientData(pos, content)
-                
             self.put_text_pic(self.data2_pic, content)   
-        self.check_data_inputs()
+        wx.CallAfter(self.check_data_inputs)
 
         if self.output != None:
@@ -334 +328 @@
         pic.add_text()
         pic.draw()
-        self.name_sizer.Layout()
                   
     def check_data_inputs(self):
@@ -414 +407 @@
         else:
             out.add_image(output)
-        self.name_sizer.Layout()
+        wx.CallAfter(self.name_sizer.Layout)
+        self.Layout()
         self.Refresh()