Simulation Experiment view: now make use of our (still basic) new Sim…

…ulation support classes (#1266).

src/plugins/simulation/SimulationExperimentView/CMakeLists.txt

@@ -21,8 +21,6 @@ ADD_PLUGIN(SimulationExperimentView
         src/simulationexperimentviewinformationsolverswidget.cpp
         src/simulationexperimentviewinformationwidget.cpp
         src/simulationexperimentviewplugin.cpp
-        src/simulationexperimentviewsimulation.cpp
-        src/simulationexperimentviewsimulationworker.cpp
         src/simulationexperimentviewsimulationwidget.cpp
         src/simulationexperimentviewwidget.cpp
     HEADERS_MOC
@@ -38,8 +36,6 @@ ADD_PLUGIN(SimulationExperimentView
         src/simulationexperimentviewinformationsolverswidget.h
         src/simulationexperimentviewinformationwidget.h
         src/simulationexperimentviewplugin.h
-        src/simulationexperimentviewsimulation.h
-        src/simulationexperimentviewsimulationworker.h
         src/simulationexperimentviewsimulationwidget.h
         src/simulationexperimentviewwidget.h
     PLUGINS

src/plugins/simulation/SimulationExperimentView/i18n/SimulationExperimentView_fr.ts

@@ -167,29 +167,6 @@
         <translation>Expérience De Simulation</translation>
     </message>
 </context>
-<context>
-    <name>OpenCOR::SimulationExperimentView::SimulationExperimentViewSimulation</name>
-    <message>
-        <source>the starting and ending points cannot have the same value</source>
-        <translation>les points de départ et d&apos;arrivée ne peuvent pas avoir la même valeur</translation>
-    </message>
-    <message>
-        <source>the point interval cannot be equal to zero</source>
-        <translation>l&apos;interval de point ne peut pas être égal à zéro</translation>
-    </message>
-    <message>
-        <source>the ending point is greater than the starting point, so the point interval should be greater than zero</source>
-        <translation>le point d&apos;arrivée est plus grand que le point de départ, donc l&apos;interval de point devrait être plus grand que zéro</translation>
-    </message>
-    <message>
-        <source>the ending point is smaller than the starting point, so the point interval should be smaller than zero</source>
-        <translation>le point d&apos;arrivée est plus petit que le point de départ, donc l&apos;interval de point devrait être plus petit que zéro</translation>
-    </message>
-    <message>
-        <source>the simulation worker could not be created</source>
-        <translation>l&apos;agent de simulation n&apos;a pas pu être créé</translation>
-    </message>
-</context>
 <context>
     <name>OpenCOR::SimulationExperimentView::SimulationExperimentViewSimulationWidget</name>
     <message>

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewinformationgraphswidget.cpp

@@ -25,9 +25,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "coreguiutils.h"
 #include "filemanager.h"
 #include "graphpanelwidget.h"
+#include "simulation.h"
 #include "simulationexperimentviewinformationgraphswidget.h"
 #include "simulationexperimentviewplugin.h"
-#include "simulationexperimentviewsimulation.h"
 #include "simulationexperimentviewsimulationwidget.h"
 #include "simulationexperimentviewwidget.h"
 
@@ -131,7 +131,7 @@ void SimulationExperimentViewInformationGraphsWidget::retranslateUi()
 
 //==============================================================================
 
-void SimulationExperimentViewInformationGraphsWidget::initialize(SimulationExperimentViewSimulation *pSimulation)
+void SimulationExperimentViewInformationGraphsWidget::initialize(SimulationSupport::Simulation *pSimulation)
 {
     // Populate our parameters context menu
 

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewinformationgraphswidget.h

@@ -53,11 +53,16 @@ namespace GraphPanelWidget {
 
 //==============================================================================
 
+namespace SimulationSupport {
+    class Simulation;
+}   // namespace SimulationSupport
+
+//==============================================================================
+
 namespace SimulationExperimentView {
 
 //==============================================================================
 
-class SimulationExperimentViewSimulation;
 class SimulationExperimentViewSimulationWidget;
 class SimulationExperimentViewWidget;
 
@@ -75,7 +80,7 @@ class SimulationExperimentViewInformationGraphsWidget : public QStackedWidget,
 
     virtual void retranslateUi();
 
-    void initialize(SimulationExperimentViewSimulation *pSimulation);
+    void initialize(SimulationSupport::Simulation *pSimulation);
     void finalize();
 
     void fileRenamed(const QString &pOldFileName, const QString &pNewFileName);

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewinformationparameterswidget.cpp

@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
 #include "cellmlfileruntime.h"
+#include "simulation.h"
 #include "simulationexperimentviewinformationparameterswidget.h"
-#include "simulationexperimentviewsimulation.h"
 #include "simulationexperimentviewsimulationwidget.h"
 
 //==============================================================================
@@ -110,7 +110,7 @@ void SimulationExperimentViewInformationParametersWidget::contextMenuEvent(QCont
 
 //==============================================================================
 
-void SimulationExperimentViewInformationParametersWidget::initialize(SimulationExperimentViewSimulation *pSimulation,
+void SimulationExperimentViewInformationParametersWidget::initialize(SimulationSupport::Simulation *pSimulation,
                                                                      const bool &pReloadingView)
 {
     // Keep track of the simulation

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewinformationparameterswidget.h

@@ -40,11 +40,13 @@ namespace CellMLSupport {
 
 //==============================================================================
 
-namespace SimulationExperimentView {
+namespace SimulationSupport {
+    class Simulation;
+}   // namespace SimulationSupport
 
 //==============================================================================
 
-class SimulationExperimentViewSimulation;
+namespace SimulationExperimentView {
 
 //==============================================================================
 
@@ -57,7 +59,7 @@ class SimulationExperimentViewInformationParametersWidget : public Core::Propert
 
     virtual void retranslateUi();
 
-    void initialize(SimulationExperimentViewSimulation *pSimulation,
+    void initialize(SimulationSupport::Simulation *pSimulation,
                     const bool &pReloadingView = false);
     void finalize();
 
@@ -72,7 +74,7 @@ class SimulationExperimentViewInformationParametersWidget : public Core::Propert
     QMap<Core::Property *, CellMLSupport::CellmlFileRuntimeParameter *> mParameters;
     QMap<QAction *, CellMLSupport::CellmlFileRuntimeParameter *> mParameterActions;
 
-    SimulationExperimentViewSimulation *mSimulation;
+    SimulationSupport::Simulation *mSimulation;
 
     bool mNeedClearing;
     bool mVoiAccessible;

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewinformationsimulationwidget.cpp

@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
 #include "cellmlfileruntime.h"
+#include "simulation.h"
 #include "simulationexperimentviewinformationsimulationwidget.h"
-#include "simulationexperimentviewsimulation.h"
 
 //==============================================================================
 
@@ -59,7 +59,7 @@ void SimulationExperimentViewInformationSimulationWidget::retranslateUi()
 
 //==============================================================================
 
-void SimulationExperimentViewInformationSimulationWidget::initialize(SimulationExperimentViewSimulation *pSimulation)
+void SimulationExperimentViewInformationSimulationWidget::initialize(SimulationSupport::Simulation *pSimulation)
 {
     // Iniialise the unit of our different properties
 

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewinformationsimulationwidget.h

@@ -30,11 +30,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
 namespace OpenCOR {
-namespace SimulationExperimentView {
 
 //==============================================================================
 
-class SimulationExperimentViewSimulation;
+namespace SimulationSupport {
+    class Simulation;
+}   // namespace SimulationSupport
+
+//==============================================================================
+
+namespace SimulationExperimentView {
 
 //==============================================================================
 
@@ -47,7 +52,7 @@ class SimulationExperimentViewInformationSimulationWidget : public Core::Propert
 
     virtual void retranslateUi();
 
-    void initialize(SimulationExperimentViewSimulation *pSimulation);
+    void initialize(SimulationSupport::Simulation *pSimulation);
 
     Core::Property * startingPointProperty() const;
     Core::Property * endingPointProperty() const;

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewinformationsolverswidget.cpp

@@ -24,8 +24,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "cellmlfileruntime.h"
 #include "corecliutils.h"
 #include "interfaces.h"
+#include "simulation.h"
 #include "simulationexperimentviewinformationsolverswidget.h"
-#include "simulationexperimentviewsimulation.h"
 #include "simulationexperimentviewwidget.h"
 
 //==============================================================================
@@ -326,7 +326,7 @@ void SimulationExperimentViewInformationSolversWidget::setPropertiesUnit(Simulat
 
 //==============================================================================
 
-void SimulationExperimentViewInformationSolversWidget::initialize(SimulationExperimentViewSimulation *pSimulation)
+void SimulationExperimentViewInformationSolversWidget::initialize(SimulationSupport::Simulation *pSimulation)
 {
     // Make sure that the CellML file runtime is valid
 

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewinformationsolverswidget.h

@@ -34,11 +34,13 @@ namespace OpenCOR {
 
 //==============================================================================
 
-namespace SimulationExperimentView {
+namespace SimulationSupport {
+    class Simulation;
+}   // namespace SimulationSupport
 
 //==============================================================================
 
-class SimulationExperimentViewSimulation;
+namespace SimulationExperimentView {
 
 //==============================================================================
 
@@ -78,7 +80,7 @@ class SimulationExperimentViewInformationSolversWidget : public Core::PropertyEd
 
     virtual void retranslateUi();
 
-    void initialize(SimulationExperimentViewSimulation *pSimulation);
+    void initialize(SimulationSupport::Simulation *pSimulation);
 
     QStringList odeSolvers() const;
     QStringList daeSolvers() const;