[Qt] Explicitly pass index of clicked item to bboxDrawn instead of relying on selectionModel()->currentIndex()

Author: manisandro

qt/src/hocr/DisplayerToolHOCR.cc

@@ -70,24 +70,25 @@ void DisplayerToolHOCR::mouseReleaseEvent(QMouseEvent* event) {
 			clearSelection();
 		} else {
 			QRect r = m_selection->rect().translated(-m_displayer->getSceneBoundingRect().toRect().topLeft()).toRect();
-			emit bboxDrawn(r, m_currentAction);
+			emit bboxDrawn(r, m_currentAction, m_currentIndex);
 		}
 		event->accept();
 	} else {
 		QPoint p = m_displayer->mapToSceneClamped(event->pos()).toPoint();
 		emit positionPicked(p);
 	}
-	setAction(ACTION_NONE, false);
+	setAction(ACTION_NONE, QModelIndex(), false);
 }
 
-void DisplayerToolHOCR::setAction(Action action, bool clearSel) {
+void DisplayerToolHOCR::setAction(Action action, QModelIndex index, bool clearSel) {
 	if (action != m_currentAction) {
 		emit actionChanged(action);
 	}
 	if (clearSel) {
 		clearSelection();
 	}
 	m_currentAction = action;
+	m_currentIndex = index;
 	if (m_currentAction >= ACTION_DRAW_GRAPHIC_RECT && m_currentAction <= ACTION_DRAW_WORD_RECT) {
 		m_displayer->setCursor(Qt::CrossCursor);
 	} else {
@@ -96,7 +97,7 @@ void DisplayerToolHOCR::setAction(Action action, bool clearSel) {
 }
 
 void DisplayerToolHOCR::setSelection(const QRect& rect, const QRect& minRect) {
-	setAction(ACTION_NONE, false);
+	setAction(ACTION_NONE, QModelIndex(), false);
 	QRect r = rect.translated(m_displayer->getSceneBoundingRect().toRect().topLeft());
 	QRect mr = minRect.translated(m_displayer->getSceneBoundingRect().toRect().topLeft());
 	if (!m_selection) {

qt/src/hocr/DisplayerToolHOCR.hh

@@ -20,6 +20,8 @@
 #ifndef DISPLAYERTOOLHOCR_HH
 #define DISPLAYERTOOLHOCR_HH
 
+#include <QModelIndex>
+
 #include "Displayer.hh"
 
 class DisplayerToolHOCR : public DisplayerTool {
@@ -42,28 +44,29 @@ public:
 		reset();
 	}
 	void reset() override {
-		setAction(ACTION_NONE, true);
+		setAction(ACTION_NONE, QModelIndex(), true);
 	}
 
 	void mousePressEvent(QMouseEvent* event) override;
 	void mouseMoveEvent(QMouseEvent* event) override;
 	void mouseReleaseEvent(QMouseEvent* event) override;
 
-	void setAction(Action action, bool clearSel = true);
+	void setAction(Action action, QModelIndex index, bool clearSel = true);
 	void setSelection(const QRect& rect, const QRect& minRect);
 	QImage getSelection(const QRect& rect) const;
 	void clearSelection();
 
 signals:
 	void displayedSourceChanged();
-	void bboxDrawn(QRect rect, int action);
+	void bboxDrawn(QRect rect, int action, QModelIndex index);
 	void bboxChanged(QRect rect);
 	void positionPicked(QPoint pos);
 	void actionChanged(int action);
 
 private:
 	DisplayerSelection* m_selection = nullptr;
 	Action m_currentAction = ACTION_NONE;
+	QModelIndex m_currentIndex;
 	bool m_pressed = false;
 
 private slots:

qt/src/hocr/OutputEditorHOCR.cc

@@ -540,7 +540,7 @@ int OutputEditorHOCR::currentPage() {
 }
 
 void OutputEditorHOCR::showItemProperties(const QModelIndex& index, const QModelIndex& prev) {
-	m_tool->setAction(DisplayerToolHOCR::ACTION_NONE);
+	m_tool->setAction(DisplayerToolHOCR::ACTION_NONE, QModelIndex());
 	const HOCRItem* prevItem = m_document->itemAtIndex(prev);
 	ui.tableWidgetProperties->setRowCount(0);
 	ui.plainTextEditOutput->setPlainText("");
@@ -685,10 +685,9 @@ void OutputEditorHOCR::itemAttributeChanged(const QModelIndex& itemIndex, const
 	}
 }
 
-void OutputEditorHOCR::bboxDrawn(const QRect& bbox, int action) {
+void OutputEditorHOCR::bboxDrawn(const QRect& bbox, int action, QModelIndex index) {
 	QDomDocument doc;
-	QModelIndex current = ui.treeViewHOCR->selectionModel()->currentIndex();
-	const HOCRItem* currentItem = m_document->itemAtIndex(current);
+	const HOCRItem* currentItem = m_document->itemAtIndex(index);
 	if (!currentItem) {
 		return;
 	}
@@ -746,7 +745,7 @@ void OutputEditorHOCR::bboxDrawn(const QRect& bbox, int action) {
 	} else {
 		return;
 	}
-	QModelIndex newIndex = m_document->addItem(current, newElement);
+	QModelIndex newIndex = m_document->addItem(index, newElement);
 	if (newIndex.isValid()) {
 		ui.treeViewHOCR->selectionModel()->setCurrentIndex(newIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
 	}
@@ -864,21 +863,21 @@ void OutputEditorHOCR::showTreeWidgetContextMenu(const QPoint& point) {
 		return;
 	}
 	if (clickedAction == actionAddGraphic) {
-		m_tool->setAction(DisplayerToolHOCR::ACTION_DRAW_GRAPHIC_RECT);
+		m_tool->setAction(DisplayerToolHOCR::ACTION_DRAW_GRAPHIC_RECT, index);
 	} else if (clickedAction == actionAddCArea) {
-		m_tool->setAction(DisplayerToolHOCR::ACTION_DRAW_CAREA_RECT);
+		m_tool->setAction(DisplayerToolHOCR::ACTION_DRAW_CAREA_RECT, index);
 	} else if (clickedAction == actionAddPar) {
-		m_tool->setAction(DisplayerToolHOCR::ACTION_DRAW_PAR_RECT);
+		m_tool->setAction(DisplayerToolHOCR::ACTION_DRAW_PAR_RECT, index);
 	} else if (clickedAction == actionAddLine) {
-		m_tool->setAction(DisplayerToolHOCR::ACTION_DRAW_LINE_RECT);
+		m_tool->setAction(DisplayerToolHOCR::ACTION_DRAW_LINE_RECT, index);
 	} else if (clickedAction == actionAddWord) {
-		m_tool->setAction(DisplayerToolHOCR::ACTION_DRAW_WORD_RECT);
+		m_tool->setAction(DisplayerToolHOCR::ACTION_DRAW_WORD_RECT, index);
 	} else if (clickedAction == actionSplit) {
 		QModelIndex newIndex = m_document->splitItem(index.parent(), index.row(), index.row());
 		ui.treeViewHOCR->selectionModel()->setCurrentIndex(newIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
 		expandCollapseChildren(newIndex, true);
 	} else if (clickedAction == actionRemove) {
-		m_document->removeItem(ui.treeViewHOCR->selectionModel()->currentIndex());
+		m_document->removeItem(index);
 	} else if (clickedAction == actionExpand) {
 		expandCollapseChildren(index, true);
 	} else if (clickedAction == actionCollapse) {

qt/src/hocr/OutputEditorHOCR.hh

@@ -108,7 +108,7 @@ private:
 	void drawPreview(QPainter& painter, const HOCRItem* item);
 
 private slots:
-	void bboxDrawn(const QRect& bbox, int action);
+	void bboxDrawn(const QRect& bbox, int action, QModelIndex index);
 	void addPage(const QString& hocrText, HOCRReadSessionData data);
 	void expandItemClass() {
 		expandCollapseItemClass(true);