Changeset 30ccad1 in sasview

Timestamp:

Sep 29, 2011 12:17:08 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:

67cf696

Parents:

62258ee

Message:

fixed plot symbol custom size dialog: had errors on cancel and invalid values

Location:

sansguiframe/src/sans/guiframe

Files:

• gui_manager.py (modified) (4 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -160 +160 @@
 IS_WIN = True
 CLOSE_SHOW = True
+TIME_FACTOR = 5
 if sys.platform.count("win32")==0:
     IS_WIN = False
+    TIME_FACTOR = 5
     if int(wx.__version__.split('.')[0]) == 2:
         if int(wx.__version__.split('.')[1]) < 9:
@@ -273 +275 @@
         self._idle_count = 0
         self.schedule_full_draw_list = []
-        self.idletimer = wx.CallLater(1, self._onDrawIdle)
+        self.idletimer = wx.CallLater(TIME_FACTOR, self._onDrawIdle)
         
         self.batch_frame = GridFrame(parent=self)
@@ -1524 +1526 @@
         self.on_set_plot_focus(self.panels[panel_id])
         self.show_panel(evt.GetId(), 'on')      
-        wx.CallLater(5, self.set_schedule(True))
+        wx.CallLater(5*TIME_FACTOR, self.set_schedule(True))
         self.set_plot_unfocus()
         
@@ -2927 +2929 @@
         """
         # restart idle   
-        self.idletimer.Restart(55, *args, **kwargs)
+        self.idletimer.Restart(55*TIME_FACTOR, *args, **kwargs)
 
         

sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -559 +559 @@
             sizedial = SizeDialog(None, -1, 'Change Marker Size')
             if sizedial.ShowModal() == wx.ID_OK:
-                label = sizedial.getText()
+                try:
+                    label = sizedial.getText()
+                    selected_plot.markersize = int(label)
+                    self._check_zoom_plot()
+                except:
+                    msg = 'Symbol Size: Got an invalid Value.'
+                    wx.PostEvent( self.parent, 
+                          StatusEvent(status= msg, info='error'))
             sizedial.Destroy()
 
-        selected_plot.markersize = int(label)
-        self._check_zoom_plot()
-        #self._onEVT_FUNC_PROPERTY()
-        ## Set the view scale for all plots
-        
-        ## render the graph
-        #self.graph.render(self)
-        #self.subplot.figure.canvas.draw_idle()