diff options
| -rw-r--r-- | src/main/python/shapes/line.py | 2 | ||||
| -rw-r--r-- | src/main/python/shapes/shapes.py | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/main/python/shapes/line.py b/src/main/python/shapes/line.py index 2d7eba8..f5eb92a 100644 --- a/src/main/python/shapes/line.py +++ b/src/main/python/shapes/line.py @@ -201,7 +201,7 @@ class Line(QGraphicsPathItem): for i in range(len(self.points) - 1): x1, y1 = self.points[i].x(), self.points[i].y() x2, y2 = self.points[i+1].x(), self.points[i+1].y() - for point in self.commonPaths.sort(key = lambda x: x.x() + x.y(), reverse=x2<x1 or y2<y1): + for point in sorted(self.commonPaths, key = lambda x: x.x() + x.y(), reverse=x2<x1 or y2<y1): x, y = point.x(), point.y() # if not x1 * (y - y2) + x * (y2 - y1) + x2 * (y1 - y) : if x == x1 == x2: diff --git a/src/main/python/shapes/shapes.py b/src/main/python/shapes/shapes.py index 94b9eb1..691a359 100644 --- a/src/main/python/shapes/shapes.py +++ b/src/main/python/shapes/shapes.py @@ -9,11 +9,10 @@ from PyQt5.QtWidgets import (QGraphicsColorizeEffect, QGraphicsEllipseItem, QGraphicsProxyWidget, QGraphicsSceneHoverEvent, QLineEdit) -from utils.app import fileImporter - from .line import Line from utils.app import fileImporter +from utils.app import fileImporter class GripItem(QGraphicsPathItem): """ @@ -213,7 +212,6 @@ class LineGripItem(GripItem): # initialize a line and add on scene startPoint = endPoint = self.parentItem().mapToScene(self.pos()) self.tempLine = Line(startPoint, endPoint) - self.tempLine.setStartGripItem(self) self.scene().addItemPlus(self.tempLine) super().mousePressEvent(mouseEvent) |