summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorBlaine2020-06-03 15:29:59 +0530
committerBlaine2020-06-03 15:29:59 +0530
commit01e0a1e191a550ad1cbed717d768a9257d10f462 (patch)
tree837ab700dc8a91a3eb083312eca48b6fe0821fb6 /src/main
parent7ee06d0881716dfe00d395ec25551a83a690722a (diff)
downloadChemical-PFD-01e0a1e191a550ad1cbed717d768a9257d10f462.tar.gz
Chemical-PFD-01e0a1e191a550ad1cbed717d768a9257d10f462.tar.bz2
Chemical-PFD-01e0a1e191a550ad1cbed717d768a9257d10f462.zip
upstream
Diffstat (limited to 'src/main')
-rw-r--r--src/main/python/shapes/shapes.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/main/python/shapes/shapes.py b/src/main/python/shapes/shapes.py
index 5bd68e2..4f2294d 100644
--- a/src/main/python/shapes/shapes.py
+++ b/src/main/python/shapes/shapes.py
@@ -287,16 +287,10 @@ 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