Changeset 0e80658 in sasview

Timestamp:

Nov 9, 2017 2:37:22 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

fca1f50

Parents:

3e8dee3

Message:

Fixed printer and clipboard devices

Location:

src/sas/qtgui/Plotting

Files:

• PlotterBase.py (modified) (2 diffs)
• UnitTesting/PlotterBaseTest.py (modified) (2 diffs)

src/sas/qtgui/Plotting/PlotterBase.py

@@ -307 +307 @@
         painter = QtGui.QPainter(printer)
         # Grab the widget screenshot
-        pmap = QtGui.QPixmap.grabWidget(self)
+        pmap = QtGui.QPixmap(self.size())
+        self.render(pmap)
         # Create a label with pixmap drawn
         printLabel = QtWidgets.QLabel()
@@ -321 +322 @@
         """
         bmp = QtWidgets.QApplication.clipboard()
-        pixmap = QtGui.QPixmap.grabWidget(self.canvas)
+        pixmap = QtGui.QPixmap(self.canvas.size())
+        self.canvas.render(pixmap)
         bmp.setPixmap(pixmap)
 

src/sas/qtgui/Plotting/UnitTesting/PlotterBaseTest.py

@@ -91 +91 @@
         self.assertTrue(self.plotter.toolbar.save_figure.called)
 
-    def notestOnImagePrint(self):
+    def testOnImagePrint(self):
         ''' test the workspace print '''
         QtGui.QPainter.end = MagicMock()
@@ -108 +108 @@
         self.assertTrue(QtWidgets.QLabel.render.called)
 
-    def notestOnClipboardCopy(self):
+    def testOnClipboardCopy(self):
         ''' test the workspace screen copy '''
         QtGui.QClipboard.setPixmap = MagicMock()