Changeset 1170492 in sasview

Timestamp:

Jul 4, 2015 5:18:40 AM (9 years ago)

Author:

butler

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:

be34c71

Parents:

649806d

Message:

2 fixes:
1)Fix the save feature from plot panels — replace canvas.save with new
canvas.save_figure.

2)Fix printing problem .. kindof. Works but a bit ugly.

Location:

src/sas/plottools

Files:

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

src/sas/plottools/PlotPanel.py

@@ -3 +3 @@
 """
 import logging
+import traceback
 import wx
 # Try a normal import first
@@ -862 +863 @@
         Implement save image
         """
-        self.toolbar.save(evt)
+        self.toolbar.save_figure(evt)
 
     def onContextMenu(self, event):
@@ -1986 +1987 @@
     def onPrinterPreview(self, event=None):
         """
+        Matplotlib camvas can no longer print itself.  Thus need to do
+        everything ourselves: need to create a printpreview frame to to
+        see the preview but needs a parent frame object.  Also needs a
+        printout object (just as any printing task).
         """
         try:
-            self.canvas.Printer_Preview(event=event)
-            self.Update()
+            #check if parent is a frame.  If not keep getting the higher
+            #parent till we find a frame
+            _plot = self
+            while not isinstance(_plot, wx.Frame):
+                _plot = _plot.GetParent()
+                assert _plot is not None
+
+            #now create the printpeview object
+            _preview = wx.PrintPreview(PlotPrintout(self,'test'),
+                                       PlotPrintout(self,'test'))
+            #and tie it to a printpreview frame then show it
+            _frame = wx.PreviewFrame(_preview, _plot, "Print Preview", wx.Point(100, 100), wx.Size(600, 650))
+            _frame.Centre(wx.BOTH)
+            _frame.Initialize()
+            _frame.Show(True)
         except:
+            traceback.print_exc()
             pass
 
     def onPrint(self, event=None):
         """
+        Matplotlib canvas can no longer print itself so using wx.Printer.  
+        Need therefore to also define a Printout object.
         """
         try:
-            self.canvas.Printer_Print(event=event)
-            self.Update()
+            _printer = wx.Printer()
+            _printer.Print(self.canvas, PlotPrintout(self,'test'), True)
         except:
+            traceback.print_exc()
             pass
 
@@ -2037 +2059 @@
             self._drawn += 1
         self.gui_repaint(drawDC=wx.PaintDC(self))
+
+class PlotPrintout(wx.Printout):
+    """
+    Create the wx.Printout object for matplotlib figure from the PlotPanel.
+    Provides the required OnPrintPage and HasPage overrides.  Other methods
+    may be added/overriden in the future.
+    :TODO: this needs LOTS of TLC .. but fixes immediate problem
+    """
+    def __init__(self, figure, title, size=None, dpi=None, **kwargs):
+        """
+        Initialize wx.Printout and get passed figure object
+        """
+        wx.Printout.__init__(self)
+        self.figure = figure
+
+    def OnPrintPage(self, page):
+        """
+        Most rudimentry OnPrintPage overide.  instatiates a dc object, gets
+        its size, gets the size of the figure object, scales it to the dc
+        canvas size keeping the aspect ratio intact, then prints as bitmap
+        """
+        _dc = self.GetDC()
+        (_dcX, _dcY) = _dc.GetSizeTuple()
+        (_bmpX,_bmpY) = self.figure.canvas.GetSize()
+        _scale = min(_dcX/_bmpX, _dcY/_bmpY)
+        _dc.SetUserScale(_scale, _scale)
+        _dc.DrawBitmap(self.figure.canvas.bitmap, 0, 0, False,)
+        return True
+
+    def GetPageInfo(self):
+        """
+        just sets the page to 1 - no flexibility for now
+        """
+        return (1, 1, 1, 1)

src/sas/plottools/toolbar.py

@@ -112 +112 @@
         """
         try:
-            self.canvas.Printer_Preview(event=event)
+            self._parent.onPrint(event=event)
         except:
             logging.error("Plot toolbar could not print")