diff --git a/PPOCRLabel/PPOCRLabel.py b/PPOCRLabel/PPOCRLabel.py index dd9d7701095bf396621ca26a8128064ef9cb2fe9..8cc4d837166c835183fdfea30c03a6edcf4a751d 100644 --- a/PPOCRLabel/PPOCRLabel.py +++ b/PPOCRLabel/PPOCRLabel.py @@ -885,16 +885,15 @@ class MainWindow(QMainWindow, WindowMixin): self.updateComboBox() def updateBoxlist(self): + self.canvas.selectedShapes_hShape = [] if self.canvas.hShape != None: - for shape in self.canvas.selectedShapes + [self.canvas.hShape]: - item = self.shapesToItemsbox[shape] # listitem - text = [(int(p.x()), int(p.y())) for p in shape.points] - item.setText(str(text)) + self.canvas.selectedShapes_hShape = self.canvas.selectedShapes + [self.canvas.hShape] else: - for shape in self.canvas.selectedShapes: - item = self.shapesToItemsbox[shape] # listitem - text = [(int(p.x()), int(p.y())) for p in shape.points] - item.setText(str(text)) + self.canvas.selectedShapes_hShape = self.canvas.selectedShapes + for shape in self.canvas.selectedShapes_hShape: + item = self.shapesToItemsbox[shape] # listitem + text = [(int(p.x()), int(p.y())) for p in shape.points] + item.setText(str(text)) self.actions.undo.setEnabled(True) self.setDirty() diff --git a/PPOCRLabel/libs/canvas.py b/PPOCRLabel/libs/canvas.py index dbbcca70ffdbafe7613ea8ed6499990660955257..c3b7d43971190fa8ecc59f5cf58e2c9c7af1ee49 100644 --- a/PPOCRLabel/libs/canvas.py +++ b/PPOCRLabel/libs/canvas.py @@ -23,6 +23,7 @@ except ImportError: from libs.shape import Shape from libs.utils import distance +import copy CURSOR_DEFAULT = Qt.ArrowCursor CURSOR_POINT = Qt.PointingHandCursor @@ -81,6 +82,7 @@ class Canvas(QWidget): self.fourpoint = True # ADD self.pointnum = 0 self.movingShape = False + self.selectCountShape = False #initialisation for panning self.pan_initial_pos = QPoint() @@ -702,6 +704,10 @@ class Canvas(QWidget): def keyPressEvent(self, ev): key = ev.key() + shapesBackup = [] + shapesBackup = copy.deepcopy(self.shapes) + self.shapesBackups.pop() + self.shapesBackups.append(shapesBackup) if key == Qt.Key_Escape and self.current: print('ESC press') self.current = None @@ -720,6 +726,8 @@ class Canvas(QWidget): def moveOnePixel(self, direction): # print(self.selectedShape.points) + self.selectCount = len(self.selectedShapes) + self.selectCountShape = True for i in range(len(self.selectedShapes)): self.selectedShape = self.selectedShapes[i] if direction == 'Left' and not self.moveOutOfBound(QPointF(-1.0, 0)): @@ -746,6 +754,9 @@ class Canvas(QWidget): self.selectedShape.points[1] += QPointF(0, 1.0) self.selectedShape.points[2] += QPointF(0, 1.0) self.selectedShape.points[3] += QPointF(0, 1.0) + shapesBackup = [] + shapesBackup = copy.deepcopy(self.shapes) + self.shapesBackups.append(shapesBackup) self.shapeMoved.emit() self.repaint() @@ -842,6 +853,10 @@ class Canvas(QWidget): def restoreShape(self): if not self.isShapeRestorable: return + if self.selectCountShape: + if len(self.shapesBackups) > 2: + for i in range(1,self.selectCount): + self.shapesBackups.pop() self.shapesBackups.pop() # latest shapesBackup = self.shapesBackups.pop() self.shapes = shapesBackup