summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro S. Andrade <sandroandrade@kde.org>2013-11-27 09:57:08 -0300
committerSandro S. Andrade <sandroandrade@kde.org>2013-11-27 14:02:05 +0100
commita0986a9f3f90633d620034d2f722467980f9383e (patch)
tree657a5e6f27dcef9f1d7bbac1f13f2bfce402d588
parent491e464197ee619fa718c1acef9cd555e9ad34b6 (diff)
Clear current design space location before loading a new location
Change-Id: Id1bf4497c6b66057e3506242972b426242689a6f Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>
-rw-r--r--examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.cpp9
-rw-r--r--examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.h2
2 files changed, 4 insertions, 7 deletions
diff --git a/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.cpp b/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.cpp
index 7950d10a..c07fb6e5 100644
--- a/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.cpp
+++ b/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.cpp
@@ -40,8 +40,6 @@
****************************************************************************/
#include "designspaceexplorerplugin.h"
-#include <QDebug>
-
#include <duseinterfaces/iuicontroller.h>
#include <duseinterfaces/iprojectcontroller.h>
@@ -252,7 +250,6 @@ void DesignSpaceExplorerPlugin::newDuseDesign()
foreach (QDuseDesignDimension *designDimension, designSpace->designDimensions()) {
foreach (const QString &body, designDimension->instanceSelectionRule()->bodies()) {
- qDebug() << body;
QScriptValue value = _engine.evaluate(body);
if (value.toVariant().canConvert(QMetaType::type("QVariantList"))) {
foreach (const QVariant &variant, value.toVariant().value<QVariantList>()) {
@@ -268,7 +265,6 @@ void DesignSpaceExplorerPlugin::newDuseDesign()
designDimensionInstance->setTargetInstance(qmodelingelementproperty_cast<QUmlElement *>(value.toVariant().value<QObject *>()));
designDimension->addDesignDimensionInstance(designDimensionInstance);
}
- qDebug() << "result: " << value.toVariant();
}
}
@@ -296,7 +292,7 @@ void DesignSpaceExplorerPlugin::populateDesignSpaceExplorer()
comboBox->addItem(variationPoint->asQModelingObject()->objectName());
}
_designSpaceExplorer->setCellWidget(row, 2, comboBox);
- connect(comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(designSpaceChanged()));
+ connect(comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(currentDesignSpaceLocationChanged()));
++row;
}
}
@@ -307,9 +303,10 @@ void DesignSpaceExplorerPlugin::openDuseDesign()
{
}
-void DesignSpaceExplorerPlugin::designSpaceChanged()
+void DesignSpaceExplorerPlugin::currentDesignSpaceLocationChanged()
{
qDeleteAll(_currentDesignSpaceLocation);
+ _currentDesignSpaceLocation.clear();
// QXmiReader reader;
// QFile inputModel(_newDuseDesignDialog->_inputModelFileName);
// if (!inputModel.open(QFile::ReadOnly | QFile::Text)) {
diff --git a/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.h b/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.h
index 8fcee654..b91028ab 100644
--- a/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.h
+++ b/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.h
@@ -73,7 +73,7 @@ public:
private Q_SLOTS:
void newDuseDesign();
void openDuseDesign();
- void designSpaceChanged();
+ void currentDesignSpaceLocationChanged();
private:
DuSE::ICore *_core;