Free the csv reader when the AnimationWindow is closed.

OpenModelica · Nov 4, 2016 · 74b8f7b · 74b8f7b
1 parent 93e1990
commit 74b8f7b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/OMEdit/OMEditGUI/Animation/AnimationWindow.cpp b/OMEdit/OMEditGUI/Animation/AnimationWindow.cpp
@@ -192,6 +192,13 @@ void AnimationWindow::setSpeedUpSlotFunction()
     }
 }
 
+AnimationWindow::~AnimationWindow()
+{
+  if (mpVisualizer) {
+    delete mpVisualizer;
+  }
+}
+
 /*!
  * \brief AnimationWindow::setupViewWidget
  * creates the widget for the osg viewer

diff --git a/OMEdit/OMEditGUI/Animation/AnimationWindow.h b/OMEdit/OMEditGUI/Animation/AnimationWindow.h
@@ -66,6 +66,7 @@ class AnimationWindow : public QMainWindow, public osgViewer::CompositeViewer
   Q_OBJECT
 public:
   AnimationWindow(PlotWindowContainer *pPlotWindowContainer);
+  ~AnimationWindow();
   QWidget* setupViewWidget();
   void loadVisualization();
   double getTimeFraction();

diff --git a/OMEdit/OMEditGUI/Animation/VisualizerCSV.cpp b/OMEdit/OMEditGUI/Animation/VisualizerCSV.cpp
@@ -30,6 +30,7 @@
 /*
  * @author Adeel Asghar <adeel.asghar@liu.se>
  */
+
 #include "VisualizerCSV.h"
 
 VisualizerCSV::VisualizerCSV(const std::string& modelFile, const std::string& path)
@@ -38,6 +39,13 @@ VisualizerCSV::VisualizerCSV(const std::string& modelFile, const std::string& pa
 
 }
 
+VisualizerCSV::~VisualizerCSV()
+{
+  if (mpCSVData) {
+    omc_free_csv_reader(mpCSVData);
+  }
+}
+
 void VisualizerCSV::initData()
 {
   VisualizerAbstract::initData();

diff --git a/OMEdit/OMEditGUI/Animation/VisualizerCSV.h b/OMEdit/OMEditGUI/Animation/VisualizerCSV.h
@@ -41,7 +41,7 @@ class VisualizerCSV : public VisualizerAbstract
 public:
   VisualizerCSV() = delete;
   VisualizerCSV(const std::string& fileName, const std::string& path);
-  virtual ~VisualizerCSV() = default;
+  ~VisualizerCSV();
   VisualizerCSV(const VisualizerCSV& omvm) = delete;
   VisualizerCSV& operator=(const VisualizerCSV& omvm) = delete;
   void initData();