diff -r 50dbe65a1334 -r f00d825fbdb3 eric6/Graphics/SvgDiagram.py
--- a/eric6/Graphics/SvgDiagram.py Sat Sep 21 16:04:17 2019 +0200
+++ b/eric6/Graphics/SvgDiagram.py Sat Sep 21 17:41:22 2019 +0200
@@ -89,19 +89,19 @@
"""
Private method to initialize the view actions.
"""
- self.closeAct = \
- QAction(UI.PixmapCache.getIcon("close.png"),
- self.tr("Close"), self)
+ self.closeAct = QAction(
+ UI.PixmapCache.getIcon("close.png"),
+ self.tr("Close"), self)
self.closeAct.triggered.connect(self.close)
- self.printAct = \
- QAction(UI.PixmapCache.getIcon("print.png"),
- self.tr("Print"), self)
+ self.printAct = QAction(
+ UI.PixmapCache.getIcon("print.png"),
+ self.tr("Print"), self)
self.printAct.triggered.connect(self.__printDiagram)
- self.printPreviewAct = \
- QAction(UI.PixmapCache.getIcon("printPreview.png"),
- self.tr("Print Preview"), self)
+ self.printPreviewAct = QAction(
+ UI.PixmapCache.getIcon("printPreview.png"),
+ self.tr("Print Preview"), self)
self.printPreviewAct.triggered.connect(self.__printPreviewDiagram)
def __initContextMenu(self):
@@ -338,18 +338,26 @@
fm = painter.fontMetrics()
fontHeight = fm.lineSpacing()
marginX = printer.pageRect().x() - printer.paperRect().x()
- marginX = Preferences.getPrinter("LeftMargin") * \
+ marginX = (
+ Preferences.getPrinter("LeftMargin") *
int(printer.resolution() / 2.54) - marginX
+ )
marginY = printer.pageRect().y() - printer.paperRect().y()
- marginY = Preferences.getPrinter("TopMargin") * \
+ marginY = (
+ Preferences.getPrinter("TopMargin") *
int(printer.resolution() / 2.54) - marginY
+ )
- width = printer.width() - marginX - \
- Preferences.getPrinter("RightMargin") * \
+ width = (
+ printer.width() - marginX -
+ Preferences.getPrinter("RightMargin") *
int(printer.resolution() / 2.54)
- height = printer.height() - fontHeight - 4 - marginY - \
- Preferences.getPrinter("BottomMargin") * \
+ )
+ height = (
+ printer.height() - fontHeight - 4 - marginY -
+ Preferences.getPrinter("BottomMargin") *
int(printer.resolution() / 2.54)
+ )
# write a foot note
s = self.tr("Diagram: {0}").format(self.getDiagramName())
