Skip to content
Snippets Groups Projects
Commit 7f5b82c6 authored by Peter Albrecht's avatar Peter Albrecht
Browse files

Refactored execution item logic into respective class

parent dc0463c1
No related branches found
No related tags found
1 merge request!406Refactor skill memory GUI
......@@ -161,13 +161,7 @@ namespace armarx::skills::gui
if (found)
{
for (std::pair<skills::SkillStatus, std::string> i : EXECUTION_STATUS_TO_STRING)
{
if (i.first == statusUpdate.status)
{
found->setText(3, QString::fromStdString(i.second));
}
}
found->updateItem(statusUpdate.status);
break;
}
......@@ -178,17 +172,7 @@ namespace armarx::skills::gui
// TODO: Sort to executor!
auto item = new SkillExecutionTreeWidgetItem(executionId, memory);
item->setText(
0, QString::fromStdString(executionId.executionStartedTime.toDateTimeString()));
item->setText(1, QString::fromStdString(executionId.executorName));
item->setText(2, QString::fromStdString(executionId.skillId.toString()));
for (std::pair<skills::SkillStatus, std::string> i : EXECUTION_STATUS_TO_STRING)
{
if (i.first == statusUpdate.status)
{
item->setText(3, QString::fromStdString(i.second));
}
}
item->updateItem(statusUpdate.status);
this->insertTopLevelItem(0, item);
}
......
......@@ -10,18 +10,6 @@
namespace armarx::skills::gui
{
static const std::map<skills::SkillStatus, std::string> EXECUTION_STATUS_TO_STRING = {
// 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"}};
class SkillExecutionTreeWidget : public QTreeWidget, public MemoryCommunicatorBase
{
public:
......
......@@ -34,4 +34,25 @@ namespace armarx::skills::gui
{
return this->executionId;
}
void
SkillExecutionTreeWidgetItem::updateItem(skills::SkillStatus& skillStatus)
{
this->setText(0,
QString::fromStdString(executionId.executionStartedTime.toDateTimeString()));
this->setText(1, QString::fromStdString(executionId.executorName));
this->setText(2, QString::fromStdString(executionId.skillId.toString()));
for (std::pair<skills::SkillStatus, std::string> i : EXECUTION_STATUS_TO_STRING)
{
if (i.first == skillStatus)
{
this->setText(3, QString::fromStdString(i.second));
}
}
}
void SkillExecutionTreeWidgetItem::setupUi()
{
}
} // namespace armarx::skills::gui
......@@ -11,6 +11,18 @@
namespace armarx::skills::gui
{
static const std::map<skills::SkillStatus, std::string> EXECUTION_STATUS_TO_STRING = {
// 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"}};
class SkillExecutionTreeWidgetItem : public QTreeWidgetItem, public MemoryCommunicatorBase
{
public:
......@@ -21,6 +33,7 @@ namespace armarx::skills::gui
std::shared_ptr<SkillManagerWrapper> _memory) :
MemoryCommunicatorBase(_memory), executionId(id)
{
setupUi()
}
static SkillExecutionTreeWidgetItem*
......@@ -29,10 +42,11 @@ namespace armarx::skills::gui
skills::SkillExecutionID getExecutionId();
void updateItem(skills::SkillStatus& skillStatus);
protected:
skills::SkillExecutionID executionId;
private:
void setupUi();
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment