Changeset 52e0f2d in sasview

Timestamp:

Jan 24, 2012 4:50:26 PM (12 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:

d2843a9

Parents:

0b705915

Message:

trying to fix the problem in plots on MAC

Files:

• plottools/src/danse/common/plottools/PlotPanel.py (modified) (4 diffs)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/masking.py (modified) (6 diffs)

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

@@ -22 +22 @@
 from matplotlib.font_manager import FontProperties
 
-try:
-    from mpl_toolkits.mplot3d import Axes3D
-except:
-    logging.error("PlotPanel could not import Axes3D")
+from mpl_toolkits.mplot3d import Axes3D
 #from matplotlib import cm
 #from matplotlib.ticker import LinearLocator, FixedLocator, FormatStrFormatter
@@ -138 +135 @@
         #self.SetBackgroundColour(parent.GetBackgroundColour())
         self._resizeflag = True
-        self._SetInitialSize() 
+        self._SetSize() 
         self.subplot = self.figure.add_subplot(111)
         self.figure.subplots_adjust(left=0.2, bottom=.2)
@@ -1428 +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, 
@@ -1526 +1522 @@
         cb.update_bruteforce(im)
         cb.set_label('$' + self.scale + '$')
+        self.figure.canvas.draw_idle()
     
     def _build_matrix(self):

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

@@ -37 +37 @@
 _SCALE = 1e-6
 _STATICBOX_WIDTH = 380
-PANEL_SIZE = 420
+
 #SLD panel size 
 if sys.platform.count("win32") > 0:
+    PANEL_SIZE = 350
     FONT_VARIANT = 0
 else:
+    PANEL_SIZE = 300
     FONT_VARIANT = 1
     
@@ -469 +471 @@
         ##use this method
         #set zmax and zmin to plot: Fix it w/ data.
-        if self.plotpanel.scale == 'log':
-            zmax = math.log(max(self.data.data[self.data.data>0]))
-            zmin = math.log(min(self.data.data[self.data.data>0]))
+        if self.plotpanel.scale == 'log_{10}':
+            zmax = math.log10(max(self.data.data[self.data.data>0]))
+            zmin = math.log10(min(self.data.data[self.data.data>0]))
         else:
             zmax = max(self.data.data[self.data.data>0])
@@ -561 +563 @@
                  data=None, dimension=1, id=ID, *args, **kwds):
         kwds["style"] = wx.DEFAULT_DIALOG_STYLE
-        kwds["size"] = wx.Size(_STATICBOX_WIDTH*1.5, PANEL_SIZE*1.5) 
+        kwds["size"] = wx.Size(PANEL_SIZE*1.5, PANEL_SIZE*1.5) 
         wx.Dialog.__init__(self, parent, id=id,  *args, **kwds)
         
@@ -578 +580 @@
             self.plotpanel = Maskplotpanel(self, -1, dimension,
                                            style=wx.TRANSPARENT_WINDOW)
+            self.plotpanel._SetInitialSize()
             
             self.cmap = DEFAULT_CMAP
@@ -625 +628 @@
             note_txt = wx.StaticText(self, -1, note) 
             note_txt.SetForegroundColour(wx.RED)
-            sizer.Add(note_txt, (0, 2), flag=wx.RIGHT|wx.BOTTOM, border=5)
-        
-        sizer.Add(self.plotpanel, (1, 1), (9, 9), 
+            sizer.Add(note_txt, (0, 2), flag=wx.RIGHT|wx.TOP, border=5)
+        
+        sizer.Add(self.plotpanel, (1, 0), (9, 9), 
                   wx.EXPAND|wx.ALL, 15)
 
@@ -737 +740 @@
         status_type = 'stop'           
         self.graph.render(self)
+        self.subplot.figure.canvas.resizing = False
         if self.dimension < 3:
             self.graph.render(self)
-            self.subplot.figure.canvas.draw_idle()
+            self.subplot.figure.canvas.draw()
+        elif FONT_VARIANT:
+            self.subplot.figure.canvas.draw()
         msg = 'Plotting Completed.'
         self._status_info(msg, status_type)