Merge branch 'master' into pendulum.

opencor · Apr 24, 2019 · f0bfc59 · f0bfc59
1 parent a8c71fc
commit f0bfc59
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 21 deletions.
diff --git a/src/plugins/simulation/PendulumWindow/CMakeLists.txt b/src/plugins/simulation/PendulumWindow/CMakeLists.txt
@@ -11,9 +11,6 @@ ADD_PLUGIN(PendulumWindow
 
         src/pendulumwindowplugin.cpp
         src/pendulumwindowwindow.cpp
-    HEADERS_MOC
-        src/pendulumwindowplugin.h
-        src/pendulumwindowwindow.h
     UIS
         src/pendulumwindowwindow.ui
     PLUGINS

diff --git a/src/plugins/simulation/PendulumWindow/src/pendulumwindowplugin.cpp b/src/plugins/simulation/PendulumWindow/src/pendulumwindowplugin.cpp
@@ -43,7 +43,7 @@ PLUGININFO_FUNC PendulumWindowPluginInfo()
     descriptions.insert("en", QString::fromUtf8("a plugin to test the pendulum model."));
     descriptions.insert("fr", QString::fromUtf8("une extension pour tester le modèle du pendule."));
 
-    return new PluginInfo(PluginInfo::Simulation, false, false,
+    return new PluginInfo(PluginInfo::Category::Simulation, false, false,
                           QStringList() << "ZincWidget",
                           descriptions);
 }
@@ -120,7 +120,7 @@ void PendulumWindowPlugin::pluginsInitialized(const Plugins &pLoadedPlugins)
 
 //==============================================================================
 
-void PendulumWindowPlugin::loadSettings(QSettings *pSettings)
+void PendulumWindowPlugin::loadSettings(QSettings &pSettings)
 {
     Q_UNUSED(pSettings);
 
@@ -129,7 +129,7 @@ void PendulumWindowPlugin::loadSettings(QSettings *pSettings)
 
 //==============================================================================
 
-void PendulumWindowPlugin::saveSettings(QSettings *pSettings) const
+void PendulumWindowPlugin::saveSettings(QSettings &pSettings) const
 {
     Q_UNUSED(pSettings);
 

diff --git a/src/plugins/simulation/PendulumWindow/src/pendulumwindowwindow.cpp b/src/plugins/simulation/PendulumWindow/src/pendulumwindowwindow.cpp
@@ -40,13 +40,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#include "opencmiss/zinc/fieldarithmeticoperators.hpp"
-#include "opencmiss/zinc/fieldcomposite.hpp"
-#include "opencmiss/zinc/fieldconstant.hpp"
-#include "opencmiss/zinc/fieldcoordinatetransformation.hpp"
-#include "opencmiss/zinc/fieldmodule.hpp"
-#include "opencmiss/zinc/fieldtime.hpp"
-#include "opencmiss/zinc/fieldvectoroperators.hpp"
+#include "zincbegin.h"
+    #include "opencmiss/zinc/fieldarithmeticoperators.hpp"
+    #include "opencmiss/zinc/fieldcomposite.hpp"
+    #include "opencmiss/zinc/fieldconstant.hpp"
+    #include "opencmiss/zinc/fieldcoordinatetransformation.hpp"
+    #include "opencmiss/zinc/fieldmodule.hpp"
+    #include "opencmiss/zinc/fieldtime.hpp"
+    #include "opencmiss/zinc/fieldvectoroperators.hpp"
+#include "zincend.h"
 
 //==============================================================================
 
@@ -90,7 +92,7 @@ PendulumWindowWindow::PendulumWindowWindow(QWidget *pParent) :
 
     Core::Widget *timeWidget = new Core::Widget(QSize(), this);
 
-    timeWidget->createLayout(Core::Widget::HorizontalLayout);
+    timeWidget->createLayout(Core::Widget::Layout::Horizontal);
 
     mTimeLabel = new QLabel(timeWidget);
 

diff --git a/src/plugins/simulation/PendulumWindow/src/pendulumwindowwindow.h b/src/plugins/simulation/PendulumWindow/src/pendulumwindowwindow.h
@@ -34,8 +34,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-#include "opencmiss/zinc/fieldfiniteelement.hpp"
-#include "opencmiss/zinc/timekeeper.hpp"
+#include "zincbegin.h"
+    #include "opencmiss/zinc/fieldfiniteelement.hpp"
+    #include "opencmiss/zinc/timekeeper.hpp"
+#include "zincend.h"
 
 //==============================================================================
 

diff --git a/src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewwidget.cpp b/src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewwidget.cpp
@@ -588,10 +588,10 @@ void SimulationExperimentViewWidget::checkSimulationResults(const QString &pFile
         }
 
         if (   q1Parameter && thetaParameter && r0Parameter
-            && (q1Parameter->type() == CellMLSupport::CellmlFileRuntimeParameter::State)
-            && (thetaParameter->type() == CellMLSupport::CellmlFileRuntimeParameter::State)
-            && (r0Parameter->type() == CellMLSupport::CellmlFileRuntimeParameter::Constant)) {
-            if (pTask != SimulationExperimentViewSimulationWidget::None) {
+            && (q1Parameter->type() == CellMLSupport::CellmlFileRuntimeParameter::Type::State)
+            && (thetaParameter->type() == CellMLSupport::CellmlFileRuntimeParameter::Type::State)
+            && (r0Parameter->type() == CellMLSupport::CellmlFileRuntimeParameter::Type::Constant)) {
+            if (pTask != SimulationExperimentViewSimulationWidget::Task::None) {
                 mPlugin->pendulumWindowWindow()->initData(simulation->size(),
                                                           simulation->data()->startingPoint(),
                                                           simulation->data()->endingPoint(),
@@ -600,7 +600,7 @@ void SimulationExperimentViewWidget::checkSimulationResults(const QString &pFile
                                                           simulation->results()->states(q1Parameter->index()),
                                                           simulation->results()->states(thetaParameter->index()));
             } else {
-                mPlugin->pendulumWindowWindow()->addData(simulationResultsSize);
+                mPlugin->pendulumWindowWindow()->addData(int(simulationResultsSize));
             }
         }
     }