diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/CMakeLists.txt b/source/ArmarXGui/gui-plugins/ScenarioManager/CMakeLists.txt
index 7d5bf44f1ca825ec219f282354eca358efa7ed32..4608ef1a998b97fac73786627de4e4d501fe00f0 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/CMakeLists.txt
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/CMakeLists.txt
@@ -17,9 +17,8 @@ set(SOURCES
./gui/OptionalPropertyManager.cpp
./gui/OptionalPropertyFactory.cpp
./gui/OptionalEdit.cpp
-./gui/comboboxbutton.cpp
-./controller/openscenariocontroller.cpp
+ ./controller/openscenariocontroller.cpp
./controller/ApplicationDatabaseController.cpp ./controller/SettingsController.cpp
./controller/DetailedApplicationController.cpp ./controller/ScenarioListController.cpp
)
@@ -34,7 +33,6 @@ set (MOC_HEADERS
./gui/settingsview.h
./gui/treemodel.h
./gui/createpropertyview.h
- ./gui/comboboxbutton.h
./controller/ApplicationDatabaseController.h
./controller/SettingsController.h
./controller/DetailedApplicationController.h
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp
index 6e7408c92343850a221495876cbe0bfe16cacb8d..e8837039d4439080632fda6a9b91a9f446554fa2 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp
@@ -168,9 +168,9 @@ ScenarioManagerWidgetController::init()
SLOT(showApplication(QModelIndex)));
QObject::connect(widget.scenarioView,
- SIGNAL(startApplication(int, int, QModelIndex, ScenarioStartModes)),
+ SIGNAL(startApplication(int, int, QModelIndex)),
&scenarioListController,
- SLOT(start(int, int, QModelIndex, ScenarioStartModes)));
+ SLOT(start(int, int, QModelIndex)));
QObject::connect(widget.scenarioView,
SIGNAL(stopApplication(int, int, QModelIndex)),
@@ -394,7 +394,7 @@ ScenarioManagerWidgetController::reparsePackages()
QStringList openedScenarios = settings.value("scenarios").toStringList();
// remove duplicates
- openedScenarios = openedScenarios.toSet().toList();
+ openedScenarios = openedScenarios.toSet().values();
StringList openedList;
for (const QString& it : openedScenarios)
@@ -409,22 +409,6 @@ ScenarioManagerWidgetController::reparsePackages()
continue;
}
- for (const auto& scenario : *package->getScenarios())
- {
- StatusManager statusManager;
- if (statusManager.isIceScenario(scenario))
- {
- executor->setStarter(
- StarterFactory::getFactory()->getIceStarter(
- getArmarXManager()->getIceManager()->getIceGridSession()->getAdmin()),
- scenario);
- executor->setStopStrategy(
- stopStrategyFactory.getKillStrategy(StopperFactory::getFactory()->getIceStopper(
- getArmarXManager()->getIceManager()->getIceGridSession()->getAdmin())),
- scenario);
- }
- }
-
this->packages->push_back(package);
}
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp
index 18afd17de7ad6a3cb8e25f4c447804f4ceabad42..1c20423dad516ecfed7ed35a73171617b013d5c2 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp
@@ -46,9 +46,6 @@ DetailedApplicationController::DetailedApplicationController(ExecutorPtr executo
{
QObject::connect(&propertyAdderView, SIGNAL(create(std::string, std::string)),
this, SLOT(setProperty(std::string, std::string)));
-
- QObject::connect(&iceEnvVariableAddView, SIGNAL(create(std::string, std::string)),
- this, SLOT(setIceEnvVariable(std::string, std::string)));
}
DetailedApplicationController::~DetailedApplicationController()
@@ -155,16 +152,6 @@ void DetailedApplicationController::setProperty(std::string name, std::string va
}
}
-void DetailedApplicationController::setIceEnvVariable(std::string name, std::string value)
-{
- if (currentScenario.get() != nullptr)
- {
- currentScenario->addIceEnviromentVariable(name, value);
- currentScenario->save();
- showScenario(currentScenario);
- }
-}
-
void DetailedApplicationController::start()
{
if (showingStartable)
@@ -191,8 +178,7 @@ void DetailedApplicationController::startScenario(ScenarioPtr scenario)
{
StatusManager statusManager;
- ScenarioStartModes mode = LocalStart;
- ScenarioListController::StartScenario(scenario, mode, executor, iceAdmin);
+ ScenarioListController::StartScenario(scenario, executor, iceAdmin);
// StatusManager statusManager;
// StopStrategyFactory stopStrategyFactory;
@@ -243,14 +229,7 @@ void DetailedApplicationController::stop()
}
else if (currentScenario.get() != nullptr)
{
- if (currentScenario->getScenarioDeploymentType() == ScenarioDeploymentType::Local)
- {
- executor->stopScenario(currentScenario);
- }
- else
- {
- executor->removeScenario(currentScenario);
- }
+ executor->stopScenario(currentScenario);
}
}
}
@@ -289,10 +268,6 @@ void DetailedApplicationController::showPropertyAddView()
propertyAdderView.exec();
}
-void DetailedApplicationController::showIceEnvVariableAddView()
-{
- iceEnvVariableAddView.exec();
-}
void DetailedApplicationController::showWarningDialog(QString message)
{
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.h b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.h
index c3e54fb4117979b60b0eb8bb9316505794c01c54..e6f266040f0641f63d04e350b6419a6f6665bfb9 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.h
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.h
@@ -105,7 +105,6 @@ namespace ScenarioManager::Controller
* @param value new value of the property
*/
void setProperty(std::string name, std::string value);
- void setIceEnvVariable(std::string name, std::string value);
/**
* Starts the current ApplicationInstance.
@@ -129,7 +128,6 @@ namespace ScenarioManager::Controller
void deleteProperty(std::string name);
void showPropertyAddView();
- void showIceEnvVariableAddView();
/**
@@ -149,7 +147,6 @@ namespace ScenarioManager::Controller
Data_Structure::ScenarioPtr currentScenario;
DetailedApplicationView* view;
CreatePropertyView propertyAdderView;
- CreatePropertyView iceEnvVariableAddView;
IceGrid::AdminPrx iceAdmin;
};
}
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.cpp
index f4dc40ec18db6024471324fcc3ec72c1dcb62dbb..24da4930266f6b1008f84ca8706597076885a970 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.cpp
@@ -126,15 +126,7 @@ void ScenarioListController::stop(int row, int column, QModelIndex parent)
else //stop scenario
{
ScenarioPtr scenario = item->getScenario();
- StatusManager statusManager;
- if (statusManager.isIceScenario(scenario))
- {
- executor->removeScenario(scenario);
- }
- else
- {
executor->stopScenario(scenario);
- }
}
}
@@ -143,7 +135,7 @@ void ScenarioListController::stopUpdateTask()
updateTask->stop();
}
-void ScenarioListController::start(int row, int column, QModelIndex parent, ScenarioStartModes mode)
+void ScenarioListController::start(int row, int column, QModelIndex parent)
{
ScenarioItem* item = model->data(model->index(row, column, parent), SCENARIOITEMSOURCE).value<ScenarioItem*>();
if (!item)
@@ -152,32 +144,6 @@ void ScenarioListController::start(int row, int column, QModelIndex parent, Scen
}
if (parent.isValid())
{
- auto deploy = [&](ScenarioPtr scenario)
- {
- ARMARX_CHECK_EXPRESSION(scenario);
-
- // if (mode == IceStart || st)
- {
- executor->setStarter(StarterFactory::getFactory()->getIceStarter(iceAdmin), scenario);
- StatusManager statusManager;
- statusManager.setIceScenario(scenario, true);
- if (!executor->isScenarioDeployed(scenario))
- {
- try
- {
- executor->deployScenario(scenario).get();
- }
- catch (IceGrid::DeploymentException& ex)
- {
- ShowWarningDialog(QString::fromStdString(ex.reason));
- return;
- }
-
- }
- }
- };
-
-
if (parent.parent().isValid()) //start application
{
if (!item->isEnabled())
@@ -193,11 +159,6 @@ void ScenarioListController::start(int row, int column, QModelIndex parent, Scen
return;
}
auto scenario = instance->getScenario();
- StatusManager s;
- if (s.isIceScenario(scenario))
- {
- deploy(scenario);
- }
executor->startApplication(instance);
}
else // start packagesubtree
@@ -207,15 +168,6 @@ void ScenarioListController::start(int row, int column, QModelIndex parent, Scen
return;
}
ARMARX_CHECK_EXPRESSION(item->getApplicationInstances());
- if (!item->getApplicationInstances()->empty())
- {
- ARMARX_CHECK_EXPRESSION(item->getApplicationInstances()->at(0));
- StatusManager s;
- if (s.isIceScenario(item->getApplicationInstances()->at(0)->getScenario()))
- {
- deploy(item->getApplicationInstances()->at(0)->getScenario());
- }
- }
for (const auto& app : *item->getApplicationInstances())
{
app->updateFound();
@@ -232,14 +184,14 @@ void ScenarioListController::start(int row, int column, QModelIndex parent, Scen
}
else //start scenario
{
- startScenario(item, mode);
+ startScenario(item);
}
}
-void ScenarioListController::startScenario(ScenarioItem* scenarioItem, ScenarioStartModes mode)
+void ScenarioListController::startScenario(ScenarioItem* scenarioItem)
{
ScenarioPtr scenario = scenarioItem->getScenario();
- StartScenario(scenario, mode, executor, iceAdmin);
+ StartScenario(scenario, executor, iceAdmin);
}
void ScenarioListController::restart(int row, int column, QModelIndex parent)
@@ -410,7 +362,7 @@ void ScenarioListController::addApplicationsToScenario(
std::ofstream out(configPath);
out.close();
- ApplicationInstancePtr appInstance(new ApplicationInstance(app->getExecutableName(), app->getPathToExecutable(), instanceName, configPath, appPackage->getName(), scenario, "", true, false));
+ ApplicationInstancePtr appInstance(new ApplicationInstance(app->getExecutableName(), app->getPathToExecutable(), instanceName, configPath, appPackage->getName(), scenario, "", true));
std::string cacheDir = Parser::IceParser::getCacheDir();
@@ -587,11 +539,11 @@ void ScenarioListController::createdScenario(std::string name, std::string packa
return;
}
- for (const auto& package : *packages)
+ for (const auto& p : *packages)
{
- if (package->getName().compare(packageStr) == 0)
+ if (p->getName().compare(packageStr) == 0)
{
- package->addScenario(ptr);
+ p->addScenario(ptr);
treemodel.insertRow(0, new ScenarioItem(ptr));
break;
}
@@ -727,7 +679,7 @@ QModelIndex ScenarioListController::findApplicationModelIndex(ScenarioManager::D
return QModelIndex();
}
int count = 0;
- QModelIndex appIndex = subScenarioModelIndex.child(0, 0);
+ QModelIndex appIndex = subScenarioModelIndex.model()->index(0, 0);
while (true)
{
appIndex = appIndex.sibling(count, 0);
@@ -780,7 +732,7 @@ QModelIndex ScenarioListController::findSubScenarioModelIndex(std::string scenar
count = 0;
while (true)
{
- QModelIndex currentSubPackageIndex = scenarioIndex.child(count, 0);
+ QModelIndex currentSubPackageIndex = scenarioIndex.model()->index(count, 0);
if (!currentSubPackageIndex.isValid())
{
return QModelIndex();
@@ -800,7 +752,7 @@ QModelIndex ScenarioListController::findSubScenarioModelIndexByScenarioIndex(QMo
int count = 0;
while (true)
{
- QModelIndex currentSubPackageIndex = scenarioIndex.child(count, 0);
+ QModelIndex currentSubPackageIndex = scenarioIndex.model()->index(count, 0);
if (packageName == currentSubPackageIndex.data().toString().toStdString())
{
return currentSubPackageIndex;
@@ -855,109 +807,26 @@ void ScenarioListController::fetchStati()
emit statusFetched(stati);
}
-bool ScenarioListController::StartScenario(ScenarioPtr scenario, ScenarioStartModes mode, ExecutorPtr executor, IceGrid::AdminPrx iceAdmin)
+bool ScenarioListController::StartScenario(ScenarioPtr scenario, ExecutorPtr executor, IceGrid::AdminPrx iceAdmin)
{
- StatusManager statusManager;
- StopStrategyFactory stopStrategyFactory;
-
- if (mode == LocalStart)
+ // Make sure all required data files are generated when launching scenario
+ const ApplicationInstanceVectorPtr applications = scenario->getApplications();
+ ARMARX_CHECK_NOT_NULL(applications);
+ for (ApplicationInstancePtr applicationInstance : *applications)
{
- // Make sure all required data files are generated when launching scenario
- const ApplicationInstanceVectorPtr applications = scenario->getApplications();
- ARMARX_CHECK_NOT_NULL(applications);
- for (ApplicationInstancePtr applicationInstance : *applications)
- {
- executor->loadAndSetCachedProperties(applicationInstance, Parser::IceParser::getCacheDir(), false, false);
- applicationInstance->load();
- }
-
- if (statusManager.isIceScenario(scenario) && scenario->getStatus() != ApplicationStatus::Stopped)
- {
- QMessageBox::StandardButton reply;
- reply = QMessageBox::question(nullptr, "", "The Scenario is currently running via Ice do you want to remove it ?", QMessageBox::Yes | QMessageBox::No);
- if (reply == QMessageBox::No)
- {
- return false;
- }
- else
- {
- executor->setStarter(StarterFactory::getFactory()->getIceStarter(iceAdmin), scenario);
- executor->setStopStrategy(stopStrategyFactory.getKillStrategy(StopperFactory::getFactory()->getIceStopper(iceAdmin)), scenario);
-
- statusManager.setIceScenario(scenario, true);
- executor->removeScenario(scenario);
- return false;
- }
- }
- executor->setStarter(StarterFactory::getFactory()->getStarter(), scenario);
- executor->setStopStrategy(executor->getDefaultStopStrategy(), scenario);
-
- statusManager.setIceScenario(scenario, false);
-
- if (!scenario->allApplicationsFound())
- {
- ShowWarningDialog("Not all binaries in the Scenario " + QString::fromStdString(scenario->getName()) + " could be found", true, QString::fromStdString(scenario->getName() + "BinariesMissing"));
- // return false;
- }
- executor->startScenario(scenario);
+ executor->loadAndSetCachedProperties(applicationInstance, Parser::IceParser::getCacheDir(), false, false);
+ applicationInstance->load();
}
- else
- {
- if (!statusManager.isIceScenario(scenario) && scenario->getStatus() != ApplicationStatus::Stopped)
- {
- QMessageBox::StandardButton reply;
- reply = QMessageBox::question(nullptr, "", "The Scenario is currently running locally - do you want to stop it ?", QMessageBox::Yes | QMessageBox::No);
- if (reply == QMessageBox::No)
- {
- return false;
- }
- else
- {
- executor->setStarter(StarterFactory::getFactory()->getStarter(), scenario);
- executor->setStopStrategy(executor->getDefaultStopStrategy(), scenario);
- executor->stopScenario(scenario);
- return false;
- }
- }
- executor->setStarter(StarterFactory::getFactory()->getIceStarter(iceAdmin), scenario);
- executor->setStopStrategy(stopStrategyFactory.getKillStrategy(StopperFactory::getFactory()->getIceStopper(iceAdmin)), scenario);
+ executor->setStarter(StarterFactory::getFactory()->getStarter(), scenario);
+ executor->setStopStrategy(executor->getDefaultStopStrategy(), scenario);
- if (!scenario->allApplicationsFound())
- {
- ShowWarningDialog("Not all binaries in the Scenario " + QString::fromStdString(scenario->getName()) + " could be found", true, QString::fromStdString(scenario->getName() + "BinariesMissing"));
- // updateStati();
- // return true;
- }
-
- statusManager.setIceScenario(scenario, true);
- if (!executor->isScenarioDeployed(scenario))
- {
- try
- {
- executor->deployScenario(scenario).get();
- }
- catch (IceGrid::DeploymentException& ex)
- {
- ShowWarningDialog(QString::fromStdString(ex.reason));
- return false;
- }
-
- }
- // else
- {
- try
- {
- executor->startScenario(scenario).get();
- }
- catch (IceGrid::ServerStartException& ex)
- {
- ShowWarningDialog("Ice had an launching error. Please make sure your remote launch settings are correct. Did you sync everything?\nId: " + QString::fromStdString(ex.id)
- + "\nReason: " + QString::fromStdString(ex.reason)) ;
- return false;
- }
- }
+ if (!scenario->allApplicationsFound())
+ {
+ ShowWarningDialog("Not all binaries in the Scenario " + QString::fromStdString(scenario->getName()) + " could be found", true, QString::fromStdString(scenario->getName() + "BinariesMissing"));
+ // return false;
}
+ executor->startScenario(scenario);
return true;
}
@@ -1026,9 +895,9 @@ void ScenarioListController::saveScenario(ScenarioManager::Data_Structure::Appli
}
}
-void ScenarioListController::setIceAdmin(IceGrid::AdminPrx iceAdmin)
+void ScenarioListController::setIceAdmin(IceGrid::AdminPrx admin)
{
- this->iceAdmin = iceAdmin;
+ iceAdmin = admin;
}
void ScenarioListController::ShowWarningDialog(QString message, bool showOnce, QString messageId)
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.h b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.h
index bdc4d56145edd7bdbd685adf69835208445b3700..7c173f4bab5d25c762bd8efef489995e56a53fe8 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.h
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.h
@@ -85,8 +85,7 @@ namespace ScenarioManager::Controller
*/
void fetchStati();
- static bool StartScenario(ScenarioManager::Data_Structure::ScenarioPtr scenario,
- ScenarioStartModes mode, Exec::ExecutorPtr executor, IceGrid::AdminPrx iceAdmin);
+ static bool StartScenario(ScenarioManager::Data_Structure::ScenarioPtr scenario, Exec::ExecutorPtr executor, IceGrid::AdminPrx iceAdmin);
signals:
/**
@@ -152,7 +151,7 @@ namespace ScenarioManager::Controller
* @param column column the object is in
* @param parent parent of the object. Needed to differentiate between scenarios and applications.
*/
- void start(int row, int column, QModelIndex parent, ScenarioStartModes mode);
+ void start(int row, int column, QModelIndex parent);
void stop(int row, int column, QModelIndex parent);
void stopUpdateTask();
@@ -189,7 +188,7 @@ namespace ScenarioManager::Controller
void setIceAdmin(IceGrid::AdminPrx iceAdmin);
private:
- void startScenario(ScenarioItem* scenarioItem, ScenarioStartModes mode);
+ void startScenario(ScenarioItem* scenarioItem);
int findScenario(ScenarioItem* rootItem, std::string name, std::string packageName);
QModelIndex findSubScenarioModelIndex(std::string scenarioName, std::string packageName);
QModelIndex findApplicationModelIndex(ScenarioManager::Data_Structure::ApplicationInstancePtr application);
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp
index 7b7240b660883559849b0562332dafc57cc4a3de..527744ecd0996a3222f1ce9afdb087bb7d9bac0b 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp
@@ -27,7 +27,6 @@
#include "filterabletreemodelsortfilterproxymodel.h"
#include "treeitem.h"
-#include "comboboxbutton.h"
#include "scenarioitem.h"
#include <ArmarXCore/util/ScenarioManagerCommon/parser/StatusManager.h>
#include <ArmarXCore/core/logging/Logging.h>
@@ -48,96 +47,14 @@ ButtonDelegate::ButtonDelegate(QWidget* parent) : QStyledItemDelegate(parent),
{
}
-QWidget* ButtonDelegate::createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const
-{
- // Create the combobox and populate it
- auto model = index.model();
- ARMARX_CHECK_EXPRESSION(model);
- ComboBoxButton* cb = new ComboBoxButton(model, index.model()->index(index.row(), 0).data().toString(), parent);
- cb->setFrame(true);
- int size = appIconSize;
- //int row = index.row();
- if (!index.parent().isValid())
- {
- size = scenarioIconSize;
- }
- if (index.data().toString().compare("Start") == 0)
- {
- cb->addItem(startPixmap, "Local");
-
- // ICE START SUCKS HARD!!!!!!!!
- // 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);
- //}
- cb->setIconSize(QSize(size, size));
- cb->setToolTip("Start");
- cb->setIceStatesActive(true);
- }
- else if (index.data().toString().compare("Stop") == 0)
- {
- cb->addItem(stopPixmap, "Stop");
- cb->setIconSize(QSize(size, size));
- cb->setToolTip("Stop");
- }
- else if (index.data().toString().compare("Restart") == 0)
- {
- cb->addItem(restartPixmap, "Restart");
- cb->setIconSize(QSize(size, size));
- cb->setToolTip("Restart");
- }
- else
- {
- cb->addItem(index.data().toString());
- }
-
- if (index.data().toString().compare("HIDE") == 0)
- {
- const_cast<ButtonDelegate*>(this)->buttonStates[index] = 0;
- cb->setVisible(false);
- }
-
- QObject::connect(cb, SIGNAL(released(QString, const QAbstractItemModel*, QString)), this,
- SLOT(onComboBoxRelease(QString, const QAbstractItemModel*, QString)));
-
- return cb;
-}
-
void ButtonDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const
{
- if (QComboBox* cb = qobject_cast<QComboBox*>(editor))
- {
- // get the index of the text in the combobox that matches the current value of the item
- QString currentText = index.data(Qt::EditRole).toString();
- int cbIndex = cb->findText(currentText);
- // if it is valid, adjust the combobox
- if (cbIndex >= 0)
- {
- cb->setCurrentIndex(cbIndex);
- }
- }
- else
- {
- QStyledItemDelegate::setEditorData(editor, index);
- }
+ QStyledItemDelegate::setEditorData(editor, index);
}
void ButtonDelegate::setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
{
- if (ComboBoxButton* cb = qobject_cast<ComboBoxButton*>(editor))
- {
- model->setData(index, cb->currentText(), Qt::EditRole);
- // cb->setScenarioIndex(index);
- }
- else
- {
- QStyledItemDelegate::setModelData(editor, model, index);
- }
+ QStyledItemDelegate::setModelData(editor, model, index);
}
void ButtonDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
@@ -176,7 +93,7 @@ void ButtonDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option
if (index.data().toString().compare("HIDE") == 0)
{
- const_cast<ButtonDelegate*>(this)->buttonStates[index] = 0;
+ const_cast<ButtonDelegate*>(this)->buttonStates[index] = {};
return;
}
@@ -191,17 +108,6 @@ void ButtonDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option
}
QApplication::style()->drawControl(QStyle::CE_PushButton, &button, painter, 0);
-
- //Draw 'Combobox' arrow if it is an Scenario Button
- // if (!index.parent().isValid())
- // {
- // QStyleOptionHeader arrow;
- // arrow.iconAlignment = Qt::AlignRight;
- // arrow.rect = option.rect;
- // arrow.rect.setLeft(arrow.rect.left() + arrow.rect.width() * 0.7);
- // arrow.state = QStyle::State_DownArrow;
- // QApplication::style()->drawPrimitive(QStyle::PE_IndicatorHeaderArrow, &arrow, painter);
- // }
}
bool ButtonDelegate::editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index)
@@ -258,13 +164,4 @@ QSize ButtonDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelI
}
return QSize(option.rect.width(), option.rect.height() + size + 6);
//QItemDelegate::sizeHint(option,index);
-}
-
-void ButtonDelegate::onComboBoxRelease(QString text, const QAbstractItemModel* model, const QString& scenarioName)
-{
- // find current row of scenario (might have changed due to reordering or insertion)
- int currentScenarioIndex = ScenarioModel::FindScenarioIndex(model, scenarioName);
- ARMARX_CHECK_GREATER(currentScenarioIndex, -1);
- auto index = model->index(currentScenarioIndex, 1);
- emit comboBoxButtonClicked(currentScenarioIndex, index.column(), index.parent(), text);
-}
+}
\ No newline at end of file
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.h b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.h
index d7708b224252eaea96b244e2b6940e3ae982f984..4c3f3ac31a70b823917e9abd5646b2f5a53e92e1 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.h
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.h
@@ -46,7 +46,6 @@ public:
*/
ButtonDelegate(QWidget* parent = 0);
- virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const;
virtual void setEditorData(QWidget* editor, const QModelIndex& index) const;
virtual void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const;
@@ -74,13 +73,10 @@ public:
signals:
void buttonClicked(int row, int column, QModelIndex parent);
- void comboBoxButtonClicked(int row, int column, QModelIndex parent, QString text);
protected:
bool editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index) override;
-private slots:
- void onComboBoxRelease(QString text, const QAbstractItemModel* model, const QString& scenarioName);
private:
std::map<const QModelIndex, QFlags<QStyle::StateFlag>> buttonStates;
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/comboboxbutton.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/comboboxbutton.cpp
deleted file mode 100644
index a459d3204ec1c4b33416d136b687cee51545dcec..0000000000000000000000000000000000000000
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/comboboxbutton.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#include "comboboxbutton.h"
-#include "scenariomodel.h"
-#include <QMouseEvent>
-#include <QStylePainter>
-#include <ArmarXCore/core/logging/Logging.h>
-#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
-#include <ArmarXCore/util/ScenarioManagerCommon/parser/StatusManager.h>
-#include <ArmarXGui/gui-plugins/ScenarioManager/gui/scenarioitem.h>
-
-
-ComboBoxButton::ComboBoxButton(const QAbstractItemModel* model, const QString& scenarioName, QWidget* parent) :
- QComboBox(parent), model(model), buttonPress(false), scenarioName(scenarioName)
-{
-}
-
-ComboBoxButton::~ComboBoxButton()
-{
-}
-
-
-void ComboBoxButton::setIceStatesActive(bool active)
-{
- if (active)
- {
- QObject::connect(this, SIGNAL(currentIndexChanged(QString)), this, SLOT(onIndexChange(QString)));
- }
- else
- {
- QObject::disconnect(this, SIGNAL(currentIndexChanged(QString)), this, SLOT(onIndexChange(QString)));
- }
-}
-
-void ComboBoxButton::paintEvent(QPaintEvent* e)
-{
- if (buttonPress)
- {
- QStylePainter painter(this);
- QStyleOptionComboBox opt;
- opt.rect = e->rect();
- opt.currentIcon = itemIcon(currentIndex());
- opt.currentText = currentText();
- opt.iconSize = iconSize();
- opt.state |= QStyle::State_Sunken;
- painter.drawComplexControl(QStyle::CC_ComboBox, opt);
- painter.drawControl(QStyle::CE_ComboBoxLabel, opt);
- }
- else
- {
- QComboBox::paintEvent(e);
- }
-}
-
-
-void ComboBoxButton::mousePressEvent(QMouseEvent* e)
-{
- if (e->x() < this->width() - 20)
- {
- buttonPress = true;
- }
- else
- {
- QComboBox::mousePressEvent(e);
- }
-}
-
-void ComboBoxButton::mouseReleaseEvent(QMouseEvent* e)
-{
- if (e->x() < this->width() - 20)
- {
- emit released(this->currentText(), model, scenarioName);
- }
- else
- {
- QComboBox::mouseReleaseEvent(e);
- }
- buttonPress = false;
-}
-
-void ComboBoxButton::onIndexChange(const QString& text)
-{
- ScenarioManager::StatusManager statusManager;
-
- ScenarioItem* item = ScenarioModel::FindScenario(model, scenarioName);
- ARMARX_CHECK_EXPRESSION(item) << scenarioName.toStdString();
-
- statusManager.setIceScenario(item->getScenario(), false);
-}
-
-
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/comboboxbutton.h b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/comboboxbutton.h
deleted file mode 100644
index 951b1bb1dd53b0b5e6aaa2a361e458159fc2c60d..0000000000000000000000000000000000000000
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/comboboxbutton.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef COMBOBOXBUTTON_H
-#define COMBOBOXBUTTON_H
-
-
-#include <QComboBox>
-
-class ComboBoxButton : public QComboBox
-{
- Q_OBJECT
-
-public:
- explicit ComboBoxButton(const QAbstractItemModel* model, const QString& scenarioName, QWidget* parent = 0);
- ~ComboBoxButton();
- void setIceStatesActive(bool active);
-
-signals:
- void released(QString, const QAbstractItemModel*, QString);
-
-
-protected:
- virtual void mouseReleaseEvent(QMouseEvent* e);
- virtual void mousePressEvent(QMouseEvent* e);
- virtual void paintEvent(QPaintEvent* e);
-
-private slots:
- void onIndexChange(const QString& text);
-
-
-private:
- const QAbstractItemModel* model;
- bool buttonPress;
- QString scenarioName;
-};
-
-#endif // COMBOBOXBUTTON_H
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/detailedapplicationview.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/detailedapplicationview.cpp
index ac0e8a169c0a7498cf641bd22b45a31b5d19fe17..e09338d2c1b84298e67eaddf663bb35bda34c033 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/detailedapplicationview.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/detailedapplicationview.cpp
@@ -397,7 +397,7 @@ void DetailedApplicationView::showApplicationInstance(ApplicationInstancePtr app
appIcePropertyTopItem->addSubProperty(nodePropertyItem);
QtVariantProperty* iceAutoRestartItem = variantManager->addProperty(QVariant::Bool, "Ice Auto Restart");
- iceAutoRestartItem->setValue(appInstance->getIceAutoRestart());
+// iceAutoRestartItem->setValue(appInstance->getIceAutoRestart());
iceAutoRestartItem->setToolTip("Describes if Ice should automatically restart this Application");
iceAutoRestartItem->setAttribute("enabled", QVariant(appInstance->isReadOnly()));
appIcePropertyTopItem->addSubProperty(iceAutoRestartItem);
@@ -571,50 +571,6 @@ void DetailedApplicationView::showScenario(ScenarioPtr scenario)
}
}
- QtProperty* scenarioIcePropertyTopItem = variantManager->addProperty(QtVariantPropertyManager::groupTypeId(),
- QLatin1String("Scenario Ice Deployment Properties"));
- scenarioTopItem->addSubProperty(scenarioIcePropertyTopItem);
-
- QtVariantProperty* scenarioDeploymentTypeItem = nullptr;
- if (readOnly)
- {
- scenarioDeploymentTypeItem = variantManager->addProperty(
- QVariant::String,
- QString::fromStdString("Deployment Type"));
- scenarioDeploymentTypeItem->setValue(
- scenario->getScenarioDeploymentType() == ScenarioDeploymentType::Local ? "Local" : "Remote");
- scenarioDeploymentTypeItem->setAttribute(QLatin1String("readOnly"), QVariant(true));
- }
- else
- {
- scenarioDeploymentTypeItem = variantManager->addProperty(
- QtVariantPropertyManager::enumTypeId(),
- QString::fromStdString("Deployment Type"));
- scenarioDeploymentTypeItem->setAttribute("enumNames", scenario->getScenarioDeploymentType() == ScenarioDeploymentType::Local ? QStringList({"Local", "Remote"}) : QStringList({"Remote", "Local"}));
- }
- scenarioDeploymentTypeItem->setToolTip("Describes if the Scenario should either use the Local build for Ice deployment or an Remote sync directory");
- scenarioIcePropertyTopItem->addSubProperty(scenarioDeploymentTypeItem);
-
- QtVariantProperty* nodePropertyItem = variantManager->addProperty(QVariant::String, "Node Name");
- nodePropertyItem->setValue(QString::fromStdString(scenario->getNodeName()));
- nodePropertyItem->setToolTip("Describes on which Node the currently applications of the current scenario should be deployed on. Can be overwritten for each application.");
- nodePropertyItem->setAttribute(QLatin1String("readOnly"), QVariant(scenario->isReadOnly()));
- scenarioIcePropertyTopItem->addSubProperty(nodePropertyItem);
-
-
- QtProperty* scenarioIceEnvVarsTopItem = variantManager->addProperty(QtVariantPropertyManager::groupTypeId(),
- QLatin1String("Ice Enviroment Variables"));
- scenarioIcePropertyTopItem->addSubProperty(scenarioIceEnvVarsTopItem);
-
- for (const auto& envVar : scenario->getIceEnviromentVariables())
- {
- QtVariantProperty* iceEnvVarItem = variantManager->addProperty(QVariant::String, QString::fromStdString(envVar.first));
- iceEnvVarItem->setValue(QString::fromStdString(envVar.second));
- iceEnvVarItem->setAttribute(QLatin1String("readOnly"), QVariant(scenario->isReadOnly()));
- scenarioIceEnvVarsTopItem->addSubProperty(iceEnvVarItem);
- }
-
-
ui->propertyBrowser->addProperty(scenarioTopItem);
ui->propertyBrowser->setRootIsDecorated(false);
}
@@ -780,12 +736,6 @@ void DetailedApplicationView::on_addParameterButton_clicked()
emit addParameterButtonClicked();
}
-void DetailedApplicationView::on_addIceEnvButton_clicked()
-{
- ARMARX_INFO << "on_addIceEnvButton_clicked";
- emit addIceEnvButtonClicked();
-}
-
void DetailedApplicationView::on_toolButton_clicked()
{
emit toolButtonClicked();
@@ -898,17 +848,6 @@ void DetailedApplicationView::itemChanged(QtProperty* property, const QVariant&
}
updateTimer.start(UPDATE_TIMER_INTERVAL);
}
- else if (property->propertyName() == "Node Name")
- {
- ARMARX_INFO << "Setting node name to " << property->valueText().toStdString();
- lastAppInstance->setNodeName(property->valueText().toStdString());
- updateTimer.start(UPDATE_TIMER_INTERVAL);
- }
- else if (property->propertyName() == "Ice Auto Restart")
- {
- lastAppInstance->setIceAutoRestart(property->valueText() == "True");
- updateTimer.start(UPDATE_TIMER_INTERVAL);
- }
else if (property->propertyName().compare("Instance Name") && properties->getProperty(property->propertyName().toStdString()).compare(value.toString().toStdString()))
{
lastAppInstance->modifyProperty(property->propertyName().toStdString(), property->valueText().toStdString());
@@ -938,23 +877,6 @@ void DetailedApplicationView::itemChanged(QtProperty* property, const QVariant&
{
return;
}
- else if (property->propertyName() == "Deployment Type")
- {
- if (property->valueText() == "Local")
- {
- lastScenario->setScenarioDeploymentType(ScenarioDeploymentType::Local);
- }
- else if (property->valueText() == "Remote")
- {
- lastScenario->setScenarioDeploymentType(ScenarioDeploymentType::Remote);
- }
-
- updateTimer.start(UPDATE_TIMER_INTERVAL);
- }
- else if (property->propertyName() == "Node Name")
- {
- lastScenario->setNodeName(property->valueText().toStdString());
- }
else if (properties->getProperty(property->propertyName().toStdString()) != ""
&& properties->getProperty(property->propertyName().toStdString()).compare(value.toString().toStdString()))
{
@@ -963,12 +885,6 @@ void DetailedApplicationView::itemChanged(QtProperty* property, const QVariant&
updateTimer.start(UPDATE_TIMER_INTERVAL);
}
- else if (lastScenario->getIceEnviromentVariables()[property->propertyName().toStdString()] != ""
- && lastScenario->getIceEnviromentVariables()[property->propertyName().toStdString()] != value.toString().toStdString())
- {
- lastScenario->addIceEnviromentVariable(property->propertyName().toStdString(), value.toString().toStdString());
- updateTimer.start(UPDATE_TIMER_INTERVAL);
- }
}
}
}
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/detailedapplicationview.h b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/detailedapplicationview.h
index e88c0e0917ac61928bee6c5452b1dc60c7f1ba8b..20d3aa6fbc35bf3ca0feee63a4fddd10ff64127d 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/detailedapplicationview.h
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/detailedapplicationview.h
@@ -93,7 +93,6 @@ signals:
void stopButtonClicked();
void restartButtonClicked();
void addParameterButtonClicked();
- void addIceEnvButtonClicked();
void toolButtonClicked();
void makeLocalButtonClicked();
void saveScenario(ScenarioManager::Data_Structure::ApplicationInstancePtr application);
@@ -117,7 +116,6 @@ private slots:
void on_restartButton_clicked();
void on_addParameterButton_clicked();
- void on_addIceEnvButton_clicked();
void on_toolButton_clicked();
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp
index 63ba13ad97f68183560194d44c3e6d67531035c0..fc2c07ba9c9c1873d86a506d081eaabf14470e8f 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp
@@ -27,7 +27,6 @@
#include <ArmarXGui/gui-plugins/ScenarioManager/gui/ui_scenariolistview.h>
#include "scenarioitem.h"
#include "treeitem.h"
-#include "comboboxbutton.h"
#include <ArmarXCore/core/logging/Logging.h>
@@ -69,8 +68,6 @@ ScenarioListView::ScenarioListView(QWidget* parent) :
QObject::connect(&removeAction, SIGNAL(triggered()),
this, SLOT(removeItemTriggered()));
- QObject::connect(&startButtonDelegate, SIGNAL(comboBoxButtonClicked(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)));
@@ -87,11 +84,10 @@ ScenarioListView::~ScenarioListView()
delete ui;
}
-void ScenarioListView::setModel(FilterableTreeModelSortFilterProxyModelPtr model)
+void ScenarioListView::setModel(FilterableTreeModelSortFilterProxyModelPtr treeModel)
{
- this->model = model;
+ this->model = treeModel;
ui->treeView->setModel(model.get());
- QObject::connect(this->model.get(), SIGNAL(dataChanged(QModelIndex, QModelIndex)), this, SLOT(onModelDataChange(QModelIndex, QModelIndex)));
ui->treeView->setColumnWidth(0, 200);
ui->treeView->setColumnWidth(1, 90);
@@ -106,14 +102,9 @@ void ScenarioListView::on_searchBar_textEdited(const QString& text)
ui->treeView->expandAll();
}
-void ScenarioListView::startComboBoxClicked(int row, int column, QModelIndex parent, QString text)
-{
- emit startApplication(row, column, parent, LocalStart);
-}
-
void ScenarioListView::startButtonClicked(int row, int column, QModelIndex parent)
{
- emit startApplication(row, column, parent, LocalStart);
+ emit startApplication(row, column, parent);
}
void ScenarioListView::stopButtonClicked(int row, int column, QModelIndex parent)
@@ -136,27 +127,10 @@ void ScenarioListView::on_openButton_clicked()
emit showOpenDialog();
}
-void ScenarioListView::updateScenarioIndices()
-{
- for (int i = 0; i < this->model->rowCount(); ++i)
- {
- auto index = this->model->index(i, 1);
- ui->treeView->openPersistentEditor(index);
- // auto w = ui->treeView->indexWidget(index);
- // ComboBoxButton* cb = qobject_cast<ComboBoxButton*>(w);
- // if (cb)
- // {
- // cb->setScenarioIndex(index);
- // }
- }
-}
-
void ScenarioListView::removeItemTriggered()
{
QModelIndex index = ui->treeView->currentIndex();
emit removeItem(index);
- updateScenarioIndices();
-
}
void ScenarioListView::on_treeView_clicked(const QModelIndex& index)
@@ -175,8 +149,3 @@ void ScenarioListView::onCustomContextMenu(const QPoint& point)
QMenu::exec(actions, ui->treeView->mapToGlobal(point));
}
-
-void ScenarioListView::onModelDataChange(QModelIndex start, QModelIndex end)
-{
- updateScenarioIndices();
-}
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.h b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.h
index 8365c31dafccec6a155f688cd7b5b6c071ca2b04..ff1195a65e42da2e82fc86e4524d134c9871932c 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.h
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.h
@@ -41,11 +41,6 @@ namespace Ui
class ScenarioListView;
}
-enum ScenarioStartModes
-{
- LocalStart = 1, //Start the Scenario Local
-};
-
/**
* @class ScenarioListView
* @brief View that shows a list of Scenarios.
@@ -68,7 +63,7 @@ public:
~ScenarioListView() override;
signals:
- void startApplication(int row, int column, QModelIndex parent, ScenarioStartModes startMode);
+ void startApplication(int row, int column, QModelIndex parent);
void stopApplication(int row, int column, QModelIndex parent);
void restartApplication(int row, int column, QModelIndex parent);
void createScenario();
@@ -85,7 +80,6 @@ public slots:
private slots:
void on_searchBar_textEdited(const 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);
@@ -99,7 +93,6 @@ private slots:
void onCustomContextMenu(const QPoint& point);
void on_treeView_clicked(const QModelIndex& index);
- void onModelDataChange(QModelIndex start, QModelIndex end);
private:
Ui::ScenarioListView* ui;
FilterableTreeModelSortFilterProxyModelPtr model;
@@ -108,6 +101,5 @@ private:
ButtonDelegate restartButtonDelegate;
QMenu contextMenu;
QAction removeAction;
- void updateScenarioIndices();
};
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariomodel.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariomodel.cpp
index c1c071c377224ca257f51bad0fd59fb413d23248..9e54e69ebd0d00d6d0212c3cb1e7dc06f8824561 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariomodel.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariomodel.cpp
@@ -140,10 +140,10 @@ Qt::ItemFlags ScenarioModel::flags(const QModelIndex& index) const
{
Qt::ItemFlags defaultFlags = QAbstractItemModel::flags(index);
- if (index.data().toString().compare("Start") == 0 && !index.parent().isValid())
- {
- return Qt::ItemIsDropEnabled | Qt::ItemIsEditable | Qt::ItemIsUserCheckable | defaultFlags;
- }
+// if (index.data().toString().compare("Start") == 0 && !index.parent().isValid())
+// {
+// return Qt::ItemIsDropEnabled | Qt::ItemIsEditable | Qt::ItemIsUserCheckable | defaultFlags;
+// }
return Qt::ItemIsDropEnabled | defaultFlags;
}
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/settingsview.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/settingsview.cpp
index 409c690e954d23ca1f91f5561ed0b5f96c7c0cad..ea51bf889f144ae81afe12261814367212b8cfe1 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/settingsview.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/settingsview.cpp
@@ -54,9 +54,6 @@ SettingsView::SettingsView(QWidget* parent) :
QObject::connect(ui->closeUnavailablePackagesButton, &QPushButton::pressed,
this, &This::closeUnavailablePackages);
-
- ScenarioManager::Generator::IceGridXmlGenerator generator;
- ui->currentPath->setText(QString::fromStdString(generator.getDefaultSyncFile()));
}
SettingsView::~SettingsView()
@@ -169,6 +166,4 @@ void SettingsView::on_toolButton_clicked()
ARMARX_INFO_S << dir.toStdString();
generator.setDefaultSyncFileDir(dir.toStdString());
-
- ui->currentPath->setText(QString::fromStdString(generator.getDefaultSyncFile()));
}
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/test/DataStructureTest.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/test/DataStructureTest.cpp
index 124324a413521110806ac1182116b861d8dd804b..d681ad7996de1f38fe21bd0f7a8f174b0de30784 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/test/DataStructureTest.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/test/DataStructureTest.cpp
@@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE(ApplicationInitialization)
for (const auto& app : *apps)
{
i++;
- ApplicationInstancePtr ai = ApplicationInstancePtr(new ApplicationInstance((*app), "instance" + std::to_string(i), "", s, "NodeMain", false, true));
+ ApplicationInstancePtr ai = ApplicationInstancePtr(new ApplicationInstance((*app), "instance" + std::to_string(i), "", s, "NodeMain", false));
if (i == 1)
{
aip = ai;
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/test/XMLScenarioParserTest.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/test/XMLScenarioParserTest.cpp
index b8b7b1e65f18c80ff05a34c668747fc85144348f..df72155ce323e4ed1ac4c9826ef3f884c4fc3398 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/test/XMLScenarioParserTest.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/test/XMLScenarioParserTest.cpp
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE(IceParserLoadFromXml_DebugObserverTest)
{
//init app for test
app1 = ApplicationPtr(new Application("DebugObserver", "not relevant", "ArmarXCore"));
- api1 = ApplicationInstancePtr(new ApplicationInstance((*app1), "", "not relevant", s, "NodeMain", false, true));
+ api1 = ApplicationInstancePtr(new ApplicationInstance((*app1), "", "not relevant", s, "NodeMain", false));
//find DebugObserver.xml file
std::string relativeFilename("ArmarXGui/ScenarioManagerTestData/xmlCache/ArmarXCore.DebugObserver.xml");
@@ -120,7 +120,7 @@ BOOST_AUTO_TEST_CASE(IceParserLoadFromXml_HeadIKUnitTest)
{
//init app for test
app1 = ApplicationPtr(new Application("HeadIKUnit", "not relevant", "RobotApi"));
- api1 = ApplicationInstancePtr(new ApplicationInstance((*app1), "", "not relevant", s, "NodeMain", false, true));
+ api1 = ApplicationInstancePtr(new ApplicationInstance((*app1), "", "not relevant", s, "NodeMain", false));
//find DebugObserver.xml file
std::string relativeFilename("ArmarXGui/ScenarioManagerTestData/xmlCache/RobotAPI.HeadIKUnit.xml");
@@ -160,7 +160,7 @@ BOOST_AUTO_TEST_CASE(IceParserLoadFromXml_DepthImageProviderDynamicSimulationApp
{
//init app for test
app1 = ApplicationPtr(new Application("DepthImageProviderDynamicSimulationApp", "not relevant", "ArmarXSimulation"));
- api1 = ApplicationInstancePtr(new ApplicationInstance((*app1), "", "not relevant", s, "NodeMain", false, true));
+ api1 = ApplicationInstancePtr(new ApplicationInstance((*app1), "", "not relevant", s, "NodeMain", false));
//find DebugObserver.xml file
std::string relativeFilename("ArmarXGui/ScenarioManagerTestData/xmlCache/ArmarXSimulation.DepthImageProviderDynamicSimulationApp.xml");