Changeset 4a4164c in sasview for plottools

Timestamp:

Jan 20, 2012 6:11:03 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:

cdf515f

Parents:

356d2d3

Message:

rotation for only smaller # of pixels

Location:

plottools/src/danse/common/plottools

Files:

• PlotPanel.py (modified) (6 diffs)
• canvas.py (modified) (4 diffs)

plottools/src/danse/common/plottools/PlotPanel.py

@@ -324 +324 @@
         Set the resizing (True/False)
         """
-        pass # Not impleeted
+        pass # Not implemented
     
     def schedule_full_draw(self, func='append'):    
@@ -330 +330 @@
         Put self in schedule to full redraw list
         """
-        pass # Not implemeted
+        pass # Not implemented
     
     def add_toolbar(self):
@@ -1425 +1425 @@
                    cmap=self.cmap, zmin=zmin_2D_temp,
                    zmax=zmax_2D_temp)
+        self.figure.canvas.draw_idle()
       
     def image(self, data, qx_data, qy_data, xmin, xmax, ymin, ymax, 
@@ -1479 +1480 @@
             im = self.subplot.imshow(output, interpolation='nearest', 
                                      origin='lower',
-                                     #vmin=zmin_temp, vmax=self.zmax_2D,
-                                     cmap=self.cmap)#, 
-                                     #extent=(self.xmin_2D, self.xmax_2D,
-                                     #           self.ymin_2D, self.ymax_2D))
+                                     vmin=zmin_temp, vmax=self.zmax_2D,
+                                     cmap=self.cmap, 
+                                     extent=(self.xmin_2D, self.xmax_2D,
+                                                self.ymin_2D, self.ymax_2D))
+            
             cbax = self.subplot.figure.add_axes([0.84,0.2,0.02,0.7])
         else:
             # clear the previous 2D from memory
-            self.subplot.figure.clf()
+            # mpl is not clf, so we do
+            self.subplot.figure.clear()
+
             self.subplot.figure.subplots_adjust(left=0.1, right=.8, bottom=.1)  
             try:
@@ -1501 +1505 @@
             Y = self.y_bins[0:-1]
             X, Y = numpy.meshgrid(X, Y)
-    
+            if len(X) > 60:
+                ax.disable_mouse_rotation()
             im = ax.plot_surface(X, Y, output, rstride=1, cstride=1, cmap=cmap,
                                    linewidth=0, antialiased=False)
             #ax.set_zlim3d(zmin_temp, self.zmax_2D)
             #ax.set_frame_on(False)
-            self.subplot.set_axis_off()    
+            self.subplot.set_axis_off()  
             
         if cbax == None:
@@ -1514 +1519 @@
         cb.update_bruteforce(im)
         cb.set_label('$' + self.scale + '$')
-        
-        #if self.dimension != 3:
-        self.figure.canvas.draw_idle()
     
     def _build_matrix(self):

plottools/src/danse/common/plottools/canvas.py

@@ -130 +130 @@
         self.xaxis = None
         self.yaxis = None
+        self.ndraw = 0
         # Support for mouse wheel
         self.Bind(wx.EVT_MOUSEWHEEL, self._onMouseWheel)
@@ -166 +167 @@
         """
         # Check resize whether or not True
+        if self.panel.dimension == 3:
+            return
+
         # This is for fast response when plot is being resized
         if not self.resizing:
@@ -191 +195 @@
         # Only draw if window is shown, otherwise graph will bleed through
         # on the notebook style AUI widgets.
+        #    raise
         fig = FigureCanvasWxAgg
-        if self.IsShownOnScreen():
+        if self.IsShownOnScreen() and self.ndraw != 1:
             self._isRendered = True
-            #self.panel.parent.refresh_floating(self.panel)
             self._get_axes_switch()
             #import time
@@ -207 +211 @@
         else:
             self._isRendered = False
-   
+        if self.ndraw <= 1:
+            self.ndraw += 1
+        
     def _onMouseWheel(self, evt):
         """Translate mouse wheel events into matplotlib events"""