From f0a2c4501a136fa23890380e82551e44d9465707 Mon Sep 17 00:00:00 2001
From: Blaine
Date: Wed, 3 Jun 2020 13:01:39 +0530
Subject: conflict resolution

---
 src/main/python/shapes/shapes.py | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'src/main/python/shapes/shapes.py')

diff --git a/src/main/python/shapes/shapes.py b/src/main/python/shapes/shapes.py
index 3cb1e14..e79ddb7 100644
--- a/src/main/python/shapes/shapes.py
+++ b/src/main/python/shapes/shapes.py
@@ -1,14 +1,18 @@
-# from fbs_runtime.application_context.PyQt5 import ApplicationContext
 from PyQt5 import QtCore, QtWidgets
+from PyQt5.QtCore import (QEvent, QFile, QIODevice, QMimeData, QPointF, QRect,
+                          QRectF, QSizeF, Qt)
+from PyQt5.QtGui import (QBrush, QColor, QCursor, QDrag, QFont, QImage,
+                         QPainter, QPainterPath, QPen, QTransform)
 from PyQt5.QtSvg import QGraphicsSvgItem, QSvgRenderer
-from PyQt5.QtWidgets import QLineEdit, QGraphicsItem, QGraphicsEllipseItem, QGraphicsProxyWidget, QGraphicsPathItem, \
-    QGraphicsSceneHoverEvent, QGraphicsColorizeEffect
-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
+from PyQt5.QtWidgets import (QGraphicsColorizeEffect, QGraphicsEllipseItem,
+                             QGraphicsItem, QGraphicsPathItem,
+                             QGraphicsProxyWidget, QGraphicsSceneHoverEvent,
+                             QLineEdit)
 
-from .line import Line
 from utils.app import fileImporter
 
+from .line import Line
+
 
 class GripItem(QGraphicsPathItem):
     """
@@ -27,21 +31,6 @@ class GripItem(QGraphicsPathItem):
         self.setAcceptHoverEvents(True)
         self.setCursor(QCursor(Qt.PointingHandCursor))
 
-    # def hoverEnterEvent(self, event):
-    #     """
-    #     defines shape highlighting on Mouse Over
-    #     """
-    #     self.setPen(QPen(QColor("black"), 2))
-    #     self.setBrush(QColor("red"))
-    #     super(GripItem, self).hoverEnterEvent(event)
-    #
-    # def hoverLeaveEvent(self, event):
-    #     """
-    #     defines shape highlighting on Mouse Leave
-    #     """
-    #     self.setPen(QPen(Qt.transparent))
-    #     self.setBrush(Qt.transparent)
-    #     super(GripItem, self).hoverLeaveEvent(event)
 
     def mouseReleaseEvent(self, event):
         """
-- 
cgit