diff -r 0a02c433f52d -r 5883ce99ee12 Graphics/SvgDiagram.py --- a/Graphics/SvgDiagram.py Fri Nov 01 15:48:48 2013 +0100 +++ b/Graphics/SvgDiagram.py Sun Nov 03 15:58:22 2013 +0100 @@ -203,8 +203,9 @@ @param scrollBar reference to the scrollbar object (QScrollBar) @param factor factor to adjust by (float) """ - scrollBar.setValue(int(factor * scrollBar.value() - + ((factor - 1) * scrollBar.pageStep() / 2))) + scrollBar.setValue( + int(factor * scrollBar.value() + + ((factor - 1) * scrollBar.pageStep() / 2))) def __levelForZoom(self, zoom): """ @@ -265,7 +266,7 @@ @return current zoom factor in percent (integer) """ - return int(self.svgWidget.width() / + return int(self.svgWidget.width() / self.svgWidget.sizeHint().width() * 100.0) def __printDiagram(self): @@ -282,7 +283,9 @@ printer.setPageOrder(QPrinter.FirstPageFirst) else: printer.setPageOrder(QPrinter.LastPageFirst) - printer.setPrinterName(Preferences.getPrinter("PrinterName")) + printerName = Preferences.getPrinter("PrinterName") + if printerName: + self.setPrinterName(printerName) printDialog = QPrintDialog(printer, self) if printDialog.exec_(): @@ -311,7 +314,9 @@ Preferences.getPrinter("BottomMargin") * 10, QPrinter.Millimeter ) - printer.setPrinterName(Preferences.getPrinter("PrinterName")) + printerName = Preferences.getPrinter("PrinterName") + if printerName: + self.setPrinterName(printerName) preview = QPrintPreviewDialog(printer, self) preview.paintRequested[QPrinter].connect(self.__print)