Changeset 7434020 in sasview for plottools/src/danse/common

Timestamp:

Jan 17, 2012 3:07:33 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:

4e65505

Parents:

f706e09c

Message:

Added quickplot on data in datapanel

Location:

plottools/src/danse/common/plottools

Files:

• PlotPanel.py (modified) (4 diffs)
• canvas.py (modified) (1 diff)

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

@@ -21 +21 @@
 from binder import BindArtist
 from matplotlib.font_manager import FontProperties
+
+from mpl_toolkits.mplot3d import Axes3D
+#from matplotlib import cm
+#from matplotlib.ticker import LinearLocator, FixedLocator, FormatStrFormatter
 
 DEBUG = False
@@ -119 +123 @@
         wx.Panel.__init__(self, parent, id=id, **kwargs)
         self.parent = parent
+        self.dimension = 1
         self.gotLegend = 0  #to begin, legend is not picked. 
         self.legend_pos_loc = None
@@ -1427 +1432 @@
         
         """
-        #Re-adjust colorbar
-        self.figure.subplots_adjust(left=0.2, right=.8, bottom=.2)        
         self.data = data
         self.qx_data = qx_data
@@ -1470 +1473 @@
             zmin_temp = self.zmin_2D
         self.cmap = cmap
-        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))
-        
-        #Add color bar and its label
-        #TODO: make the size and location interactive to the image plot.
-        cbax = self.subplot.figure.add_axes([0.84,0.2,0.02,0.7])
-        cb = self.subplot.figure.colorbar(im, cax=cbax)
+        if self.dimension != 3:
+            #Re-adjust colorbar
+            self.subplot.figure.subplots_adjust(left=0.2, right=.8, bottom=.2)
+            
+            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))
+            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()
+            self.subplot.figure.subplots_adjust(left=0.1, right=.8, bottom=.1)  
+            try:
+                # mpl >= 1.0.0
+                ax = self.subplot.figure.gca(projection='3d')
+                #ax.disable_mouse_rotation()
+                cbax = self.subplot.figure.add_axes([0.84,0.1,0.02,0.8])
+            except:
+                # mpl < 1.0.0
+                ax =  Axes3D(self.subplot.figure)
+                cbax = None
+
+            X = self.x_bins[0:-1]
+            Y = self.y_bins[0:-1]
+            X, Y = numpy.meshgrid(X, Y)
+    
+            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()    
+            
+        if cbax == None:
+            cb =self.subplot.figure.colorbar(im, shrink=0.6, aspect=20)
+        else:
+            cb =self.subplot.figure.colorbar(im, cax=cbax)
         cb.update_bruteforce(im)
         cb.set_label(self.scale)
-        self.subplot.figure.canvas.draw_idle()
+        
+        #if self.dimension != 3:
+        self.figure.canvas.draw_idle()
     
     def _build_matrix(self):

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

@@ -250 +250 @@
         
         """
-        if sys.platform == 'linux2':
+        if sys.platform == 'linux2' or self.panel.dimension == 3:
             evt.Skip()
         else: