--- a/Graphics/PixmapDiagram.py Tue Oct 15 22:03:54 2013 +0200 +++ b/Graphics/PixmapDiagram.py Fri Oct 18 23:00:41 2013 +0200 @@ -10,8 +10,9 @@ from __future__ import unicode_literals # __IGNORE_WARNING__ from PyQt4.QtCore import Qt, QSize, QEvent -from PyQt4.QtGui import QLabel, QPalette, QSizePolicy, QScrollArea, QAction, QMenu, \ - QToolBar, QImage, QPixmap, QPrinter, QPrintDialog, QPainter, QFont, QColor +from PyQt4.QtGui import QLabel, QPalette, QSizePolicy, QScrollArea, QAction, \ + QMenu, QToolBar, QImage, QPixmap, QPrinter, QPrintDialog, QPainter, \ + QFont, QColor from E5Gui import E5MessageBox from E5Gui.E5MainWindow import E5MainWindow @@ -53,7 +54,8 @@ self.pixmapLabel = QLabel() self.pixmapLabel.setObjectName("pixmapLabel") self.pixmapLabel.setBackgroundRole(QPalette.Base) - self.pixmapLabel.setSizePolicy(QSizePolicy.Ignored, QSizePolicy.Ignored) + self.pixmapLabel.setSizePolicy( + QSizePolicy.Ignored, QSizePolicy.Ignored) self.pixmapLabel.setScaledContents(True) self.pixmapView = QScrollArea() @@ -63,7 +65,8 @@ self.setCentralWidget(self.pixmapView) - self.__zoomWidget = E5ZoomWidget(UI.PixmapCache.getPixmap("zoomOut.png"), + self.__zoomWidget = E5ZoomWidget( + UI.PixmapCache.getPixmap("zoomOut.png"), UI.PixmapCache.getPixmap("zoomIn.png"), UI.PixmapCache.getPixmap("zoomReset.png"), self) self.statusBar().addPermanentWidget(self.__zoomWidget) @@ -217,9 +220,9 @@ self.__doZoom(int(pinch.scaleFactor() * 100)) evt.accept() - ############################################################################ + ########################################################################### ## Private menu handling methods below. - ############################################################################ + ########################################################################### def __adjustScrollBar(self, scrollBar, factor): """ @@ -254,11 +257,14 @@ """ oldValue = self.__zoom() if value != oldValue: - self.pixmapLabel.resize(value / 100 * self.pixmapLabel.pixmap().size()) + self.pixmapLabel.resize( + value / 100 * self.pixmapLabel.pixmap().size()) factor = value / oldValue - self.__adjustScrollBar(self.pixmapView.horizontalScrollBar(), factor) - self.__adjustScrollBar(self.pixmapView.verticalScrollBar(), factor) + self.__adjustScrollBar( + self.pixmapView.horizontalScrollBar(), factor) + self.__adjustScrollBar( + self.pixmapView.verticalScrollBar(), factor) self.__zoomWidget.setValue(value) @@ -290,7 +296,8 @@ @return current zoom factor in percent (integer) """ - return int(self.pixmapLabel.width() / self.pixmapLabel.pixmap().width() * 100.0) + return int(self.pixmapLabel.width() / + self.pixmapLabel.pixmap().width() * 100.0) def __printDiagram(self): """ @@ -356,18 +363,18 @@ fm = painter.fontMetrics() fontHeight = fm.lineSpacing() marginX = printer.pageRect().x() - printer.paperRect().x() - marginX = \ - Preferences.getPrinter("LeftMargin") * int(printer.resolution() / 2.54) \ - - marginX + marginX = Preferences.getPrinter("LeftMargin") * \ + int(printer.resolution() / 2.54) - marginX marginY = printer.pageRect().y() - printer.paperRect().y() - marginY = \ - Preferences.getPrinter("TopMargin") * int(printer.resolution() / 2.54) \ - - marginY + marginY = Preferences.getPrinter("TopMargin") * \ + int(printer.resolution() / 2.54) - marginY - width = printer.width() - marginX \ - - Preferences.getPrinter("RightMargin") * int(printer.resolution() / 2.54) - height = printer.height() - fontHeight - 4 - marginY \ - - Preferences.getPrinter("BottomMargin") * int(printer.resolution() / 2.54) + width = printer.width() - marginX - \ + Preferences.getPrinter("RightMargin") * \ + int(printer.resolution() / 2.54) + height = printer.height() - fontHeight - 4 - marginY - \ + Preferences.getPrinter("BottomMargin") * \ + int(printer.resolution() / 2.54) # write a foot note s = self.trUtf8("Diagram: {0}").format(self.getDiagramName()) @@ -384,7 +391,8 @@ size = self.pixmapLabel.pixmap().size() size.scale(QSize(width - 10, height - 10), # 5 px inner margin Qt.KeepAspectRatio) - painter.setViewport(marginX + 5, marginY + 5, size.width(), size.height()) + painter.setViewport(marginX + 5, marginY + 5, + size.width(), size.height()) painter.setWindow(self.pixmapLabel.pixmap().rect()) painter.drawPixmap(0, 0, self.pixmapLabel.pixmap()) painter.end()