Merge pull request #21 from jonahpearl/hotkeys

Add hotkeys for keypoint suppression and skipping

Author: JARVIS-MoCap

gui/editor/editorwidget.cpp

@@ -166,6 +166,8 @@ EditorWidget::EditorWidget(QWidget *parent) : QWidget(parent) {
 	connect(this, &EditorWidget::frameChanged, keypointWidget, &KeypointWidget::frameChangedSlot);
 	connect(this, &EditorWidget::frameChanged, reprojectionWidget, &ReprojectionWidget::calculateReprojectionSlot);
 	connect(this, &EditorWidget::frameChanged, datasetControlWidget, &DatasetControlWidget::frameChangedSlot);
+	connect(this, &EditorWidget::cmdRPressed, keypointWidget, &KeypointWidget::toggleCurrentKeypointSlot);
+	connect(this, &EditorWidget::cmdEPressed, keypointWidget, &KeypointWidget::advanceCurrentKeypointSlot);
 
 	//<-> Relayed Signals
 	connect(datasetControlWidget, &DatasetControlWidget::datasetLoaded, this, &EditorWidget::newSegmentLoaded);
@@ -456,4 +458,10 @@ void EditorWidget::keyPressEvent(QKeyEvent *e)
 	else if (key == 16777248) {
 			keypointWidget->toggleHideAll();
 		}
+	else if ((key == Qt::Key_R) && (e->modifiers() & Qt::ControlModifier)){
+		emit cmdRPressed();  // will suppress currently selected keypoint
+	}
+	else if ((key == Qt::Key_E) && (e->modifiers() & Qt::ControlModifier)){
+		emit cmdEPressed();  // will skip currently selected keypoint
+	}
 }

gui/editor/editorwidget.hpp

@@ -54,6 +54,8 @@ class EditorWidget : public QWidget {
 		void errorThresholdChanged(float val);
 		void boneLengthErrorThresholdChanged(float val);
 		void brightnessChanged(int brightnessFactor);
+		void cmdRPressed();  // toggle keypoint suppression
+		void cmdEPressed();  // skip keypoint without any action
 
 	public slots:
 		void splitterMovedSlot(int pos, int index);

gui/editor/keypointwidget.cpp

@@ -73,6 +73,7 @@ void KeypointWidget::init() {
 		connect(bodyPartsListWidget, &KeypointListWidget::removeKeypoint, this, &KeypointWidget::removeKeypointSlot);
 		connect(bodyPartsListWidget, &KeypointListWidget::suppressKeypoint, this, &KeypointWidget::suppressKeypointSlot);
 		connect(bodyPartsListWidget, &KeypointListWidget::unsuppressKeypoint, this, &KeypointWidget::unsuppressKeypointSlot);
+		connect(bodyPartsListWidget, &KeypointListWidget::advanceCurrentKeypoint, this, &KeypointWidget::advanceCurrentKeypointSlot);
 
 		for (const auto& bp : Dataset::dataset->bodypartsList()) {
 			QListWidgetItem * bpItem = new QListWidgetItem();
@@ -167,6 +168,36 @@ void KeypointWidget::suppressKeypointSlot(int row) {
 }
 
 
+// we have to do this back and forth dance because the keypointListWidget handles
+// suppression (or not) of keypoints. maybe a way to do it all from here, rather than having a method?
+// but the method seems generically useful. The downside is then we have to come back and 
+// update the viewer in a separate slot, so we're sure to not update the current row before the toggle occurs.
+void KeypointWidget::toggleCurrentKeypointSlot() {
+	
+	// figure out which keypointList is currently active
+	KeypointListWidget* keypointList = keypointListMap[m_currentEntity];
+	
+	// call the toggleCurrentKeypointSuppression method of this keypointList
+	// maybe this should be a signal + slot
+	keypointList->toggleCurrentKeypointSuppression();
+}
+
+void KeypointWidget::advanceCurrentKeypointSlot(){
+	// figure out which keypointList is currently active
+	KeypointListWidget* keypointList = keypointListMap[m_currentEntity];
+	
+	// advance the row to the next keypoint, if possible
+	if (keypointList->currentRow() < keypointList->count()-1) {
+		keypointList->setCurrentRow(keypointList->currentRow()+1);
+		
+		// update the viewer accordingly
+		QColor color = colorMap->getColor(keypointList->currentRow(), keypointList->count());
+		m_currentBodypart = keypointList->item(keypointList->currentRow())->text();
+		emit currentBodypartChanged(m_currentBodypart, color);
+		emit updateViewer();
+	}
+}
+
 void KeypointWidget::unsuppressKeypointSlot(int row) {
 	QListWidget* keypointList = keypointListMap[m_currentEntity];
 	keypointList->item(row)->setIcon(QIcon::fromTheme("no_check"));

gui/editor/keypointwidget.hpp

@@ -40,11 +40,29 @@ class KeypointListWidget : public QListWidget {
 		void clearSupressed() {
 			m_suppressedList.clear();
 		}
+		// bool isSuppressed(int row) {
+			// return m_suppressedList.contains(row);
+		// }
+
+		void toggleCurrentKeypointSuppression(){
+			int current = this->currentRow();
+			bool isSuppressed = m_suppressedList.contains(current);
+			if (isSuppressed) {
+				m_suppressedList.removeAll(current);
+				emit unsuppressKeypoint(current);
+			}
+			else {
+				m_suppressedList.append(current);
+				emit suppressKeypoint(current);
+			}
+			emit advanceCurrentKeypoint();
+		}
 
 	signals:
 		void removeKeypoint(int row);
 		void suppressKeypoint(int row);
 		void unsuppressKeypoint(int row);
+		void advanceCurrentKeypoint();
 
 	private:
 		QList<int> m_suppressedList = {};
@@ -131,6 +149,8 @@ class KeypointWidget : public QWidget {
 		void unsuppressKeypointSlot(int row);
 		void frameChangedSlot(int currentImgSetIndex, int currentFrameIndex);
 		void setKeypointsFromDatasetSlot();
+		void toggleCurrentKeypointSlot();
+		void advanceCurrentKeypointSlot();
 
 	private:
 		ColorMap *colorMap;