[OMEdit] Renaming in preparation for Vector

- Rename AbstractVisualizers -> AbstractVisualizer
- Rename Shapes -> Shape
- Rename Visualizer* -> Visualization*

OMEdit/OMEditLIB/Animation/AbstractAnimationWindow.cpp

@@ -41,9 +41,9 @@
 #include "Modeling/MessagesWidget.h"
 #include "Plotting/PlotWindowContainer.h"
 #include "ViewerWidget.h"
-#include "Visualizer.h"
-#include "VisualizerMAT.h"
-#include "VisualizerCSV.h"
+#include "Visualization.h"
+#include "VisualizationMAT.h"
+#include "VisualizationCSV.h"
 
 /*!
  * \class AbstractAnimationWindow
@@ -58,7 +58,7 @@ AbstractAnimationWindow::AbstractAnimationWindow(QWidget *pParent)
 //    osgViewer::CompositeViewer(),
     mPathName(""),
     mFileName(""),
-    mpVisualizer(nullptr),
+    mpVisualization(nullptr),
     mpViewerWidget(nullptr),
     mpAnimationToolBar(new QToolBar(QString("Animation Toolbar"),this)),
     mpAnimationParameterDockerWidget(new QDockWidget(QString("Parameter Settings"),this)),
@@ -125,7 +125,7 @@ void AbstractAnimationWindow::openAnimationFile(QString fileName, bool stashCame
       mpAnimationSlider->blockSignals(state);
       mpSpeedComboBox->setEnabled(true);
       mpTimeTextBox->setEnabled(true);
-      mpTimeTextBox->setText(QString::number(mpVisualizer->getTimeManager()->getStartTime()));
+      mpTimeTextBox->setText(QString::number(mpVisualization->getTimeManager()->getStartTime()));
       /* Only use isometric view as default for csv file type.
        * Otherwise use side view as default which suits better for Modelica models.
        */
@@ -236,8 +236,8 @@ void AbstractAnimationWindow::createActions()
  */
 void AbstractAnimationWindow::updateControlPanelValues()
 {
-  if (getVisualizer()) {
-    VisualizerFMU* FMUvis = dynamic_cast<VisualizerFMU*>(mpVisualizer);
+  if (getVisualization()) {
+    VisualizationFMU* FMUvis = dynamic_cast<VisualizationFMU*>(mpVisualization);
     for (int stateIdx = 0; stateIdx < mSpinBoxVector.size(); stateIdx++) {
       mStateLabels.at(stateIdx)->setText(QString::number(FMUvis->getFMU()->getFMUData()->_states[stateIdx]));
     }
@@ -249,8 +249,8 @@ void AbstractAnimationWindow::updateControlPanelValues()
  */
 void AbstractAnimationWindow::initInteractiveControlPanel()
 {
-  if (getVisualizer()) {
-    VisualizerFMU* FMUvis = dynamic_cast<VisualizerFMU*>(mpVisualizer);
+  if (getVisualization()) {
+    VisualizationFMU* FMUvis = dynamic_cast<VisualizationFMU*>(mpVisualization);
     QWidget *widget = new QWidget(this);
     mSpinBoxVector.clear();
     mStateLabels.clear();
@@ -333,7 +333,7 @@ void AbstractAnimationWindow::initInteractiveControlPanel()
 void AbstractAnimationWindow::setStateSolveSystem(double val, int idx)
 {
   if (idx>=0) {
-    VisualizerFMU* FMUvis = dynamic_cast<VisualizerFMU*>(mpVisualizer);
+    VisualizationFMU* FMUvis = dynamic_cast<VisualizationFMU*>(mpVisualization);
     if (FMUvis) {
       FMUvis->getFMU()->getFMUData()->_states[idx] = val;
     }
@@ -396,31 +396,31 @@ bool AbstractAnimationWindow::loadVisualization()
                                                           Helper::errorLevel));
     return false;
   } else {
-    //init visualizer
+    //init visualization
     if (visType == VisType::MAT) {
-      mpVisualizer = new VisualizerMAT(mFileName, mPathName);
+      mpVisualization = new VisualizationMAT(mFileName, mPathName);
     } else if (visType == VisType::CSV) {
-      mpVisualizer = new VisualizerCSV(mFileName, mPathName);
+      mpVisualization = new VisualizationCSV(mFileName, mPathName);
     } else if (visType == VisType::FMU) {
-      mpVisualizer = new VisualizerFMU(mFileName, mPathName);
+      mpVisualization = new VisualizationFMU(mFileName, mPathName);
     } else {
       QString msg = tr("Could not init %1 %2.").arg(QString(mPathName.c_str())).arg(QString(mFileName.c_str()));
       MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, msg, Helper::scriptingKind,
                                                             Helper::errorLevel));
       return false;
     }
-    connect(mpVisualizer->getTimeManager()->getUpdateSceneTimer(), SIGNAL(timeout()), SLOT(updateScene()));
-    mpVisualizer->initData();
-    mpVisualizer->setUpScene();
-    mpVisualizer->initVisualization();
+    connect(mpVisualization->getTimeManager()->getUpdateSceneTimer(), SIGNAL(timeout()), SLOT(updateScene()));
+    mpVisualization->initData();
+    mpVisualization->setUpScene();
+    mpVisualization->initVisualization();
     //add scene for the chosen visualization
-    mpViewerWidget->getSceneView()->setSceneData(mpVisualizer->getOMVisScene()->getScene().getRootNode());
+    mpViewerWidget->getSceneView()->setSceneData(mpVisualization->getOMVisScene()->getScene().getRootNode());
   }
   //add window title
   setWindowTitle(QString::fromStdString(mFileName));
   //open settings dialog for FMU simulation
   if (visType == VisType::FMU) {
-    openFMUSettingsDialog(dynamic_cast<VisualizerFMU*>(mpVisualizer));
+    openFMUSettingsDialog(dynamic_cast<VisualizationFMU*>(mpVisualization));
     mpInteractiveControlAction->setEnabled(true);
     initInteractiveControlPanel();
   }
@@ -528,11 +528,11 @@ double AbstractAnimationWindow::computeDistanceToOrigin()
 /*!
  * \brief AbstractAnimationWindow::openFMUSettingsDialog
  * Opens a dialog to set the settings for the FMU visualization
- * \param pVisualizerFMU
+ * \param pVisualizationFMU
  */
-void AbstractAnimationWindow::openFMUSettingsDialog(VisualizerFMU* pVisualizerFMU)
+void AbstractAnimationWindow::openFMUSettingsDialog(VisualizationFMU* pVisualizationFMU)
 {
-  FMUSettingsDialog *pFMUSettingsDialog = new FMUSettingsDialog(this, pVisualizerFMU);
+  FMUSettingsDialog *pFMUSettingsDialog = new FMUSettingsDialog(this, pVisualizationFMU);
   pFMUSettingsDialog->exec();
 }
 
@@ -542,21 +542,21 @@ void AbstractAnimationWindow::openFMUSettingsDialog(VisualizerFMU* pVisualizerFM
  */
 void AbstractAnimationWindow::updateScene()
 {
-  if (mpVisualizer) {
+  if (mpVisualization) {
     //set time label
-    if (!mpVisualizer->getTimeManager()->isPaused()) {
-      mpTimeTextBox->setText(QString::number(mpVisualizer->getTimeManager()->getVisTime()));
+    if (!mpVisualization->getTimeManager()->isPaused()) {
+      mpTimeTextBox->setText(QString::number(mpVisualization->getTimeManager()->getVisTime()));
       // set time slider
-      if (mpVisualizer->getVisType() != VisType::FMU) {
-        int time = mpVisualizer->getTimeManager()->getTimeFraction();
+      if (mpVisualization->getVisType() != VisType::FMU) {
+        int time = mpVisualization->getTimeManager()->getTimeFraction();
         bool state = mpAnimationSlider->blockSignals(true);
         mpAnimationSlider->setValue(time);
         mpAnimationSlider->blockSignals(state);
       }
     }
 
     //update the scene
-    mpVisualizer->sceneUpdate();
+    mpVisualization->sceneUpdate();
     mpViewerWidget->update();
 
     updateControlPanelValues();
@@ -583,11 +583,11 @@ void AbstractAnimationWindow::chooseAnimationFileSlotFunction()
  */
 void AbstractAnimationWindow::initSlotFunction()
 {
-  mpVisualizer->initVisualization();
+  mpVisualization->initVisualization();
   bool state = mpAnimationSlider->blockSignals(true);
   mpAnimationSlider->setValue(0);
   mpAnimationSlider->blockSignals(state);
-  mpTimeTextBox->setText(QString::number(mpVisualizer->getTimeManager()->getVisTime()));
+  mpTimeTextBox->setText(QString::number(mpVisualization->getTimeManager()->getVisTime()));
   mpViewerWidget->update();
   updateControlPanelValues();
 }
@@ -598,7 +598,7 @@ void AbstractAnimationWindow::initSlotFunction()
  */
 void AbstractAnimationWindow::playSlotFunction()
 {
-  mpVisualizer->getTimeManager()->setPause(false);
+  mpVisualization->getTimeManager()->setPause(false);
 }
 
 /*!
@@ -607,7 +607,7 @@ void AbstractAnimationWindow::playSlotFunction()
  */
 void AbstractAnimationWindow::pauseSlotFunction()
 {
-  mpVisualizer->getTimeManager()->setPause(true);
+  mpVisualization->getTimeManager()->setPause(true);
 }
 
 /*!
@@ -617,7 +617,7 @@ void AbstractAnimationWindow::pauseSlotFunction()
  */
 void AbstractAnimationWindow::repeatSlotFunciton(bool checked)
 {
-  mpVisualizer->getTimeManager()->setRepeat(checked);
+  mpVisualization->getTimeManager()->setRepeat(checked);
 }
 
 /*!
@@ -626,12 +626,12 @@ void AbstractAnimationWindow::repeatSlotFunciton(bool checked)
  */
 void AbstractAnimationWindow::sliderSetTimeSlotFunction(int value)
 {
-  float time = (mpVisualizer->getTimeManager()->getEndTime()
-                - mpVisualizer->getTimeManager()->getStartTime())
+  float time = (mpVisualization->getTimeManager()->getEndTime()
+                - mpVisualization->getTimeManager()->getStartTime())
       * (float) (value / (float)mSliderRange);
-  mpVisualizer->getTimeManager()->setVisTime(time);
-  mpTimeTextBox->setText(QString::number(mpVisualizer->getTimeManager()->getVisTime()));
-  mpVisualizer->updateScene(time);
+  mpVisualization->getTimeManager()->setVisTime(time);
+  mpTimeTextBox->setText(QString::number(mpVisualization->getTimeManager()->getVisTime()));
+  mpVisualization->updateScene(time);
   mpViewerWidget->update();
 }
 
@@ -643,20 +643,20 @@ void AbstractAnimationWindow::jumpToTimeSlotFunction()
 {
   QString str = mpTimeTextBox->text();
   bool isFloat = true;
-  double start = mpVisualizer->getTimeManager()->getStartTime();
-  double end = mpVisualizer->getTimeManager()->getEndTime();
+  double start = mpVisualization->getTimeManager()->getStartTime();
+  double end = mpVisualization->getTimeManager()->getEndTime();
   double value = str.toFloat(&isFloat);
   if (isFloat && value >= 0.0) {
     if (value < start) {
       value = start;
     } else if (value > end) {
       value = end;
     }
-    mpVisualizer->getTimeManager()->setVisTime(value);
+    mpVisualization->getTimeManager()->setVisTime(value);
     bool state = mpAnimationSlider->blockSignals(true);
-    mpAnimationSlider->setValue(mpVisualizer->getTimeManager()->getTimeFraction());
+    mpAnimationSlider->setValue(mpVisualization->getTimeManager()->getTimeFraction());
     mpAnimationSlider->blockSignals(state);
-    mpVisualizer->updateScene(value);
+    mpVisualization->updateScene(value);
     mpViewerWidget->update();
   }
 }
@@ -671,7 +671,7 @@ void AbstractAnimationWindow::setSpeedSlotFunction()
   bool isFloat = true;
   double value = str.toFloat(&isFloat);
   if (isFloat && value > 0.0) {
-    mpVisualizer->getTimeManager()->setSpeedUp(value);
+    mpVisualization->getTimeManager()->setSpeedUp(value);
     mpViewerWidget->update();
   }
 }

OMEdit/OMEditLIB/Animation/AbstractAnimationWindow.h

@@ -45,7 +45,7 @@
 
 #include "FMUSettingsDialog.h"
 
-class VisualizerAbstract;
+class VisualizationAbstract;
 class ViewerWidget;
 class Label;
 
@@ -70,7 +70,7 @@ class AbstractAnimationWindow : public QMainWindow
 public:
   AbstractAnimationWindow(QWidget *pParent);
   ViewerWidget* getViewerWidget() {return mpViewerWidget;}
-  VisualizerAbstract* getVisualizer() {return mpVisualizer;}
+  VisualizationAbstract* getVisualization() {return mpVisualization;}
   void openAnimationFile(QString fileName, bool stashCamera=false);
   virtual void createActions();
   void clearView();
@@ -83,7 +83,7 @@ class AbstractAnimationWindow : public QMainWindow
   std::string mPathName;
   std::string mFileName;
   //stores the data for the visualizers, time management, functionality for updating the values(mat/fmu) etc.
-  VisualizerAbstract* mpVisualizer;
+  VisualizationAbstract* mpVisualization;
   //widgets
   ViewerWidget *mpViewerWidget;
   QToolBar* mpAnimationToolBar;
@@ -114,7 +114,7 @@ class AbstractAnimationWindow : public QMainWindow
   void cameraPositionFront();
   void cameraPositionTop();
   double computeDistanceToOrigin();
-  void openFMUSettingsDialog(VisualizerFMU *pVisualizerFMU);
+  void openFMUSettingsDialog(VisualizationFMU *pVisualizationFMU);
   void updateControlPanelValues();
 
 public slots:

OMEdit/OMEditLIB/Animation/AbstractVisualizers.cpp → OMEdit/OMEditLIB/Animation/AbstractVisualizer.cpp

@@ -32,7 +32,7 @@
  * @author Volker Waurich <volker.waurich@tu-dresden.de>
  */
 
-#include "AbstractVisualizers.h"
+#include "AbstractVisualizer.h"
 
 std::string operator+(const std::string& st, const VisualizerType type)
 {

OMEdit/OMEditLIB/Animation/AbstractVisualizers.h → OMEdit/OMEditLIB/Animation/AbstractVisualizer.h

@@ -32,8 +32,8 @@
  * @author Volker Waurich <volker.waurich@tu-dresden.de>
  */
 
-#ifndef ABSTRACTVISUALIZERS_H
-#define ABSTRACTVISUALIZERS_H
+#ifndef ABSTRACTVISUALIZER_H
+#define ABSTRACTVISUALIZER_H
 
 #include <iostream>
 

OMEdit/OMEditLIB/Animation/AnimationWindow.cpp

@@ -34,7 +34,7 @@
 
 #include "AnimationWindow.h"
 #include "Options/OptionsDialog.h"
-#include "Visualizer.h"
+#include "Visualization.h"
 #include <QAction>
 
 /*!
@@ -56,8 +56,8 @@ AnimationWindow::AnimationWindow(QWidget *pParent)
  */
 AnimationWindow::~AnimationWindow()
 {
-  if (mpVisualizer) {
-    delete mpVisualizer;
+  if (mpVisualization) {
+    delete mpVisualization;
   }
 }
 

OMEdit/OMEditLIB/Animation/ExtraShapes.h

@@ -35,7 +35,7 @@
 #ifndef EXTRASHAPES_H
 #define EXTRASHAPES_H
 
-#include "Visualizer.h"
+#include "Visualization.h"
 
 #include <osg/Node>
 #include <osg/Group>

OMEdit/OMEditLIB/Animation/FMUSettingsDialog.cpp

@@ -43,11 +43,11 @@
 /*!
  * \brief FMUSettingsDialog::FMUSettingsDialog
  * \param pParent
- * \param pVisualizerFMU
+ * \param pVisualizationFMU
  */
-FMUSettingsDialog::FMUSettingsDialog(QWidget *pParent, VisualizerFMU* pVisualizerFMU)
+FMUSettingsDialog::FMUSettingsDialog(QWidget *pParent, VisualizationFMU* pVisualizationFMU)
   : QDialog(pParent),
-    mpVisualizerFMU(pVisualizerFMU),
+    mpVisualizationFMU(pVisualizationFMU),
     mStepSize(0.001),
     mRenderFreq(0.1)
 {
@@ -107,7 +107,7 @@ void FMUSettingsDialog::saveSimSettings()
     handleEvents = false;
   };
   //store in FMU simulator
-  mpVisualizerFMU->setSimulationSettings(stepSize, static_cast<Solver>(mpSolverComboBox->itemData(mpSolverComboBox->currentIndex()).toInt()),
+  mpVisualizationFMU->setSimulationSettings(stepSize, static_cast<Solver>(mpSolverComboBox->itemData(mpSolverComboBox->currentIndex()).toInt()),
                                          handleEvents);
   accept();
 }

OMEdit/OMEditLIB/Animation/FMUSettingsDialog.h

@@ -35,7 +35,7 @@
 #ifndef FMU_SETTINGS_WINDOW_H
 #define FMU_SETTINGS_WINDOW_H
 
-#include "VisualizerFMU.h"
+#include "VisualizationFMU.h"
 
 #include <QDialog>
 #include <QLineEdit>
@@ -49,9 +49,9 @@ class FMUSettingsDialog : public QDialog
 {
   Q_OBJECT
 public:
-  FMUSettingsDialog(QWidget *pParent, VisualizerFMU *pVisualizerFMU);
+  FMUSettingsDialog(QWidget *pParent, VisualizationFMU *pVisualizationFMU);
 private:
-  VisualizerFMU *mpVisualizerFMU;
+  VisualizationFMU *mpVisualizationFMU;
   double mStepSize;
   double mRenderFreq;
   bool mHandleEvents;

OMEdit/OMEditLIB/Animation/Shapes.cpp → OMEdit/OMEditLIB/Animation/Shape.cpp

@@ -32,7 +32,7 @@
  * @author Volker Waurich <volker.waurich@tu-dresden.de>
  */
 
-#include "Shapes.h"
+#include "Shape.h"
 
 ShapeObject::ShapeObject()
     : AbstractVisualizerObject(VisualizerType::shape),

OMEdit/OMEditLIB/Animation/Shapes.h → OMEdit/OMEditLIB/Animation/Shape.h

@@ -32,10 +32,10 @@
  * @author Volker Waurich <volker.waurich@tu-dresden.de>
  */
 
-#ifndef SHAPES_H
-#define SHAPES_H
+#ifndef SHAPE_H
+#define SHAPE_H
 
-#include "AbstractVisualizers.h"
+#include "AbstractVisualizer.h"
 
 class ShapeObject : public AbstractVisualizerObject
 {