eric: comparison eric6/Graphics/AssociationItem.py

-:87f521f359d5
+:6ba3564b7161
 """
 Module implementing a graphics item for an association between two items.
 """
+import enum
 from PyQt5.QtCore import QPointF, QRectF, QLineF
 from PyQt5.QtWidgets import QGraphicsItem
 from E5Graphics.E5ArrowItem import E5ArrowItem, E5ArrowType
 import Utilities
-# TODO: convert to Enum
+class AssociationType(enum.Enum):
-Normal = 0
+"""
-Generalisation = 1
+Class defining the association types.
-Imports = 2
+"""
+NORMAL = 0
-# TODO: convert to Enum
+GENERALISATION = 1
-NoRegion = 0
+IMPORTS = 2
-West = 1
-North = 2
-East = 3
+class AssociationPointRegion(enum.Enum):
-South = 4
+"""
-NorthWest = 5
+Class defining the regions for an association end point.
-NorthEast = 6
+"""
-SouthEast = 7
+NO_REGION = 0
-SouthWest = 8
+WEST = 1
-Center = 9
+NORTH = 2
+EAST = 3
+SOUTH = 4
+NORTH_WEST = 5
+NORTH_EAST = 6
+SOUTH_EAST = 7
+SOUTH_WEST = 8
+CENTER = 9
 class AssociationItem(E5ArrowItem):
 """
 Class implementing a graphics item for an association between two items.
 The association is drawn as an arrow starting at the first items and
 ending at the second.
 """
-def __init__(self, itemA, itemB, assocType=Normal, topToBottom=False,
+def __init__(self, itemA, itemB, assocType=AssociationType.NORMAL,
-colors=None, parent=None):
+topToBottom=False, colors=None, parent=None):
 """
 Constructor
 @param itemA first widget of the association
+@type UMLItem
 @param itemB second widget of the association
-@param assocType type of the association. This must be one of
+@type UMLItem
-<ul>
+@param assocType type of the association
-<li>Normal (default)</li>
+@type AssociationType
-<li>Generalisation</li>
-<li>Imports</li>
-</ul>
 @param topToBottom flag indicating to draw the association
 from item A top to item B bottom
 @type bool
 @param colors tuple containing the foreground and background colors
 @type tuple of (QColor, QColor)
 @param parent reference to the parent object
 @type QGraphicsItem
 """
-if assocType in (Normal, Imports):
+if assocType in (AssociationType.NORMAL, AssociationType.IMPORTS):
 arrowType = E5ArrowType.NORMAL
 arrowFilled = True
-elif assocType == Generalisation:
+elif assocType == AssociationType.GENERALISATION:
 arrowType = E5ArrowType.WIDE
 arrowFilled = False
 E5ArrowItem.__init__(self, QPointF(0, 0), QPointF(100, 100),
 arrowFilled, arrowType, colors, parent)
 self.itemA = itemA
 self.itemB = itemB
 self.assocType = assocType
 self.topToBottom = topToBottom
-self.regionA = NoRegion
+self.regionA = AssociationPointRegion.NO_REGION
-self.regionB = NoRegion
+self.regionB = AssociationPointRegion.NO_REGION
 self.calculateEndingPoints()
 self.itemA.addAssociation(self)
 self.itemB.addAssociation(self)
 # find itemA region
 rc = QRectF(xA, yA, rectA.width(), rectA.height())
 self.regionA = self.__findPointRegion(rc, xB, yB)
 # move some regions to the standard ones
-if self.regionA == NorthWest:
+if self.regionA == AssociationPointRegion.NORTH_WEST:
-self.regionA = North
+self.regionA = AssociationPointRegion.NORTH
-elif self.regionA == NorthEast:
+elif self.regionA == AssociationPointRegion.NORTH_EAST:
-self.regionA = East
+self.regionA = AssociationPointRegion.EAST
-elif self.regionA == SouthEast:
+elif self.regionA == AssociationPointRegion.SOUTH_EAST:
-self.regionA = South
+self.regionA = AssociationPointRegion.SOUTH
-elif self.regionA in (SouthWest, Center):
+elif self.regionA in (
-self.regionA = West
+AssociationPointRegion.SOUTH_WEST,
+AssociationPointRegion.CENTER
+):
+self.regionA = AssociationPointRegion.WEST
 self.__updateEndPoint(self.regionA, True)
 # now do the same for itemB
 rc = QRectF(xB, yB, rectB.width(), rectB.height())
 self.regionB = self.__findPointRegion(rc, xA, yA)
 # move some regions to the standard ones
-if self.regionB == NorthWest:
+if self.regionB == AssociationPointRegion.NORTH_WEST:
-self.regionB = North
+self.regionB = AssociationPointRegion.NORTH
-elif self.regionB == NorthEast:
+elif self.regionB == AssociationPointRegion.NORTH_EAST:
-self.regionB = East
+self.regionB = AssociationPointRegion.EAST
-elif self.regionB == SouthEast:
+elif self.regionB == AssociationPointRegion.SOUTH_EAST:
-self.regionB = South
+self.regionB = AssociationPointRegion.SOUTH
-elif self.regionB in (SouthWest, Center):
+elif self.regionB in (
-self.regionB = West
+AssociationPointRegion.SOUTH_WEST,
+AssociationPointRegion.CENTER
+):
+self.regionB = AssociationPointRegion.WEST
 self.__updateEndPoint(self.regionB, False)
 def __findPointRegion(self, rect, posX, posY):
 """
 b2 = x + w / 2.0 - y * slope2
 eval1 = slope1 * posY + b1
 eval2 = slope2 * posY + b2
-result = NoRegion
+result = AssociationPointRegion.NO_REGION
 # inside region 1
 if eval1 > posX and eval2 > posX:
-result = West
+result = AssociationPointRegion.WEST
 #inside region 2
 elif eval1 > posX and eval2 < posX:
-result = North
+result = AssociationPointRegion.NORTH
 # inside region 3
 elif eval1 < posX and eval2 < posX:
-result = East
+result = AssociationPointRegion.EAST
 # inside region 4
 elif eval1 < posX and eval2 > posX:
-result = South
+result = AssociationPointRegion.SOUTH
 # inside region 5
 elif eval1 == posX and eval2 < posX:
-result = NorthWest
+result = AssociationPointRegion.NORTH_WEST
 # inside region 6
 elif eval1 < posX and eval2 == posX:
-result = NorthEast
+result = AssociationPointRegion.NORTH_EAST
 # inside region 7
 elif eval1 == posX and eval2 > posX:
-result = SouthEast
+result = AssociationPointRegion.SOUTH_EAST
 # inside region 8
 elif eval1 > posX and eval2 == posX:
-result = SouthWest
+result = AssociationPointRegion.SOUTH_WEST
 # inside region 9
 elif eval1 == posX and eval2 == posX:
-result = Center
+result = AssociationPointRegion.CENTER
 return result
 def __updateEndPoint(self, region, isWidgetA):
 """
 Private method to update an endpoint.
 @param region the region for the endpoint (integer)
 @param isWidgetA flag indicating update for itemA is done (boolean)
 """
-if region == NoRegion:
+if region == AssociationPointRegion.NO_REGION:
 return
 rect = (
 self.__mapRectFromItem(self.itemA)
 if isWidgetA else
 ww = rect.width()
 wh = rect.height()
 ch = wh / 2.0
 cw = ww / 2.0
-if region == West:
+if region == AssociationPointRegion.WEST:
 px = x
 py = y + ch
-elif region == North:
+elif region == AssociationPointRegion.NORTH:
 px = x + cw
 py = y
-elif region == East:
+elif region == AssociationPointRegion.EAST:
 px = x + ww
 py = y + ch
-elif region in (South, Center):
+elif region in (
+AssociationPointRegion.SOUTH,
+AssociationPointRegion.CENTER
+):
 px = x + cw
 py = y + wh
 if isWidgetA:
 self.setStartPoint(px, py)
 @return persistence data (string)
 """
 entries = [
 "src={0}".format(self.itemA.getId()),
 "dst={0}".format(self.itemB.getId()),
-"type={0}".format(self.assocType),
+"type={0}".format(self.assocType.value),
 "topToBottom={0}".format(self.topToBottom)
 ]
 return ", ".join(entries)
 @classmethod
 the association type and a flag indicating to associate from top
 to bottom (integer, integer, integer, boolean)
 """
 src = -1
 dst = -1
-assocType = Normal
+assocType = AssociationType.NORMAL
 topToBottom = False
 for entry in data.split(", "):
 if "=" in entry:
 key, value = entry.split("=", 1)
 if key == "src":
 src = int(value)
 elif key == "dst":
 dst = int(value)
 elif key == "type":
-assocType = int(value)
+assocType = AssociationType(int(value))
 elif key == "topToBottom":
 topToBottom = Utilities.toBool(value)
 return src, dst, assocType, topToBottom

Mercurial Repositories > eric / file comparison

comparison: eric6/Graphics/AssociationItem.py

eric6/Graphics/AssociationItem.py