diff options
| author | Blaine | 2020-06-03 12:59:12 +0530 |
|---|---|---|
| committer | Blaine | 2020-06-03 12:59:12 +0530 |
| commit | b888197a0d57f77383591875baae8136cec2a663 (patch) | |
| tree | c49936bff82aff355bfc453518c29439e7af14a5 /src/main | |
| parent | 7ae4201c7539820108e991ff7df1a710e1387c13 (diff) | |
| download | Chemical-PFD-b888197a0d57f77383591875baae8136cec2a663.tar.gz Chemical-PFD-b888197a0d57f77383591875baae8136cec2a663.tar.bz2 Chemical-PFD-b888197a0d57f77383591875baae8136cec2a663.zip | |
conflict resolution
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/python/shapes/shapes.py | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/src/main/python/shapes/shapes.py b/src/main/python/shapes/shapes.py index 9f7113c..3cb1e14 100644 --- a/src/main/python/shapes/shapes.py +++ b/src/main/python/shapes/shapes.py @@ -6,16 +6,8 @@ from PyQt5.QtWidgets import QLineEdit, QGraphicsItem, QGraphicsEllipseItem, QGra from PyQt5.QtGui import QPen, QColor, QFont, QCursor, QPainterPath, QPainter, QDrag, QBrush, QImage, QTransform from PyQt5.QtCore import Qt, QRectF, QPointF, QSizeF, QEvent, QMimeData, QFile, QIODevice, QRect -<<<<<<< HEAD -from line import Line - - -======= from .line import Line - from utils.app import fileImporter ->>>>>>> merge -# resourceManager = ApplicationContext() class GripItem(QGraphicsPathItem): @@ -232,11 +224,7 @@ class LineGripItem(GripItem): startPoint = endPoint = self.parentItem().mapToScene(self.pos()) self.tempLine = Line(startPoint, endPoint) self.tempLine.setStartGripItem(self) -<<<<<<< HEAD - self.scene().addItem(self.tempLine) -======= self.scene().addItemPlus(self.tempLine) ->>>>>>> merge super().mousePressEvent(mouseEvent) def mouseMoveEvent(self, mouseEvent): @@ -308,22 +296,14 @@ class NodeItem(QGraphicsSvgItem): def __init__(self, unitOperationType, parent=None): QGraphicsSvgItem.__init__(self, parent) self.m_type = unitOperationType -<<<<<<< HEAD - self.m_renderer = QSvgRenderer("svg/" + unitOperationType + ".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')) ->>>>>>> merge # self.m_renderer = QSvgRenderer(resourceManager.get_resource(f'toolbar/{unitOperationType}.svg')) self.setSharedRenderer(self.m_renderer) # set initial size of item self.width = 100 -<<<<<<< HEAD - self.height = 150 -======= self.height = 100 ->>>>>>> merge self.rect = QRectF(-self.width / 2, -self.height / 2, self.width, self.height) # set graphical settings for this item self.setFlags(QGraphicsSvgItem.ItemIsMovable | @@ -334,13 +314,7 @@ class NodeItem(QGraphicsSvgItem): # grip items connected to this item self.lineGripItems = [] self.sizeGripItems = [] - -<<<<<<< HEAD -======= - def advance(self, int): - print (int) - ->>>>>>> merge + def boundingRect(self): """Overrides QGraphicsSvgItem's boundingRect() virtual public function and returns a valid bounding |