diff options
| -rw-r--r-- | src/main/python/shapes/shapes.py | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/main/python/shapes/shapes.py b/src/main/python/shapes/shapes.py index 0cf651e..9f7113c 100644 --- a/src/main/python/shapes/shapes.py +++ b/src/main/python/shapes/shapes.py @@ -6,9 +6,15 @@ 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() @@ -226,7 +232,11 @@ 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): @@ -298,14 +308,22 @@ 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 | @@ -317,9 +335,12 @@ class NodeItem(QGraphicsSvgItem): 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 |