diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui index b96d3850e2c7181892e22030c600157963fb41af..536bf804f50d5a081f1eac681b8a4d1ca965c7df 100644 --- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui +++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui @@ -77,6 +77,9 @@ <layout class="QGridLayout" name="gridLayout_4"> <item row="1" column="0" colspan="3"> <widget class="QTreeWidget" name="treeWidgetSkillExecutions"> + <property name="contextMenuPolicy"> + <enum>Qt::CustomContextMenu</enum> + </property> <column> <property name="text"> <string>ExecutionID</string> @@ -94,22 +97,22 @@ </column> <column> <property name="text"> - <string>IsConstructing</string> + <string>Constructing</string> </property> </column> <column> <property name="text"> - <string>IsInitializing</string> + <string>Initializing</string> </property> </column> <column> <property name="text"> - <string>IsPreparing</string> + <string>Preparing</string> </property> </column> <column> <property name="text"> - <string>IsRunning</string> + <string>Running</string> </property> </column> <column> @@ -117,6 +120,11 @@ <string>Finished</string> </property> </column> + <column> + <property name="text"> + <string>Status</string> + </property> + </column> </widget> </item> </layout> diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp index f48165ab95c12f4f16dfd68c35212893e24373a6..a46babdda00eaa6fd1ca72ba181f910fe69f402a 100644 --- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp +++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp @@ -31,6 +31,7 @@ #include "aronTreeWidget/visitors/AronTreeWidgetModalCreator.h" // modals + #include "aronTreeWidget/modal/text/AronTreeWidgetTextInputModalController.h" // debug @@ -79,6 +80,12 @@ namespace armarx // Others namespace armarx { + void + SkillManagerMonitorWidgetController::prepareMenu(const QPoint& pos) + { + ARMARX_IMPORTANT << "Function not implemented!"; + } + SkillExecutionInfoTreeWidgetItem* SkillExecutionInfoTreeWidgetItem::SearchRecursiveForMatch( SkillExecutionInfoTreeWidgetItem* haystack, @@ -116,6 +123,11 @@ namespace armarx updateTimerFrequency(); refreshSkillsResultTimer->start(); + connect(widget.treeWidgetSkillExecutions, + &QTreeWidget::customContextMenuRequested, + this, + &SkillManagerMonitorWidgetController::prepareMenu); + connect(widget.doubleSpinBoxUpdateFreq, &QDoubleSpinBox::editingFinished, this, diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.h b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.h index 869e7921366da0290f741037f4aab9cf3ef3a08f..ec56794be9092542a5ea031994f4c24009120626 100644 --- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.h +++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.h @@ -64,6 +64,7 @@ namespace armarx class SkillExecutionInfoTreeWidgetItem : public QTreeWidgetItem { + //Q_OBJECT public: SkillExecutionInfoTreeWidgetItem(const skills::SkillExecutionID& id, QTreeWidgetItem* parent) : @@ -128,6 +129,8 @@ namespace armarx void pasteCurrentConfig(); void resetCurrentConfig(); + void prepareMenu(); + private: aron::data::DictPtr getConfigAsAron() const;