From bcd9ef9956263b448cad21202b28b6a10736c1ca Mon Sep 17 00:00:00 2001
From: Fabian Paus <fabian.paus@kit.edu>
Date: Tue, 18 Jan 2022 16:27:27 +0100
Subject: [PATCH] ScenarioManager: Remove more of the Ice start functionality
---
.../controller/DetailedApplicationController.cpp | 2 +-
.../ScenarioManager/gui/buttondelegate.cpp | 12 ++++++------
.../ScenarioManager/gui/comboboxbutton.cpp | 9 +--------
.../ScenarioManager/gui/scenariolistview.cpp | 11 ++---------
.../ScenarioManager/gui/scenariolistview.h | 2 --
5 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp
index 5a35e554..18afd17d 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp
@@ -191,7 +191,7 @@ void DetailedApplicationController::startScenario(ScenarioPtr scenario)
{
StatusManager statusManager;
- auto mode = statusManager.isIceScenario(scenario) ? IceStart : LocalStart;
+ ScenarioStartModes mode = LocalStart;
ScenarioListController::StartScenario(scenario, mode, executor, iceAdmin);
// StatusManager statusManager;
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp
index b9cc72b5..7b7240b6 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp
@@ -69,12 +69,12 @@ QWidget* ButtonDelegate::createEditor(QWidget* parent, const QStyleOptionViewIte
// IceStartQuickFix: TODO: This is just a very dirty fix. Either completely remove the Ice Start feature or fix it.
//cb->addItem(startPixmap, "Ice");
- ScenarioManager::StatusManager statusManager;
- ScenarioItem* item = index.model()->data(index, SCENARIOITEMSOURCE).value<ScenarioItem*>();
- if (statusManager.isIceScenario(item->getScenario()))
- {
- cb->setCurrentIndex(1);
- }
+ //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));
cb->setToolTip("Start");
cb->setIceStatesActive(true);
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/comboboxbutton.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/comboboxbutton.cpp
index 47a933bd..a459d320 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/comboboxbutton.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/comboboxbutton.cpp
@@ -83,14 +83,7 @@ void ComboBoxButton::onIndexChange(const QString& text)
ScenarioItem* item = ScenarioModel::FindScenario(model, scenarioName);
ARMARX_CHECK_EXPRESSION(item) << scenarioName.toStdString();
- if (text == "Local")
- {
- statusManager.setIceScenario(item->getScenario(), false);
- }
- else if (text == "Ice")
- {
- statusManager.setIceScenario(item->getScenario(), true);
- }
+ statusManager.setIceScenario(item->getScenario(), false);
}
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp
index f9ee3ba6..63ba13ad 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp
@@ -108,19 +108,12 @@ void ScenarioListView::on_searchBar_textEdited(const QString& text)
void ScenarioListView::startComboBoxClicked(int row, int column, QModelIndex parent, QString text)
{
- if (text == "Local")
- {
- emit startApplication(row, column, parent, LocalStart);
- }
- else if (text == "Ice")
- {
- emit startApplication(row, column, parent, IceStart);
- }
+ emit startApplication(row, column, parent, LocalStart);
}
void ScenarioListView::startButtonClicked(int row, int column, QModelIndex parent)
{
- emit startApplication(row, column, parent, ContextStart);
+ emit startApplication(row, column, parent, LocalStart);
}
void ScenarioListView::stopButtonClicked(int row, int column, QModelIndex parent)
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.h b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.h
index a315d88c..8365c31d 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.h
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.h
@@ -43,9 +43,7 @@ namespace Ui
enum ScenarioStartModes
{
- ContextStart = 0, //Used if the start mode is determind by the Scenario
LocalStart = 1, //Start the Scenario Local
- IceStart = 2 //Deploy the Scenario via Ice
};
/**
--
GitLab