refactor

Author: jonahpearl

gui/editor/editorwidget.cpp

@@ -167,7 +167,7 @@ EditorWidget::EditorWidget(QWidget *parent) : QWidget(parent) {
 	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::skipCurrentKeypointSlot);
+	connect(this, &EditorWidget::cmdEPressed, keypointWidget, &KeypointWidget::advanceCurrentKeypointSlot);
 
 	//<-> Relayed Signals
 	connect(datasetControlWidget, &DatasetControlWidget::datasetLoaded, this, &EditorWidget::newSegmentLoaded);

gui/editor/keypointwidget.cpp

@@ -73,8 +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::toggleCurrentKeypoint, this, &KeypointWidget::toggleCurrentKeypointSlot);
-		connect(bodyPartsListWidget, &KeypointListWidget::afterToggleSuppression, this, &KeypointWidget::afterToggleSuppressionSlot);
+		connect(bodyPartsListWidget, &KeypointListWidget::advanceCurrentKeypoint, this, &KeypointWidget::advanceCurrentKeypointSlot);
 
 		for (const auto& bp : Dataset::dataset->bodypartsList()) {
 			QListWidgetItem * bpItem = new QListWidgetItem();
@@ -183,23 +182,7 @@ void KeypointWidget::toggleCurrentKeypointSlot() {
 	keypointList->toggleCurrentKeypointSuppression();
 }
 
-void KeypointWidget::afterToggleSuppressionSlot() {
-	
-	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::skipCurrentKeypointSlot(){
+void KeypointWidget::advanceCurrentKeypointSlot(){
 	// figure out which keypointList is currently active
 	KeypointListWidget* keypointList = keypointListMap[m_currentEntity];
 

gui/editor/keypointwidget.hpp

@@ -55,14 +55,14 @@ class KeypointListWidget : public QListWidget {
 				m_suppressedList.append(current);
 				emit suppressKeypoint(current);
 			}
-			emit afterToggleSuppression();
+			emit advanceCurrentKeypoint();
 		}
 
 	signals:
 		void removeKeypoint(int row);
 		void suppressKeypoint(int row);
 		void unsuppressKeypoint(int row);
-		void afterToggleSuppression();
+		void advanceCurrentKeypoint();
 
 	private:
 		QList<int> m_suppressedList = {};
@@ -150,8 +150,7 @@ class KeypointWidget : public QWidget {
 		void frameChangedSlot(int currentImgSetIndex, int currentFrameIndex);
 		void setKeypointsFromDatasetSlot();
 		void toggleCurrentKeypointSlot();
-		void afterToggleSuppressionSlot();
-		void skipCurrentKeypointSlot();
+		void advanceCurrentKeypointSlot();
 
 	private:
 		ColorMap *colorMap;