diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/Graphics/UMLGraphicsView.py
--- a/src/eric7/Graphics/UMLGraphicsView.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Graphics/UMLGraphicsView.py Wed Jul 13 14:55:47 2022 +0200
@@ -9,9 +9,7 @@
import pathlib
-from PyQt6.QtCore import (
- pyqtSignal, Qt, QSignalMapper, QEvent, QRectF, QMarginsF
-)
+from PyQt6.QtCore import pyqtSignal, Qt, QSignalMapper, QEvent, QRectF, QMarginsF
from PyQt6.QtGui import QAction, QPageLayout
from PyQt6.QtWidgets import QGraphicsView, QToolBar, QDialog
from PyQt6.QtPrintSupport import QPrinter, QPrintDialog
@@ -32,16 +30,17 @@
class UMLGraphicsView(EricGraphicsView):
"""
Class implementing a specialized EricGraphicsView for our diagrams.
-
+
@signal relayout() emitted to indicate a relayout of the diagram
is requested
"""
+
relayout = pyqtSignal()
-
+
def __init__(self, scene, parent=None):
"""
Constructor
-
+
@param scene reference to the scene object
@type QGraphicsScene
@param parent parent widget of the view
@@ -49,31 +48,33 @@
"""
EricGraphicsView.__init__(self, scene, parent)
self.setObjectName("UMLGraphicsView")
- self.setViewportUpdateMode(
- QGraphicsView.ViewportUpdateMode.FullViewportUpdate)
-
+ self.setViewportUpdateMode(QGraphicsView.ViewportUpdateMode.FullViewportUpdate)
+
self.diagramName = "Unnamed"
self.__itemId = -1
-
+
self.border = 10
self.deltaSize = 100.0
-
+
self.__zoomWidget = EricZoomWidget(
UI.PixmapCache.getPixmap("zoomOut"),
UI.PixmapCache.getPixmap("zoomIn"),
- UI.PixmapCache.getPixmap("zoomReset"), self)
+ UI.PixmapCache.getPixmap("zoomReset"),
+ self,
+ )
parent.statusBar().addPermanentWidget(self.__zoomWidget)
self.__zoomWidget.setMapping(
- EricGraphicsView.ZoomLevels, EricGraphicsView.ZoomLevelDefault)
+ EricGraphicsView.ZoomLevels, EricGraphicsView.ZoomLevelDefault
+ )
self.__zoomWidget.valueChanged.connect(self.setZoom)
self.zoomValueChanged.connect(self.__zoomWidget.setValue)
-
+
self.__initActions()
-
+
scene.changed.connect(self.__sceneChanged)
-
+
self.grabGesture(Qt.GestureType.PinchGesture)
-
+
def __initActions(self):
"""
Private method to initialize the view actions.
@@ -84,107 +85,105 @@
except AttributeError:
# pre Qt 5.15
self.alignMapper.mapped[int].connect(self.__alignShapes)
-
+
self.deleteShapeAct = QAction(
- UI.PixmapCache.getIcon("deleteShape"),
- self.tr("Delete shapes"), self)
+ UI.PixmapCache.getIcon("deleteShape"), self.tr("Delete shapes"), self
+ )
self.deleteShapeAct.triggered.connect(self.__deleteShape)
-
+
self.incWidthAct = QAction(
UI.PixmapCache.getIcon("sceneWidthInc"),
- self.tr("Increase width by {0} points").format(
- self.deltaSize),
- self)
+ self.tr("Increase width by {0} points").format(self.deltaSize),
+ self,
+ )
self.incWidthAct.triggered.connect(self.__incWidth)
-
+
self.incHeightAct = QAction(
UI.PixmapCache.getIcon("sceneHeightInc"),
- self.tr("Increase height by {0} points").format(
- self.deltaSize),
- self)
+ self.tr("Increase height by {0} points").format(self.deltaSize),
+ self,
+ )
self.incHeightAct.triggered.connect(self.__incHeight)
-
+
self.decWidthAct = QAction(
UI.PixmapCache.getIcon("sceneWidthDec"),
- self.tr("Decrease width by {0} points").format(
- self.deltaSize),
- self)
+ self.tr("Decrease width by {0} points").format(self.deltaSize),
+ self,
+ )
self.decWidthAct.triggered.connect(self.__decWidth)
-
+
self.decHeightAct = QAction(
UI.PixmapCache.getIcon("sceneHeightDec"),
- self.tr("Decrease height by {0} points").format(
- self.deltaSize),
- self)
+ self.tr("Decrease height by {0} points").format(self.deltaSize),
+ self,
+ )
self.decHeightAct.triggered.connect(self.__decHeight)
-
+
self.setSizeAct = QAction(
- UI.PixmapCache.getIcon("sceneSize"),
- self.tr("Set size"), self)
+ UI.PixmapCache.getIcon("sceneSize"), self.tr("Set size"), self
+ )
self.setSizeAct.triggered.connect(self.__setSize)
-
+
self.rescanAct = QAction(
- UI.PixmapCache.getIcon("rescan"),
- self.tr("Re-Scan"), self)
+ UI.PixmapCache.getIcon("rescan"), self.tr("Re-Scan"), self
+ )
self.rescanAct.triggered.connect(self.__rescan)
-
+
self.relayoutAct = QAction(
- UI.PixmapCache.getIcon("relayout"),
- self.tr("Re-Layout"), self)
+ UI.PixmapCache.getIcon("relayout"), self.tr("Re-Layout"), self
+ )
self.relayoutAct.triggered.connect(self.__relayout)
-
+
self.alignLeftAct = QAction(
- UI.PixmapCache.getIcon("shapesAlignLeft"),
- self.tr("Align Left"), self)
- self.alignMapper.setMapping(
- self.alignLeftAct, Qt.AlignmentFlag.AlignLeft)
+ UI.PixmapCache.getIcon("shapesAlignLeft"), self.tr("Align Left"), self
+ )
+ 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.AlignmentFlag.AlignHCenter)
+ self.tr("Align Center Horizontal"),
+ self,
+ )
+ 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.AlignmentFlag.AlignRight)
+ UI.PixmapCache.getIcon("shapesAlignRight"), self.tr("Align Right"), self
+ )
+ 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.AlignmentFlag.AlignTop)
+ UI.PixmapCache.getIcon("shapesAlignTop"), self.tr("Align Top"), self
+ )
+ 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.AlignmentFlag.AlignVCenter)
+ self.tr("Align Center Vertical"),
+ self,
+ )
+ 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.AlignmentFlag.AlignBottom)
+ UI.PixmapCache.getIcon("shapesAlignBottom"), self.tr("Align Bottom"), self
+ )
+ self.alignMapper.setMapping(self.alignBottomAct, Qt.AlignmentFlag.AlignBottom)
self.alignBottomAct.triggered.connect(self.alignMapper.map)
-
+
def setLayoutActionsEnabled(self, enable):
"""
Public method to enable or disable the layout related actions.
-
+
@param enable flag indicating the desired enable state
@type bool
"""
self.rescanAct.setEnabled(enable)
self.relayoutAct.setEnabled(enable)
-
+
def __checkSizeActions(self):
"""
Private slot to set the enabled state of the size actions.
@@ -199,11 +198,11 @@
self.decHeightAct.setEnabled(False)
else:
self.decHeightAct.setEnabled(True)
-
+
def __sceneChanged(self, areas):
"""
Private slot called when the scene changes.
-
+
@param areas list of rectangles that contain changes
@type list of QRectF
"""
@@ -211,7 +210,7 @@
self.deleteShapeAct.setEnabled(True)
else:
self.deleteShapeAct.setEnabled(False)
-
+
sceneRect = self.scene().sceneRect()
newWidth = width = sceneRect.width()
newHeight = height = sceneRect.height()
@@ -221,15 +220,15 @@
newWidth = rect.right() + 10
if sceneRect.bottom() - 10 < rect.bottom():
newHeight = rect.bottom() + 10
-
+
if newHeight != height or newWidth != width:
self.setSceneSize(newWidth, newHeight)
self.__checkSizeActions()
-
+
def initToolBar(self):
"""
Public method to populate a toolbar with our actions.
-
+
@return the populated toolBar
@rtype QToolBar
"""
@@ -252,13 +251,13 @@
toolBar.addSeparator()
toolBar.addAction(self.rescanAct)
toolBar.addAction(self.relayoutAct)
-
+
return toolBar
-
+
def filteredItems(self, items, itemType=UMLItem):
"""
Public method to filter a list of items.
-
+
@param items list of items as returned by the scene object
@type QGraphicsItem
@param itemType type to be filtered
@@ -267,32 +266,32 @@
@rtype QGraphicsItem
"""
return [itm for itm in items if isinstance(itm, itemType)]
-
+
def selectItems(self, items):
"""
Public method to select the given items.
-
+
@param items list of items to be selected
@type list of QGraphicsItemItem
"""
# step 1: deselect all items
self.unselectItems()
-
+
# step 2: select all given items
for itm in items:
if isinstance(itm, UMLItem):
itm.setSelected(True)
-
+
def selectItem(self, item):
"""
Public method to select an item.
-
+
@param item item to be selected
@type QGraphicsItemItem
"""
if isinstance(item, UMLItem):
item.setSelected(not item.isSelected())
-
+
def __deleteShape(self):
"""
Private method to delete the selected shapes from the display.
@@ -302,60 +301,62 @@
item.setSelected(False)
self.scene().removeItem(item)
del item
-
+
def __incWidth(self):
"""
Private method to handle the increase width context menu entry.
"""
self.resizeScene(self.deltaSize, True)
self.__checkSizeActions()
-
+
def __incHeight(self):
"""
Private method to handle the increase height context menu entry.
"""
self.resizeScene(self.deltaSize, False)
self.__checkSizeActions()
-
+
def __decWidth(self):
"""
Private method to handle the decrease width context menu entry.
"""
self.resizeScene(-self.deltaSize, True)
self.__checkSizeActions()
-
+
def __decHeight(self):
"""
Private method to handle the decrease height context menu entry.
"""
self.resizeScene(-self.deltaSize, False)
self.__checkSizeActions()
-
+
def __setSize(self):
"""
Private method to handle the set size context menu entry.
"""
from .UMLSceneSizeDialog import UMLSceneSizeDialog
+
rect = self._getDiagramRect(10)
sceneRect = self.scene().sceneRect()
- dlg = UMLSceneSizeDialog(sceneRect.width(), sceneRect.height(),
- rect.width(), rect.height(), self)
+ dlg = UMLSceneSizeDialog(
+ sceneRect.width(), sceneRect.height(), rect.width(), rect.height(), self
+ )
if dlg.exec() == QDialog.DialogCode.Accepted:
width, height = dlg.getData()
self.setSceneSize(width, height)
self.__checkSizeActions()
-
+
def autoAdjustSceneSize(self, limit=False):
"""
Public method to adjust the scene size to the diagram size.
-
+
@param limit flag indicating to limit the scene to the
initial size
@type bool
"""
super().autoAdjustSceneSize(limit=limit)
self.__checkSizeActions()
-
+
def saveImage(self):
"""
Public method to handle the save context menu entry.
@@ -364,10 +365,12 @@
self,
self.tr("Save Diagram"),
"",
- self.tr("Portable Network Graphics (*.png);;"
- "Scalable Vector Graphics (*.svg)"),
+ self.tr(
+ "Portable Network Graphics (*.png);;" "Scalable Vector Graphics (*.svg)"
+ ),
"",
- EricFileDialog.DontConfirmOverwrite)
+ EricFileDialog.DontConfirmOverwrite,
+ )
if fname:
fpath = pathlib.Path(fname)
if not fpath.suffix:
@@ -378,22 +381,24 @@
res = EricMessageBox.yesNo(
self,
self.tr("Save Diagram"),
- self.tr("<p>The file <b>{0}</b> already exists."
- " Overwrite it?</p>").format(fpath),
- icon=EricMessageBox.Warning)
+ self.tr(
+ "<p>The file <b>{0}</b> already exists." " Overwrite it?</p>"
+ ).format(fpath),
+ icon=EricMessageBox.Warning,
+ )
if not res:
return
-
- success = super().saveImage(
- str(fpath), fpath.suffix.upper())
+
+ success = super().saveImage(str(fpath), fpath.suffix.upper())
if not success:
EricMessageBox.critical(
self,
self.tr("Save Diagram"),
self.tr(
- """<p>The file <b>{0}</b> could not be saved.</p>""")
- .format(fpath))
-
+ """<p>The file <b>{0}</b> could not be saved.</p>"""
+ ).format(fpath),
+ )
+
def __relayout(self):
"""
Private slot to handle the re-layout context menu entry.
@@ -401,7 +406,7 @@
self.__itemId = -1
self.scene().clear()
self.relayout.emit()
-
+
def __rescan(self):
"""
Private slot to handle the re-scan context menu entry.
@@ -415,12 +420,12 @@
itemPositions[name] = (item.x(), item.y())
if item.isSelected():
selectedItems.append(name)
-
+
# 2. save
-
+
# 2. re-layout the diagram
self.__relayout()
-
+
# 3. move known items to the saved positions
for item in self.filteredItems(self.scene().items(), UMLItem):
name = item.getName()
@@ -428,7 +433,7 @@
item.setPos(*itemPositions[name])
if name in selectedItems:
item.setSelected(True)
-
+
def printDiagram(self):
"""
Public slot called to print the diagram.
@@ -443,28 +448,29 @@
printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
else:
printer.setPageOrder(QPrinter.PageOrder.LastPageFirst)
- printer.setPageMargins(QMarginsF(
- Preferences.getPrinter("LeftMargin") * 10,
- Preferences.getPrinter("TopMargin") * 10,
- Preferences.getPrinter("RightMargin") * 10,
- Preferences.getPrinter("BottomMargin") * 10),
- QPageLayout.Unit.Millimeter
+ printer.setPageMargins(
+ QMarginsF(
+ Preferences.getPrinter("LeftMargin") * 10,
+ Preferences.getPrinter("TopMargin") * 10,
+ Preferences.getPrinter("RightMargin") * 10,
+ Preferences.getPrinter("BottomMargin") * 10,
+ ),
+ QPageLayout.Unit.Millimeter,
)
printerName = Preferences.getPrinter("PrinterName")
if printerName:
printer.setPrinterName(printerName)
-
+
printDialog = QPrintDialog(printer, self)
if printDialog.exec():
- super().printDiagram(
- printer, self.diagramName)
-
+ super().printDiagram(printer, self.diagramName)
+
def printPreviewDiagram(self):
"""
Public slot called to show a print preview of the diagram.
"""
from PyQt6.QtPrintSupport import QPrintPreviewDialog
-
+
printer = QPrinter(mode=QPrinter.PrinterMode.PrinterResolution)
printer.setFullPage(True)
if Preferences.getPrinter("ColorMode"):
@@ -475,43 +481,45 @@
printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
else:
printer.setPageOrder(QPrinter.PageOrder.LastPageFirst)
- printer.setPageMargins(QMarginsF(
- Preferences.getPrinter("LeftMargin") * 10,
- Preferences.getPrinter("TopMargin") * 10,
- Preferences.getPrinter("RightMargin") * 10,
- Preferences.getPrinter("BottomMargin") * 10),
- QPageLayout.Unit.Millimeter
+ printer.setPageMargins(
+ QMarginsF(
+ Preferences.getPrinter("LeftMargin") * 10,
+ Preferences.getPrinter("TopMargin") * 10,
+ Preferences.getPrinter("RightMargin") * 10,
+ Preferences.getPrinter("BottomMargin") * 10,
+ ),
+ QPageLayout.Unit.Millimeter,
)
printerName = Preferences.getPrinter("PrinterName")
if printerName:
printer.setPrinterName(printerName)
-
+
preview = QPrintPreviewDialog(printer, self)
preview.paintRequested[QPrinter].connect(self.__printPreviewPrint)
preview.exec()
-
+
def __printPreviewPrint(self, printer):
"""
Private slot to generate a print preview.
-
+
@param printer reference to the printer object
@type QPrinter
"""
super().printDiagram(printer, self.diagramName)
-
+
def setDiagramName(self, name):
"""
Public slot to set the diagram name.
-
+
@param name diagram name
@type str
"""
self.diagramName = name
-
+
def __alignShapes(self, alignment):
"""
Private slot to align the selected shapes.
-
+
@param alignment alignment type
@type Qt.AlignmentFlag
"""
@@ -519,7 +527,7 @@
items = self.scene().selectedItems()
if len(items) <= 1:
return
-
+
# step 2: find the index of the item to align in relation to
amount = None
for i, item in enumerate(items):
@@ -550,7 +558,7 @@
amount = rect.height()
index = i
rect = items[index].sceneBoundingRect()
-
+
# step 3: move the other items
for i, item in enumerate(items):
if i == index:
@@ -560,35 +568,29 @@
if alignment == Qt.AlignmentFlag.AlignLeft:
xOffset = rect.x() - itemrect.x()
elif alignment == Qt.AlignmentFlag.AlignRight:
- xOffset = (
- (rect.x() + rect.width()) -
- (itemrect.x() + itemrect.width())
- )
+ xOffset = (rect.x() + rect.width()) - (itemrect.x() + itemrect.width())
elif alignment == Qt.AlignmentFlag.AlignHCenter:
- xOffset = (
- (rect.x() + rect.width() // 2) -
- (itemrect.x() + itemrect.width() // 2)
+ xOffset = (rect.x() + rect.width() // 2) - (
+ itemrect.x() + itemrect.width() // 2
)
elif alignment == Qt.AlignmentFlag.AlignTop:
yOffset = rect.y() - itemrect.y()
elif alignment == Qt.AlignmentFlag.AlignBottom:
- yOffset = (
- (rect.y() + rect.height()) -
- (itemrect.y() + itemrect.height())
+ yOffset = (rect.y() + rect.height()) - (
+ itemrect.y() + itemrect.height()
)
elif alignment == Qt.AlignmentFlag.AlignVCenter:
- yOffset = (
- (rect.y() + rect.height() // 2) -
- (itemrect.y() + itemrect.height() // 2)
+ yOffset = (rect.y() + rect.height() // 2) - (
+ itemrect.y() + itemrect.height() // 2
)
item.moveBy(xOffset, yOffset)
-
+
self.scene().update()
-
+
def __itemsBoundingRect(self, items):
"""
Private method to calculate the bounding rectangle of the given items.
-
+
@param items list of items to operate on
@type list of UMLItem
@return bounding rectangle
@@ -606,17 +608,16 @@
top = min(rect.top(), top)
bottom = max(rect.bottom(), bottom)
return QRectF(left, top, right - left, bottom - top)
-
+
def keyPressEvent(self, evt):
"""
Protected method handling key press events.
-
+
@param evt reference to the key event
@type QKeyEvent
"""
key = evt.key()
- if key in [Qt.Key.Key_Up, Qt.Key.Key_Down, Qt.Key.Key_Left,
- Qt.Key.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.KeyboardModifier.ControlModifier:
@@ -639,13 +640,13 @@
item.moveBy(dx, dy)
evt.accept()
return
-
+
super().keyPressEvent(evt)
-
+
def wheelEvent(self, evt):
"""
Protected method to handle wheel events.
-
+
@param evt reference to the wheel event
@type QWheelEvent
"""
@@ -657,13 +658,13 @@
self.zoomIn()
evt.accept()
return
-
+
super().wheelEvent(evt)
-
+
def event(self, evt):
"""
Public method handling events.
-
+
@param evt reference to the event
@type QEvent
@return flag indicating, if the event was handled
@@ -672,13 +673,13 @@
if evt.type() == QEvent.Type.Gesture:
self.gestureEvent(evt)
return True
-
+
return super().event(evt)
-
+
def gestureEvent(self, evt):
"""
Protected method handling gesture events.
-
+
@param evt reference to the gesture event
@type QGestureEvent
"""
@@ -689,11 +690,11 @@
elif pinch.state() == Qt.GestureState.GestureUpdated:
self.setZoom(int(pinch.totalScaleFactor() * 100))
evt.accept()
-
+
def getItemId(self):
"""
Public method to get the ID to be assigned to an item.
-
+
@return item ID
@rtype int
"""
@@ -703,7 +704,7 @@
def findItem(self, itemId):
"""
Public method to find an UML item based on the ID.
-
+
@param itemId of the item to search for
@type int
@return item found or None
@@ -715,13 +716,13 @@
return item
except AttributeError:
continue
-
+
return None
-
+
def findItemByName(self, name):
"""
Public method to find an UML item based on its name.
-
+
@param name name to look for
@type str
@return item found or None
@@ -733,13 +734,13 @@
return item
except AttributeError:
continue
-
+
return None
-
+
def parsePersistenceData(self, version, data):
"""
Public method to parse persisted data.
-
+
@param version version of the data
@type str
@param data persisted data to be parsed
@@ -749,20 +750,20 @@
@rtype int
"""
umlItems = {}
-
+
if not data[0].startswith("diagram_name:"):
return False, 0
self.diagramName = data[0].split(": ", 1)[1].strip()
-
+
from .ClassItem import ClassItem
from .ModuleItem import ModuleItem
from .PackageItem import PackageItem
from .AssociationItem import AssociationItem
-
+
for linenum, line in enumerate(data[1:], start=1):
if not line.startswith(("item:", "association:")):
return False, linenum
-
+
key, value = line.split(": ", 1)
if key == "item":
itemId, x, y, itemType, itemData = value.split(", ", 4)
@@ -772,14 +773,17 @@
y = float(y.split("=", 1)[1].strip())
itemType = itemType.split("=", 1)[1].strip()
if itemType == ClassItem.ItemType:
- itm = ClassItem(x=0, y=0, scene=self.scene(),
- colors=self.getDrawingColors())
+ itm = ClassItem(
+ x=0, y=0, scene=self.scene(), colors=self.getDrawingColors()
+ )
elif itemType == ModuleItem.ItemType:
- itm = ModuleItem(x=0, y=0, scene=self.scene(),
- colors=self.getDrawingColors())
+ itm = ModuleItem(
+ x=0, y=0, scene=self.scene(), colors=self.getDrawingColors()
+ )
elif itemType == PackageItem.ItemType:
- itm = PackageItem(x=0, y=0, scene=self.scene(),
- colors=self.getDrawingColors())
+ itm = PackageItem(
+ x=0, y=0, scene=self.scene(), colors=self.getDrawingColors()
+ )
itm.setPos(x, y)
itm.setId(itemId)
umlItems[itemId] = itm
@@ -788,47 +792,49 @@
except ValueError:
return False, linenum
elif key == "association":
- srcId, dstId, assocType, topToBottom = (
- AssociationItem.parseAssociationItemDataString(
- value.strip())
+ (
+ srcId,
+ dstId,
+ assocType,
+ topToBottom,
+ ) = AssociationItem.parseAssociationItemDataString(value.strip())
+ assoc = AssociationItem(
+ umlItems[srcId], umlItems[dstId], assocType, topToBottom
)
- assoc = AssociationItem(umlItems[srcId], umlItems[dstId],
- assocType, topToBottom)
self.scene().addItem(assoc)
-
+
return True, -1
-
+
def toDict(self):
"""
Public method to collect data to be persisted.
-
+
@return dictionary containing data to be persisted
@rtype dict
"""
items = [
- item.toDict()
- for item in self.filteredItems(self.scene().items(), UMLItem)
+ item.toDict() for item in self.filteredItems(self.scene().items(), UMLItem)
]
-
+
from .AssociationItem import AssociationItem
+
associations = [
assoc.toDict()
- for assoc in self.filteredItems(self.scene().items(),
- AssociationItem)
+ for assoc in self.filteredItems(self.scene().items(), AssociationItem)
]
-
+
data = {
"diagram_name": self.diagramName,
"items": items,
"associations": associations,
}
-
+
return data
-
+
def fromDict(self, version, data):
"""
Public method to populate the class with data persisted by 'toDict()'.
-
+
@param version version of the data
@type str
@param data dictionary containing the persisted data
@@ -841,33 +847,30 @@
from .ModuleItem import ModuleItem
from .PackageItem import PackageItem
from .AssociationItem import AssociationItem
-
+
umlItems = {}
-
+
try:
self.diagramName = data["diagram_name"]
for itemData in data["items"]:
if itemData["type"] == UMLItem.ItemType:
- itm = UMLItem.fromDict(
- itemData, colors=self.getDrawingColors())
+ itm = UMLItem.fromDict(itemData, colors=self.getDrawingColors())
elif itemData["type"] == ClassItem.ItemType:
- itm = ClassItem.fromDict(
- itemData, colors=self.getDrawingColors())
+ itm = ClassItem.fromDict(itemData, colors=self.getDrawingColors())
elif itemData["type"] == ModuleItem.ItemType:
- itm = ModuleItem.fromDict(
- itemData, colors=self.getDrawingColors())
+ itm = ModuleItem.fromDict(itemData, colors=self.getDrawingColors())
elif itemData["type"] == PackageItem.ItemType:
- itm = PackageItem.fromDict(
- itemData, colors=self.getDrawingColors())
+ itm = PackageItem.fromDict(itemData, colors=self.getDrawingColors())
if itm is not None:
umlItems[itm.getId()] = itm
self.scene().addItem(itm)
-
+
for assocData in data["associations"]:
assoc = AssociationItem.fromDict(
- assocData, umlItems, colors=self.getDrawingColors())
+ assocData, umlItems, colors=self.getDrawingColors()
+ )
self.scene().addItem(assoc)
-
+
return True
except KeyError:
return False
