--- a/eric6/Graphics/UMLGraphicsView.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Graphics/UMLGraphicsView.py Tue Mar 02 17:17:09 2021 +0100
@@ -44,7 +44,8 @@
"""
E5GraphicsView.__init__(self, scene, parent)
self.setObjectName("UMLGraphicsView")
- self.setViewportUpdateMode(QGraphicsView.FullViewportUpdate)
+ self.setViewportUpdateMode(
+ QGraphicsView.ViewportUpdateMode.FullViewportUpdate)
self.diagramName = "Unnamed"
self.__itemId = -1
@@ -66,7 +67,7 @@
scene.changed.connect(self.__sceneChanged)
- self.grabGesture(Qt.PinchGesture)
+ self.grabGesture(Qt.GestureType.PinchGesture)
def __initActions(self):
"""
@@ -126,37 +127,43 @@
self.alignLeftAct = QAction(
UI.PixmapCache.getIcon("shapesAlignLeft"),
self.tr("Align Left"), self)
- self.alignMapper.setMapping(self.alignLeftAct, Qt.AlignLeft)
+ self.alignMapper.setMapping(
+ self.alignLeftAct, Qt.AlignmentFlag.AlignLeft)
self.alignLeftAct.triggered.connect(self.alignMapper.map)
self.alignHCenterAct = QAction(
UI.PixmapCache.getIcon("shapesAlignHCenter"),
self.tr("Align Center Horizontal"), self)
- self.alignMapper.setMapping(self.alignHCenterAct, Qt.AlignHCenter)
+ self.alignMapper.setMapping(
+ self.alignHCenterAct, Qt.AlignmentFlag.AlignHCenter)
self.alignHCenterAct.triggered.connect(self.alignMapper.map)
self.alignRightAct = QAction(
UI.PixmapCache.getIcon("shapesAlignRight"),
self.tr("Align Right"), self)
- self.alignMapper.setMapping(self.alignRightAct, Qt.AlignRight)
+ self.alignMapper.setMapping(
+ self.alignRightAct, Qt.AlignmentFlag.AlignRight)
self.alignRightAct.triggered.connect(self.alignMapper.map)
self.alignTopAct = QAction(
UI.PixmapCache.getIcon("shapesAlignTop"),
self.tr("Align Top"), self)
- self.alignMapper.setMapping(self.alignTopAct, Qt.AlignTop)
+ self.alignMapper.setMapping(
+ self.alignTopAct, Qt.AlignmentFlag.AlignTop)
self.alignTopAct.triggered.connect(self.alignMapper.map)
self.alignVCenterAct = QAction(
UI.PixmapCache.getIcon("shapesAlignVCenter"),
self.tr("Align Center Vertical"), self)
- self.alignMapper.setMapping(self.alignVCenterAct, Qt.AlignVCenter)
+ self.alignMapper.setMapping(
+ self.alignVCenterAct, Qt.AlignmentFlag.AlignVCenter)
self.alignVCenterAct.triggered.connect(self.alignMapper.map)
self.alignBottomAct = QAction(
UI.PixmapCache.getIcon("shapesAlignBottom"),
self.tr("Align Bottom"), self)
- self.alignMapper.setMapping(self.alignBottomAct, Qt.AlignBottom)
+ self.alignMapper.setMapping(
+ self.alignBottomAct, Qt.AlignmentFlag.AlignBottom)
self.alignBottomAct.triggered.connect(self.alignMapper.map)
def __checkSizeActions(self):
@@ -308,7 +315,7 @@
sceneRect = self.scene().sceneRect()
dlg = UMLSceneSizeDialog(sceneRect.width(), sceneRect.height(),
rect.width(), rect.height(), self)
- if dlg.exec() == QDialog.Accepted:
+ if dlg.exec() == QDialog.DialogCode.Accepted:
width, height = dlg.getData()
self.setSceneSize(width, height)
self.__checkSizeActions()
@@ -400,22 +407,22 @@
"""
Public slot called to print the diagram.
"""
- printer = QPrinter(mode=QPrinter.ScreenResolution)
+ printer = QPrinter(mode=QPrinter.PrinterMode.ScreenResolution)
printer.setFullPage(True)
if Preferences.getPrinter("ColorMode"):
- printer.setColorMode(QPrinter.Color)
+ printer.setColorMode(QPrinter.ColorMode.Color)
else:
- printer.setColorMode(QPrinter.GrayScale)
+ printer.setColorMode(QPrinter.ColorMode.GrayScale)
if Preferences.getPrinter("FirstPageFirst"):
- printer.setPageOrder(QPrinter.FirstPageFirst)
+ printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
else:
- printer.setPageOrder(QPrinter.LastPageFirst)
+ printer.setPageOrder(QPrinter.PageOrder.LastPageFirst)
printer.setPageMargins(
Preferences.getPrinter("LeftMargin") * 10,
Preferences.getPrinter("TopMargin") * 10,
Preferences.getPrinter("RightMargin") * 10,
Preferences.getPrinter("BottomMargin") * 10,
- QPrinter.Millimeter
+ QPrinter.Unit.Millimeter
)
printerName = Preferences.getPrinter("PrinterName")
if printerName:
@@ -432,22 +439,22 @@
"""
from PyQt5.QtPrintSupport import QPrintPreviewDialog
- printer = QPrinter(mode=QPrinter.ScreenResolution)
+ printer = QPrinter(mode=QPrinter.PrinterMode.ScreenResolution)
printer.setFullPage(True)
if Preferences.getPrinter("ColorMode"):
- printer.setColorMode(QPrinter.Color)
+ printer.setColorMode(QPrinter.ColorMode.Color)
else:
- printer.setColorMode(QPrinter.GrayScale)
+ printer.setColorMode(QPrinter.ColorMode.GrayScale)
if Preferences.getPrinter("FirstPageFirst"):
- printer.setPageOrder(QPrinter.FirstPageFirst)
+ printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
else:
- printer.setPageOrder(QPrinter.LastPageFirst)
+ printer.setPageOrder(QPrinter.PageOrder.LastPageFirst)
printer.setPageMargins(
Preferences.getPrinter("LeftMargin") * 10,
Preferences.getPrinter("TopMargin") * 10,
Preferences.getPrinter("RightMargin") * 10,
Preferences.getPrinter("BottomMargin") * 10,
- QPrinter.Millimeter
+ QPrinter.Unit.Millimeter
)
printerName = Preferences.getPrinter("PrinterName")
if printerName:
@@ -488,27 +495,27 @@
amount = None
for i, item in enumerate(items):
rect = item.sceneBoundingRect()
- if alignment == Qt.AlignLeft:
+ if alignment == Qt.AlignmentFlag.AlignLeft:
if amount is None or rect.x() < amount:
amount = rect.x()
index = i
- elif alignment == Qt.AlignRight:
+ elif alignment == Qt.AlignmentFlag.AlignRight:
if amount is None or rect.x() + rect.width() > amount:
amount = rect.x() + rect.width()
index = i
- elif alignment == Qt.AlignHCenter:
+ elif alignment == Qt.AlignmentFlag.AlignHCenter:
if amount is None or rect.width() > amount:
amount = rect.width()
index = i
- elif alignment == Qt.AlignTop:
+ elif alignment == Qt.AlignmentFlag.AlignTop:
if amount is None or rect.y() < amount:
amount = rect.y()
index = i
- elif alignment == Qt.AlignBottom:
+ elif alignment == Qt.AlignmentFlag.AlignBottom:
if amount is None or rect.y() + rect.height() > amount:
amount = rect.y() + rect.height()
index = i
- elif alignment == Qt.AlignVCenter:
+ elif alignment == Qt.AlignmentFlag.AlignVCenter:
if amount is None or rect.height() > amount:
amount = rect.height()
index = i
@@ -520,26 +527,26 @@
continue
itemrect = item.sceneBoundingRect()
xOffset = yOffset = 0
- if alignment == Qt.AlignLeft:
+ if alignment == Qt.AlignmentFlag.AlignLeft:
xOffset = rect.x() - itemrect.x()
- elif alignment == Qt.AlignRight:
+ elif alignment == Qt.AlignmentFlag.AlignRight:
xOffset = (
(rect.x() + rect.width()) -
(itemrect.x() + itemrect.width())
)
- elif alignment == Qt.AlignHCenter:
+ elif alignment == Qt.AlignmentFlag.AlignHCenter:
xOffset = (
(rect.x() + rect.width() // 2) -
(itemrect.x() + itemrect.width() // 2)
)
- elif alignment == Qt.AlignTop:
+ elif alignment == Qt.AlignmentFlag.AlignTop:
yOffset = rect.y() - itemrect.y()
- elif alignment == Qt.AlignBottom:
+ elif alignment == Qt.AlignmentFlag.AlignBottom:
yOffset = (
(rect.y() + rect.height()) -
(itemrect.y() + itemrect.height())
)
- elif alignment == Qt.AlignVCenter:
+ elif alignment == Qt.AlignmentFlag.AlignVCenter:
yOffset = (
(rect.y() + rect.height() // 2) -
(itemrect.y() + itemrect.height() // 2)
@@ -575,20 +582,21 @@
@param evt reference to the key event (QKeyEvent)
"""
key = evt.key()
- if key in [Qt.Key_Up, Qt.Key_Down, Qt.Key_Left, Qt.Key_Right]:
+ if key in [Qt.Key.Key_Up, Qt.Key.Key_Down, Qt.Key.Key_Left,
+ Qt.Key.Key_Right]:
items = self.filteredItems(self.scene().selectedItems())
if items:
- if evt.modifiers() & Qt.ControlModifier:
+ if evt.modifiers() & Qt.KeyboardModifier.ControlModifier:
stepSize = 50
else:
stepSize = 5
- if key == Qt.Key_Up:
+ if key == Qt.Key.Key_Up:
dx = 0
dy = -stepSize
- elif key == Qt.Key_Down:
+ elif key == Qt.Key.Key_Down:
dx = 0
dy = stepSize
- elif key == Qt.Key_Left:
+ elif key == Qt.Key.Key_Left:
dx = -stepSize
dy = 0
else:
@@ -607,7 +615,7 @@
@param evt reference to the wheel event (QWheelEvent)
"""
- if evt.modifiers() & Qt.ControlModifier:
+ if evt.modifiers() & Qt.KeyboardModifier.ControlModifier:
delta = evt.angleDelta().y()
if delta < 0:
self.zoomOut()
@@ -625,7 +633,7 @@
@param evt reference to the event (QEvent)
@return flag indicating, if the event was handled (boolean)
"""
- if evt.type() == QEvent.Gesture:
+ if evt.type() == QEvent.Type.Gesture:
self.gestureEvent(evt)
return True
@@ -637,11 +645,11 @@
@param evt reference to the gesture event (QGestureEvent
"""
- pinch = evt.gesture(Qt.PinchGesture)
+ pinch = evt.gesture(Qt.GestureType.PinchGesture)
if pinch:
- if pinch.state() == Qt.GestureStarted:
+ if pinch.state() == Qt.GestureState.GestureStarted:
pinch.setTotalScaleFactor(self.zoom() / 100.0)
- elif pinch.state() == Qt.GestureUpdated:
+ elif pinch.state() == Qt.GestureState.GestureUpdated:
self.setZoom(int(pinch.totalScaleFactor() * 100))
evt.accept()
