Browse Source

-fixed bug with previous bounding box editing while creating a new one

gapchich 13 years ago
parent
commit
b206be66b5
3 changed files with 13 additions and 1 deletions
  1. 8 1
      ImageHolder.cpp
  2. 1 0
      ImageHolder.h
  3. 4 0
      ImageLabeler.cpp

+ 8 - 1
ImageHolder.cpp

@@ -409,7 +409,14 @@ ImageHolder::clearFocusOnArea()
 {
 	focused_selection_ = -1;
 	focused_selection_type_ = NoFigure;
-	update();
+}
+
+void
+ImageHolder::clearEdition()
+{
+	hovered_point_.figure = NoFigure;
+	hovered_point_.figureID = -1;
+	hovered_point_.pointID = -1;
 }
 
 void

+ 1 - 0
ImageHolder.h

@@ -105,6 +105,7 @@ public slots:
 	void confirmSelection();
 	void focusOnArea(QListWidgetItem *anItem);
 	void clearFocusOnArea();
+	void clearEdition();
 	void undo();
 	void redo();
 

+ 4 - 0
ImageLabeler.cpp

@@ -2601,11 +2601,15 @@ ImageLabeler::keyPressEvent(QKeyEvent *anEvent)
 	//	Qt::NoModifier == anEvent->modifiers() &&
 		-1 != image_holder_->focusedSelection()) {
 		image_holder_->clearFocusOnArea();
+		image_holder_->clearEdition();
+		image_holder_->update();
 	}
 
 	if (Qt::Key_Escape == anEvent->key()) {
 		image_holder_->clearLast();
 		image_holder_->clearFocusOnArea();
+		image_holder_->clearEdition();
+		image_holder_->update();
 	}
 
 	if (Qt::Key_Z == anEvent->key() &&