Changeset 294efd5 in sasview

Timestamp:

Oct 15, 2011 3:12:42 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:

9d52bcb

Parents:

ab638a3

Message:

reverting the temp commits

File:

• sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (3 diffs)

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

@@ -171 +171 @@
         """
         # It was found that wx >= 2.9.3 sends an event even if no size changed.
-        # So manually record the size (=x_size) and compare here.
-        print "x", self.x_size, self.GetSize()
+        # So manually recode the size (=x_size) and compare here.
         if self.x_size != None:
             if self.x_size == self.GetSize():
@@ -178 +177 @@
                 self.canvas.set_resizing(self.resizing)
                 return
-        #self.x_size = self.GetSize()
-        
+        self.x_size = self.GetSize()
+
         # Ready for another event
         # Do not remove this Skip. Otherwise it will get runtime error on wx>=2.9.
@@ -188 +187 @@
         self.parent.set_schedule(True)
         pos_x, pos_y = self.GetPositionTuple()
-        client_size = self.GetClientSize()
         if pos_x != 0 and pos_y != 0:
-            self.size, y_size = self.GetClientSizeTuple()
-            x_size = self.size
-        else:
-            tw, th = self.toolbar.GetSizeTuple()
-            x_size, y_size = self.GetClientSizeTuple()
-            self.canvas.SetSize(wx.Size(x_size, th+y_size))
-        #print "client", self.size,y_size, self.GetClientSize()
+            self.size, _ = self.GetClientSizeTuple()
         
     def set_resizing(self, resizing=False):