diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui index 536bf804f50d5a081f1eac681b8a4d1ca965c7df..88c594cea82d237661d0c6cdffa974803597ae2e 100644 --- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui +++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui @@ -95,31 +95,6 @@ <string>SkillID</string> </property> </column> - <column> - <property name="text"> - <string>Constructing</string> - </property> - </column> - <column> - <property name="text"> - <string>Initializing</string> - </property> - </column> - <column> - <property name="text"> - <string>Preparing</string> - </property> - </column> - <column> - <property name="text"> - <string>Running</string> - </property> - </column> - <column> - <property name="text"> - <string>Finished</string> - </property> - </column> <column> <property name="text"> <string>Status</string> diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp index db2a98e79d96e29cb90cc2560a6002aa25d1e77c..a518220d4752595a0e913e1ef123bf88932aebad 100644 --- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp +++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp @@ -358,16 +358,16 @@ namespace armarx SkillManagerMonitorWidgetController::refreshExecutions() { static std::map<skills::SkillStatus, std::string> ExecutionStatus2String = { + // Main states + {skills::SkillStatus::Constructing, "Constructing"}, + {skills::SkillStatus::Initializing, "Initializing"}, + {skills::SkillStatus::Preparing, "Preparing"}, + {skills::SkillStatus::Running, "Running"}, + // Terminating {skills::SkillStatus::Aborted, "Aborted"}, {skills::SkillStatus::Failed, "Failed"}, - {skills::SkillStatus::Succeeded, "Succeeded"}, - - // Others - {skills::SkillStatus::Constructing, "Under construction"}, - {skills::SkillStatus::Running, "Running"}, - {skills::SkillStatus::Initializing, "Initializing"}, - {skills::SkillStatus::Preparing, "Preparing"}}; + {skills::SkillStatus::Succeeded, "Succeeded"}}; if (!memory) { @@ -398,10 +398,19 @@ namespace armarx if (found) { + for (std::pair<skills::SkillStatus, std::string> i : ExecutionStatus2String) + { + if (i.first == statusUpdate.status) + { + found->setText(3, QString::fromStdString(i.second)); + } + } + + /* // update values - found->setText(3, - QString::fromStdString( - statusUpdate.hasBeenConstructed() ? " (\xfb) " : "")); + //found->setText(3, + // QString::fromStdString( + // statusUpdate.hasBeenConstructed() ? " (\xfb) " : "")); found->setText(4, QString::fromStdString( statusUpdate.hasBeenInitialized() ? " (\xfb) " : "")); @@ -414,6 +423,7 @@ namespace armarx found->setText(7, QString::fromStdString( statusUpdate.hasBeenTerminated() ? " (\xfb) " : "")); + */ break; } } @@ -429,20 +439,13 @@ namespace armarx executionId.executionStartedTime.toDateTimeString())); item->setText(1, QString::fromStdString(executionId.executorName)); item->setText(2, QString::fromStdString(executionId.skillId.toString())); - item->setText(3, - QString::fromStdString( - statusUpdate.hasBeenConstructed() ? " (\xfb) " : "")); - item->setText(4, - QString::fromStdString( - statusUpdate.hasBeenInitialized() ? " (\xfb) " : "")); - item->setText( - 5, - QString::fromStdString(statusUpdate.hasBeenPrepared() ? " (\xfb) " : "")); - item->setText( - 6, QString::fromStdString(statusUpdate.hasBeenRunning() ? " (\xfb) " : "")); - item->setText( - 7, - QString::fromStdString(statusUpdate.hasBeenTerminated() ? " (\xfb) " : "")); + for (std::pair<skills::SkillStatus, std::string> i : ExecutionStatus2String) + { + if (i.first == statusUpdate.status) + { + item->setText(3, QString::fromStdString(i.second)); + } + } } } }