From fd3ab159e2d8fa798ed8b9bc1c2d11b304093880 Mon Sep 17 00:00:00 2001
From: Mirko Waechter <mirko.waechter@kit.edu>
Date: Fri, 17 Mar 2017 01:14:52 +0100
Subject: [PATCH] adapted to core changes
---
.../StatechartEditorPlugin/StateEditorController.cpp | 2 +-
.../StatechartEditorPlugin/StateEditorController.h | 4 ++--
.../StatechartEditorPlugin/StateTreeController.cpp | 2 +-
.../StatechartEditorPlugin/StateTreeController.h | 4 ++--
.../StatechartEditorController.h | 2 +-
.../view/StatechartEditorMainWindow.h | 4 ++--
.../view/dialogs/EditStatechartGroupDialog.cpp | 4 ++--
.../view/dialogs/StateDialog.cpp | 4 ++--
.../StatechartEditorPlugin/view/dialogs/StateDialog.h | 2 +-
.../StatechartEventSenderPlugin/StateParameterEditor.h | 10 +++++-----
.../gui-plugins/StatechartViewerPlugin/StateWatcher.h | 2 +-
11 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateEditorController.cpp b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateEditorController.cpp
index caf9d0ca..43ffa05b 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateEditorController.cpp
+++ b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateEditorController.cpp
@@ -38,7 +38,7 @@
namespace armarx
{
- StateEditorController::StateEditorController(StatechartEditorMainWindow* mainWindow, StateTreeControllerPtr treeController, Ice::CommunicatorPtr communicator, VariantInfoPtr variantInfo, StatechartProfiles::StatechartProfilePtr currentProfile, QPointer<TipDialog> tipDialog, QObject* parent) :
+ StateEditorController::StateEditorController(StatechartEditorMainWindow* mainWindow, StateTreeControllerPtr treeController, Ice::CommunicatorPtr communicator, VariantInfoPtr variantInfo, StatechartProfilePtr currentProfile, QPointer<TipDialog> tipDialog, QObject* parent) :
QObject(parent),
mainWindow(mainWindow),
treeController(treeController),
diff --git a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateEditorController.h b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateEditorController.h
index e811aa9f..c041cdb5 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateEditorController.h
+++ b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateEditorController.h
@@ -54,7 +54,7 @@ namespace armarx
Q_OBJECT
public:
- explicit StateEditorController(StatechartEditorMainWindow* mainWindow, StateTreeControllerPtr treeController, Ice::CommunicatorPtr communicator, VariantInfoPtr variantInfo, StatechartProfiles::StatechartProfilePtr currentProfile, QPointer<TipDialog> tipDialog, QObject* parent = 0);
+ explicit StateEditorController(StatechartEditorMainWindow* mainWindow, StateTreeControllerPtr treeController, Ice::CommunicatorPtr communicator, VariantInfoPtr variantInfo, StatechartProfilePtr currentProfile, QPointer<TipDialog> tipDialog, QObject* parent = 0);
QList<QString> getRelevantProfiles() const;
signals:
@@ -77,7 +77,7 @@ namespace armarx
EditorFileOpener opener;
Ice::CommunicatorPtr communicator;
VariantInfoPtr variantInfo;
- StatechartProfiles::StatechartProfilePtr currentProfile;
+ StatechartProfilePtr currentProfile;
QPointer<TipDialog> tipDialog;
bool lockRemoteStates;
QMenu menu;
diff --git a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateTreeController.cpp b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateTreeController.cpp
index 29b4bbed..70680f64 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateTreeController.cpp
+++ b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateTreeController.cpp
@@ -54,7 +54,7 @@ using namespace armarx;
using namespace statechartio;
using namespace statechartmodel;
-StateTreeController::StateTreeController(Ice::CommunicatorPtr ic, VariantInfoPtr variantInfo, QList<QVariant> headerInfo, QTreeView* treeView, QLineEdit* filterLineEdit, const ArmarXPackageToolInterfacePtr& packageTool, const StatechartProfilesPtr& statechartProfiles, StatechartProfiles::StatechartProfilePtr currentProfile, QObject* parent)
+StateTreeController::StateTreeController(Ice::CommunicatorPtr ic, VariantInfoPtr variantInfo, QList<QVariant> headerInfo, QTreeView* treeView, QLineEdit* filterLineEdit, const ArmarXPackageToolInterfacePtr& packageTool, const StatechartProfilesPtr& statechartProfiles, StatechartProfilePtr currentProfile, QObject* parent)
: QAbstractItemModel(parent)
{
qRegisterMetaType<StateTreeNodePtr>("StateTreeNodePtr");
diff --git a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateTreeController.h b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateTreeController.h
index 800e689d..6a0e6bd5 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateTreeController.h
+++ b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateTreeController.h
@@ -64,7 +64,7 @@ namespace armarx
Q_OBJECT
public:
- StateTreeController(Ice::CommunicatorPtr ic, VariantInfoPtr variantInfo, QList<QVariant> headerInfo, QTreeView* treeView, QLineEdit* filterLineEdit, const ArmarXPackageToolInterfacePtr& packageTool, const StatechartProfilesPtr& statechartProfiles, StatechartProfiles::StatechartProfilePtr currentProfile, QObject* parent = 0);
+ StateTreeController(Ice::CommunicatorPtr ic, VariantInfoPtr variantInfo, QList<QVariant> headerInfo, QTreeView* treeView, QLineEdit* filterLineEdit, const ArmarXPackageToolInterfacePtr& packageTool, const StatechartProfilesPtr& statechartProfiles, StatechartProfilePtr currentProfile, QObject* parent = 0);
~StateTreeController();
QVariant data(const QModelIndex& index, int role) const;
@@ -191,7 +191,7 @@ namespace armarx
QMap<QString, QProcess*> processes;
VariantInfoPtr variantInfo;
StatechartProfilesPtr profiles;
- StatechartProfiles::StatechartProfilePtr currentProfile;
+ StatechartProfilePtr currentProfile;
Ice::CommunicatorPtr communicator;
struct StateMimeData : AbstractStateMimeData
diff --git a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StatechartEditorController.h b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StatechartEditorController.h
index 4ea0c6e1..46aebb5e 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StatechartEditorController.h
+++ b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StatechartEditorController.h
@@ -209,7 +209,7 @@ namespace armarx
QStringList groupsToLoad;
bool lockRemoteStates;
bool openAllStatesWasSelected;
- StatechartProfiles::StatechartProfilePtr selectedProfile;
+ StatechartProfilePtr selectedProfile;
} config;
diff --git a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/StatechartEditorMainWindow.h b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/StatechartEditorMainWindow.h
index 3b38eb54..1422b057 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/StatechartEditorMainWindow.h
+++ b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/StatechartEditorMainWindow.h
@@ -60,7 +60,7 @@ namespace armarx
{
this->variantInfo = variantInfo;
}
- void setCurrentProfile(StatechartProfiles::StatechartProfilePtr currentProfile)
+ void setCurrentProfile(StatechartProfilePtr currentProfile)
{
this->currentProfile = currentProfile;
}
@@ -87,7 +87,7 @@ namespace armarx
CppHighlighter* highlighter;
Ice::CommunicatorPtr communicator;
VariantInfoPtr variantInfo;
- StatechartProfiles::StatechartProfilePtr currentProfile;
+ StatechartProfilePtr currentProfile;
QPointer<TipDialog> tipDialog;
};
diff --git a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/EditStatechartGroupDialog.cpp b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/EditStatechartGroupDialog.cpp
index d37259a3..0e349f47 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/EditStatechartGroupDialog.cpp
+++ b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/EditStatechartGroupDialog.cpp
@@ -125,13 +125,13 @@ namespace armarx
connect(ui->lineEditProxyFilter, SIGNAL(textChanged(QString)), filterModel, SLOT(setFilterFixedString(QString)));
- std::list<StatechartProfiles::StatechartProfilePtr> profileQueue;
+ std::list<StatechartProfilePtr> profileQueue;
profileQueue.push_back(statechartProfiles->getRootProfile());
connect(ui->comboBoxStatechartProfiles, SIGNAL(currentIndexChanged(QString)), this, SLOT(updateConfigurationTextField(QString)));
connect(ui->tabWidget, SIGNAL(currentChanged(int)), this, SLOT(updateConfigurationContent(int)));
while (!profileQueue.empty())
{
- StatechartProfiles::StatechartProfilePtr currentProfile = profileQueue.front();
+ StatechartProfilePtr currentProfile = profileQueue.front();
profileQueue.pop_front();
ui->comboBoxStatechartProfiles->addItem(QString(currentProfile->getNesting(), '-') + " " + QString::fromStdString(currentProfile->getName()),
QString::fromStdString(currentProfile->getName()));
diff --git a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StateDialog.cpp b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StateDialog.cpp
index 90942941..1ecbff35 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StateDialog.cpp
+++ b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StateDialog.cpp
@@ -43,7 +43,7 @@ namespace armarx
QMap<QString, DynamicLibraryPtr> StateDialog::Libraries = QMap<QString, DynamicLibraryPtr>();
- StateDialog::StateDialog(statechartmodel::StateInstancePtr stateInstance, Ice::CommunicatorPtr communicator, VariantInfoPtr variantInfo, StatechartProfiles::StatechartProfilePtr currentProfile, bool locked, bool readOnly, QPointer<TipDialog> tipDialog, QWidget* parent) :
+ StateDialog::StateDialog(statechartmodel::StateInstancePtr stateInstance, Ice::CommunicatorPtr communicator, VariantInfoPtr variantInfo, StatechartProfilePtr currentProfile, bool locked, bool readOnly, QPointer<TipDialog> tipDialog, QWidget* parent) :
QDialog(parent),
ui(new Ui::StateDialog),
stateInstance(stateInstance),
@@ -399,7 +399,7 @@ namespace armarx
statechartmodel::StateParameterMap newValues = parameterEditor.getStateParameters();
QSet<QString> profiles;
- StatechartProfiles::StatechartProfilePtr p = currentProfile;
+ StatechartProfilePtr p = currentProfile;
while (p)
{
diff --git a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StateDialog.h b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StateDialog.h
index 1415d6c9..9f6d9865 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StateDialog.h
+++ b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StateDialog.h
@@ -53,7 +53,7 @@ namespace armarx
Q_OBJECT
public:
- explicit StateDialog(statechartmodel::StateInstancePtr stateInstance, Ice::CommunicatorPtr communicator, VariantInfoPtr variantInfo, StatechartProfiles::StatechartProfilePtr currentProfile, bool locked, bool readOnly, QPointer<TipDialog> tipDialog, QWidget* parent = 0);
+ explicit StateDialog(statechartmodel::StateInstancePtr stateInstance, Ice::CommunicatorPtr communicator, VariantInfoPtr variantInfo, StatechartProfilePtr currentProfile, bool locked, bool readOnly, QPointer<TipDialog> tipDialog, QWidget* parent = 0);
~StateDialog();
statechartmodel::StateParameterMap getInputParams() const;
diff --git a/source/ArmarXGui/gui-plugins/StatechartEventSenderPlugin/StateParameterEditor.h b/source/ArmarXGui/gui-plugins/StatechartEventSenderPlugin/StateParameterEditor.h
index 0197bfd9..5b3a35ab 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEventSenderPlugin/StateParameterEditor.h
+++ b/source/ArmarXGui/gui-plugins/StatechartEventSenderPlugin/StateParameterEditor.h
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
- * @package
- * @author
- * @date
+ * @package
+ * @author
+ * @date
* @copyright http://www.gnu.org/licenses/gpl-2.0.txt
* GNU General Public License
*/
@@ -62,7 +62,7 @@ namespace armarx
{
this->variantInfo = variantInfo;
}
- void setCurrentProfile(StatechartProfiles::StatechartProfilePtr currentProfile)
+ void setCurrentProfile(StatechartProfilePtr currentProfile)
{
this->currentProfile = currentProfile;
}
@@ -121,7 +121,7 @@ namespace armarx
VariantInfoPtr variantInfo;
Qt::CheckState defaultValueState;
QSet<QString> keyBlackList;
- StatechartProfiles::StatechartProfilePtr currentProfile;
+ StatechartProfilePtr currentProfile;
};
diff --git a/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.h b/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.h
index 0c11c7dc..9e79481b 100644
--- a/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.h
+++ b/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.h
@@ -25,7 +25,7 @@
#include <ArmarXGui/gui-plugins/StatechartViewerPlugin/model/State.h>
#include <ArmarXCore/observers/variant/DatafieldRef.h>
-
+#include <ArmarXCore/core/services/tasks/PeriodicTask.h>
#include <ArmarXCore/interface/observers/ProfilerObserverInterface.h>
namespace armarx
--
GitLab