diff -r 9e623311630d -r fc69ad77e18a Graphics/SvgDiagram.py
--- a/Graphics/SvgDiagram.py Thu Jan 10 19:15:10 2013 +0100
+++ b/Graphics/SvgDiagram.py Sat Jan 12 18:44:39 2013 +0100
@@ -9,12 +9,11 @@
from PyQt4.QtCore import Qt, QSize, QEvent
from PyQt4.QtGui import QPalette, QSizePolicy, QScrollArea, QAction, QMenu, QToolBar, \
- QDialog, QPrinter, QPrintDialog, QPainter, QFont, QColor
+ QPrinter, QPrintDialog, QPainter, QFont, QColor
from PyQt4.QtSvg import QSvgWidget
from E5Gui.E5MainWindow import E5MainWindow
-
-from .ZoomDialog import ZoomDialog
+from E5Gui.E5ZoomWidget import E5ZoomWidget
import UI.Config
@@ -25,6 +24,15 @@
"""
Class implementing a dialog showing a SVG graphic.
"""
+ ZoomLevels = [
+ 1, 3, 5, 7, 9,
+ 10, 20, 30, 50, 67, 80, 90,
+ 100,
+ 110, 120, 133, 150, 170, 200, 240, 300, 400,
+ 500, 600, 700, 800, 900, 1000,
+ ]
+ ZoomLevelDefault = 100
+
def __init__(self, svgFile, parent=None, name=None):
"""
Constructor
@@ -52,6 +60,14 @@
self.setCentralWidget(self.svgView)
+ self.__zoomWidget = E5ZoomWidget(UI.PixmapCache.getPixmap("zoomOut.png"),
+ UI.PixmapCache.getPixmap("zoomIn.png"),
+ UI.PixmapCache.getPixmap("zoomReset.png"), self)
+ self.statusBar().addPermanentWidget(self.__zoomWidget)
+ self.__zoomWidget.setMapping(
+ SvgDiagram.ZoomLevels, SvgDiagram.ZoomLevelDefault)
+ self.__zoomWidget.valueChanged.connect(self.__doZoom)
+
# polish up the dialog
self.resize(QSize(800, 600).expandedTo(self.minimumSizeHint()))
@@ -85,26 +101,6 @@
self.trUtf8("Print Preview"), self)
self.printPreviewAct.triggered[()].connect(self.__printPreviewDiagram)
- self.zoomInAct = \
- QAction(UI.PixmapCache.getIcon("zoomIn.png"),
- self.trUtf8("Zoom in"), self)
- self.zoomInAct.triggered[()].connect(self.__zoomIn)
-
- self.zoomOutAct = \
- QAction(UI.PixmapCache.getIcon("zoomOut.png"),
- self.trUtf8("Zoom out"), self)
- self.zoomOutAct.triggered[()].connect(self.__zoomOut)
-
- self.zoomAct = \
- QAction(UI.PixmapCache.getIcon("zoomTo.png"),
- self.trUtf8("Zoom..."), self)
- self.zoomAct.triggered[()].connect(self.__zoom)
-
- self.zoomResetAct = \
- QAction(UI.PixmapCache.getIcon("zoomReset.png"),
- self.trUtf8("Zoom reset"), self)
- self.zoomResetAct.triggered[()].connect(self.__zoomReset)
-
def __initContextMenu(self):
"""
Private method to initialize the context menu.
@@ -114,11 +110,6 @@
self.__menu.addSeparator()
self.__menu.addAction(self.printPreviewAct)
self.__menu.addAction(self.printAct)
- self.__menu.addSeparator()
- self.__menu.addAction(self.zoomInAct)
- self.__menu.addAction(self.zoomOutAct)
- self.__menu.addAction(self.zoomAct)
- self.__menu.addAction(self.zoomResetAct)
self.setContextMenuPolicy(Qt.CustomContextMenu)
self.customContextMenuRequested.connect(self.__showContextMenu)
@@ -143,11 +134,6 @@
self.graphicsToolBar.setIconSize(UI.Config.ToolBarIconSize)
self.graphicsToolBar.addAction(self.printPreviewAct)
self.graphicsToolBar.addAction(self.printAct)
- self.graphicsToolBar.addSeparator()
- self.graphicsToolBar.addAction(self.zoomInAct)
- self.graphicsToolBar.addAction(self.zoomOutAct)
- self.graphicsToolBar.addAction(self.zoomAct)
- self.graphicsToolBar.addAction(self.zoomResetAct)
self.addToolBar(Qt.TopToolBarArea, self.windowToolBar)
self.addToolBar(Qt.TopToolBarArea, self.graphicsToolBar)
@@ -198,9 +184,9 @@
pinch = evt.gesture(Qt.PinchGesture)
if pinch:
if pinch.state() == Qt.GestureStarted:
- pinch.setScaleFactor(self.zoom)
+ pinch.setScaleFactor(self.__zoom() / 100)
else:
- self.__doZoom(pinch.scaleFactor() / self.zoom)
+ self.__doZoom(int(pinch.scaleFactor() * 100))
evt.accept()
############################################################################
@@ -217,46 +203,66 @@
scrollBar.setValue(int(factor * scrollBar.value()
+ ((factor - 1) * scrollBar.pageStep() / 2)))
- def __doZoom(self, factor):
+ def __levelForZoom(self, zoom):
"""
- Private method to perform the zooming.
+ Private method determining the zoom level index given a zoom factor.
- @param factor zoom factor (float)
+ @param zoom zoom factor (integer)
+ @return index of zoom factor (integer)
"""
- self.zoom *= factor
- self.svgWidget.resize(self.zoom * self.svgWidget.sizeHint())
+ try:
+ index = SvgDiagram.ZoomLevels.index(zoom)
+ except ValueError:
+ for index in range(len(SvgDiagram.ZoomLevels)):
+ if zoom <= SvgDiagram.ZoomLevels[index]:
+ break
+ return index
+
+ def __doZoom(self, value):
+ """
+ Public method to set the zoom value in percent.
- self.__adjustScrollBar(self.svgView.horizontalScrollBar(), factor)
- self.__adjustScrollBar(self.svgView.verticalScrollBar(), factor)
+ @param value zoom value in percent (integer)
+ """
+ oldValue = self.__zoom()
+ if value != oldValue:
+ self.svgWidget.resize(value / 100 * self.svgWidget.sizeHint())
+
+ factor = value / oldValue
+ self.__adjustScrollBar(self.svgView.horizontalScrollBar(), factor)
+ self.__adjustScrollBar(self.svgView.verticalScrollBar(), factor)
+
+ self.__zoomWidget.setValue(value)
def __zoomIn(self):
"""
- Private method to handle the zoom in context menu entry.
+ Private method to zoom into the SVG.
"""
- self.__doZoom(1.25)
+ index = self.__levelForZoom(self.__zoom())
+ if index < len(SvgDiagram.ZoomLevels) - 1:
+ self.__doZoom(SvgDiagram.ZoomLevels[index + 1])
def __zoomOut(self):
"""
- Private method to handle the zoom out context menu entry.
+ Private method to zoom out of the SVG.
"""
- self.__doZoom(0.8)
+ index = self.__levelForZoom(self.__zoom())
+ if index > 0:
+ self.__doZoom(SvgDiagram.ZoomLevels[index - 1])
def __zoomReset(self):
"""
- Private method to handle the reset zoom context menu entry.
+ Private method to reset the zoom value.
"""
- self.zoom = 1.0
- self.svgWidget.adjustSize()
+ self.__doZoom(SvgDiagram.ZoomLevels[SvgDiagram.ZoomLevelDefault])
def __zoom(self):
"""
- Private method to handle the zoom context menu action.
+ Public method to get the current zoom factor in percent.
+
+ @return current zoom factor in percent (integer)
"""
- dlg = ZoomDialog(self.zoom, self)
- if dlg.exec_() == QDialog.Accepted:
- zoom = dlg.getZoomSize()
- factor = zoom / self.zoom
- self.__doZoom(factor)
+ return int(self.svgWidget.width() / self.svgWidget.sizeHint().width() * 100.0)
def __printDiagram(self):
"""
