changes

2 files changed, 8 insertions, 1 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 5abb6a4..5bd68e2 100644
--- a/src/main/python/shapes/shapes.py
+++ b/src/main/python/shapes/shapes.py
@@ -287,9 +287,16 @@ class NodeItem(QGraphicsSvgItem):
         QGraphicsSvgItem.__init__(self, parent)
         self.m_type = unitOperationType
         self.id = None
+<<<<<<< HEAD
         self.m_renderer = NodeItem.renderer
         # if each svg is seperate file
         # self.m_renderer = QSvgRenderer(fileImporter(f'svg/ellipse.svg'))
+=======
+        # self.m_renderer = QSvgRenderer("svg/" + unitOperationType + ".svg")
+        # self.m_renderer = QSvgRenderer(fileImporter(f'svg/{unitOperationType}.svg'))
+        self.m_renderer = QSvgRenderer(fileImporter(f'svg/ellipse.svg'))
+        # self.m_renderer = QSvgRenderer(resourceManager.get_resource(f'toolbar/{unitOperationType}.svg'))
+>>>>>>> changes
         self.setSharedRenderer(self.m_renderer)
         # set initial size of item
         self.width = 100