renaming in FMU-setting dialog

OpenModelica · Jan 10, 2017 · 5b8b502 · 5b8b502
1 parent f026f3d
commit 5b8b502
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/OMEdit/OMEditGUI/Animation/FMUSettingsWindow.cpp b/OMEdit/OMEditGUI/Animation/FMUSettingsWindow.cpp
@@ -38,9 +38,8 @@
 
 /*!
  * \class FMUSettingsWindow
- * \brief widget for FMu-simulation settings.
+ * \brief widget for FMU-simulation settings.
  */
-
 FMUSettingsWindow::FMUSettingsWindow(QWidget *pParent, VisualizerFMU* fmuVisualizer)
   : QMainWindow(pParent),
     fmu(fmuVisualizer),

diff --git a/OMEdit/OMEditGUI/Animation/FMUWrapper.cpp b/OMEdit/OMEditGUI/Animation/FMUWrapper.cpp
@@ -44,7 +44,7 @@ SimSettingsFMU::SimSettingsFMU()
                   _tend(0.1),
                   _relativeTolerance(0.001),
                   _solver(Solver::EULER_FORWARD),
-                  mHandleEvents(true)
+                  mIterateEvents(true)
 {
 }
 
@@ -108,14 +108,14 @@ int SimSettingsFMU::getIntermediateResults()
   return _intermediateResults;
 }
 
-void SimSettingsFMU::setHandleEvents(bool hE)
+void SimSettingsFMU::setIterateEvents(bool iE)
 {
-  mHandleEvents = hE;
+  mIterateEvents = iE;
 }
 
-bool SimSettingsFMU::getHandleEvents()
+bool SimSettingsFMU::getIterateEvents()
 {
-  return mHandleEvents;
+  return mIterateEvents;
 }
 //-------------------------------
 // Abstract FMU class

diff --git a/OMEdit/OMEditGUI/Animation/FMUWrapper.h b/OMEdit/OMEditGUI/Animation/FMUWrapper.h
@@ -87,8 +87,8 @@ class SimSettingsFMU
   void setSolver(const Solver& solver);
   int* getCallEventUpdate();
   int getIntermediateResults();
-  void setHandleEvents(bool hE);
-  bool getHandleEvents();
+  void setIterateEvents(bool iE);
+  bool getIterateEvents();
 
  private:
   int _callEventUpdate;
@@ -99,7 +99,7 @@ class SimSettingsFMU
   double _tend;
   double _relativeTolerance;
   Solver _solver;
-  bool mHandleEvents;
+  bool mIterateEvents;
 };
 
 

diff --git a/OMEdit/OMEditGUI/Animation/VisualizerFMU.cpp b/OMEdit/OMEditGUI/Animation/VisualizerFMU.cpp
@@ -183,7 +183,7 @@ double VisualizerFMU::simulateStep(const double time)
   bool zeroCrossingEvent = mpFMU->checkForTriggeredEvent();
 
   // Handle any events
-  if (mpSimSettings->getHandleEvents() && (mpSimSettings->getCallEventUpdate() || zeroCrossingEvent || mpFMU->itsEventTime()))
+  if (mpSimSettings->getIterateEvents() && (mpSimSettings->getCallEventUpdate() || zeroCrossingEvent || mpFMU->itsEventTime()))
   {
     mpFMU->handleEvents(mpSimSettings->getIntermediateResults());
   }
@@ -327,9 +327,9 @@ void VisualizerFMU::updateObjectAttributeFMU(ShapeObjectAttribute* attr, FMUWrap
   }
 }
 
-void VisualizerFMU::setSimulationSettings(double stepsize, Solver solver, bool handleEvents)
+void VisualizerFMU::setSimulationSettings(double stepsize, Solver solver, bool iterateEvents)
 {
   mpSimSettings->setHdef(stepsize);
   mpSimSettings->setSolver(solver);
-  mpSimSettings->setHandleEvents(handleEvents);
+  mpSimSettings->setIterateEvents(iterateEvents);
 }
diff --git a/OMEdit/OMEditGUI/Animation/VisualizerFMU.h b/OMEdit/OMEditGUI/Animation/VisualizerFMU.h
@@ -61,7 +61,7 @@ class VisualizerFMU : public VisualizerAbstract
   void updateVisAttributes(const double time) override;
   void updateScene(const double time = 0.0) override;
   void updateObjectAttributeFMU(ShapeObjectAttribute* attr, FMUWrapperAbstract* fmuWrapper);
-  void setSimulationSettings(double stepsize, Solver solver, bool handleEvents);
+  void setSimulationSettings(double stepsize, Solver solver, bool iterateEvents);
  private:
   std::shared_ptr<fmi_import_context_t> mpContext;
   jm_callbacks mCallbacks;