Fixed startbuttons for subScenarioItems

source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp

@@ -27,6 +27,8 @@
 
 #include "treeitem.h"
 #include "comboboxbutton.h"
+#include "scenarioitem.h"
+#include <ArmarXCore/util/ScenarioManagerCommon/parser/StatusManager.h>
 #include <ArmarXCore/core/logging/Logging.h>
 #include <QPainter>
 #include <QStyleOptionViewItem>
@@ -61,6 +63,13 @@ QWidget* ButtonDelegate::createEditor(QWidget* parent, const QStyleOptionViewIte
     {
         cb->addItem(startPixmap, "Local");
         cb->addItem(startPixmap, "Ice");
+
+        ScenarioManager::StatusManager statusManager;
+        ScenarioItem* item = index.model()->data(index, SCENARIOITEMSOURCE).value<ScenarioItem*>();
+        if (statusManager.isIceScenario(item->getScenario()))
+        {
+            cb->setCurrentIndex(1);
+        }
         cb->setIconSize(QSize(size, size));
     }
     else if (index.data().toString().compare("Stop") == 0)
@@ -196,14 +205,7 @@ bool ButtonDelegate::editorEvent(QEvent* event, QAbstractItemModel* model, const
     {
         QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
 
-        if (mouseEvent->x() >= option.rect.left() + (option.rect.width() * 0.75))
-        {
-            ARMARX_INFO_S << "inhere";
-        }
-        else
-        {
-            buttonStates[index] = QStyle::State_Sunken | QStyle::State_Enabled;
-        }
+        buttonStates[index] = QStyle::State_Sunken | QStyle::State_Enabled;
 
         return true;
     }
@@ -211,27 +213,14 @@ bool ButtonDelegate::editorEvent(QEvent* event, QAbstractItemModel* model, const
     {
         QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
 
-        if (mouseEvent->x() >= option.rect.left() + (option.rect.width() * 0.75) && (!index.parent().isValid()))
-        {
-            ARMARX_INFO_S << "inhere";
-            //static_cast<QWidget*>(parent())->;
-            //createEditor(static_cast<QWidget*>(parent()), option, index);
-        }
-        else
-        {
-            buttonStates[index] = QStyle::State_Raised | QStyle::State_Enabled;
-            emit buttonClicked(index.row(), index.column(), index.parent());
-        }
+        buttonStates[index] = QStyle::State_Raised | QStyle::State_Enabled;
+        emit buttonClicked(index.row(), index.column(), index.parent());
+
         return true;
     }
     return false;
 }
 
-void ButtonDelegate::emitClicketData(int row, int column, QModelIndex parent)
-{
-    emit buttonClicked(row, column, parent);
-}
-
 int ButtonDelegate::getAppIconSize() const
 {
     return appIconSize;

source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.h

@@ -79,7 +79,6 @@ protected:
     virtual bool editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index);
 
 private slots:
-    void emitClicketData(int row, int column, QModelIndex parent);
     void onComboBoxRelease(QModelIndex index, QString text);
 
 private:

source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp

@@ -67,7 +67,10 @@ ScenarioListView::ScenarioListView(QWidget* parent) :
                      this, SLOT(removeItemTriggered()));
 
     QObject::connect(&startButtonDelegate, SIGNAL(comboBoxButtonClicked(int, int, QModelIndex, QString)),
-                     this, SLOT(startButtonClicked(int, int, QModelIndex, QString)));
+                     this, SLOT(startComboBoxClicked(int, int, QModelIndex, QString)));
+    QObject::connect(&startButtonDelegate, SIGNAL(buttonClicked(int, int, QModelIndex)),
+                     this, SLOT(startButtonClicked(int, int, QModelIndex)));
+
 
     QObject::connect(&stopButtonDelegate, SIGNAL(buttonClicked(int, int, QModelIndex)),
                      this, SLOT(stopButtonClicked(int, int, QModelIndex)));
@@ -100,7 +103,7 @@ void ScenarioListView::on_searchBar_textEdited(const QString& text)
     ui->treeView->expandAll();
 }
 
-void ScenarioListView::startButtonClicked(int row, int column, QModelIndex parent, QString text)
+void ScenarioListView::startComboBoxClicked(int row, int column, QModelIndex parent, QString text)
 {
     if (text == "Local")
     {
@@ -112,6 +115,11 @@ void ScenarioListView::startButtonClicked(int row, int column, QModelIndex paren
     }
 }
 
+void ScenarioListView::startButtonClicked(int row, int column, QModelIndex parent)
+{
+    emit startApplication(row, column, parent, 0);
+}
+
 void ScenarioListView::stopButtonClicked(int row, int column, QModelIndex parent)
 {
     emit stopApplication(row, column, parent);

source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.h

@@ -81,7 +81,8 @@ public slots:
 
 private slots:
     void on_searchBar_textEdited(const QString& text);
-    void startButtonClicked(int row, int column, QModelIndex parent, QString text);
+    void startComboBoxClicked(int row, int column, QModelIndex parent, QString text);
+    void startButtonClicked(int row, int column, QModelIndex parent);
     void stopButtonClicked(int row, int column, QModelIndex parent);
 
     void restartButtonClicked(int row, int column, QModelIndex parent);

source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariomodel.cpp

@@ -134,7 +134,7 @@ Qt::ItemFlags ScenarioModel::flags(const QModelIndex& index) const
 {
     Qt::ItemFlags defaultFlags = QAbstractItemModel::flags(index);
 
-    if (index.data().toString().compare("Start") == 0)
+    if (index.data().toString().compare("Start") == 0 && !index.parent().isValid())
     {
         return Qt::ItemIsDropEnabled | Qt::ItemIsEditable | Qt::ItemIsUserCheckable | defaultFlags;
     }