Skip to content

Commit 68fb9c9

Browse files
anotheruserofgithubadeas31
anotheruserofgithub
authored and
adeas31
committed
[OMEdit] Renaming in preparation for Vector
- Rename AbstractVisualizers -> AbstractVisualizer - Rename Shapes -> Shape - Rename Visualizer* -> Visualization*
1 parent 4463fca commit 68fb9c9

22 files changed

+218
-217
lines changed

‎OMEdit/OMEditLIB/Animation/AbstractAnimationWindow.cpp‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
#include "Modeling/MessagesWidget.h"
4242
#include "Plotting/PlotWindowContainer.h"
4343
#include "ViewerWidget.h"
44-
#include "Visualizer.h"
45-
#include "VisualizerMAT.h"
46-
#include "VisualizerCSV.h"
44+
#include "Visualization.h"
45+
#include "VisualizationMAT.h"
46+
#include "VisualizationCSV.h"
4747

4848
/*!
4949
* \class AbstractAnimationWindow
@@ -58,7 +58,7 @@ AbstractAnimationWindow::AbstractAnimationWindow(QWidget *pParent)
5858
// osgViewer::CompositeViewer(),
5959
mPathName(""),
6060
mFileName(""),
61-
mpVisualizer(nullptr),
61+
mpVisualization(nullptr),
6262
mpViewerWidget(nullptr),
6363
mpAnimationToolBar(new QToolBar(QString("Animation Toolbar"),this)),
6464
mpAnimationParameterDockerWidget(new QDockWidget(QString("Parameter Settings"),this)),
@@ -125,7 +125,7 @@ void AbstractAnimationWindow::openAnimationFile(QString fileName, bool stashCame
125125
mpAnimationSlider->blockSignals(state);
126126
mpSpeedComboBox->setEnabled(true);
127127
mpTimeTextBox->setEnabled(true);
128-
mpTimeTextBox->setText(QString::number(mpVisualizer->getTimeManager()->getStartTime()));
128+
mpTimeTextBox->setText(QString::number(mpVisualization->getTimeManager()->getStartTime()));
129129
/* Only use isometric view as default for csv file type.
130130
* Otherwise use side view as default which suits better for Modelica models.
131131
*/
@@ -236,8 +236,8 @@ void AbstractAnimationWindow::createActions()
236236
*/
237237
void AbstractAnimationWindow::updateControlPanelValues()
238238
{
239-
if (getVisualizer()) {
240-
VisualizerFMU* FMUvis = dynamic_cast<VisualizerFMU*>(mpVisualizer);
239+
if (getVisualization()) {
240+
VisualizationFMU* FMUvis = dynamic_cast<VisualizationFMU*>(mpVisualization);
241241
for (int stateIdx = 0; stateIdx < mSpinBoxVector.size(); stateIdx++) {
242242
mStateLabels.at(stateIdx)->setText(QString::number(FMUvis->getFMU()->getFMUData()->_states[stateIdx]));
243243
}
@@ -249,8 +249,8 @@ void AbstractAnimationWindow::updateControlPanelValues()
249249
*/
250250
void AbstractAnimationWindow::initInteractiveControlPanel()
251251
{
252-
if (getVisualizer()) {
253-
VisualizerFMU* FMUvis = dynamic_cast<VisualizerFMU*>(mpVisualizer);
252+
if (getVisualization()) {
253+
VisualizationFMU* FMUvis = dynamic_cast<VisualizationFMU*>(mpVisualization);
254254
QWidget *widget = new QWidget(this);
255255
mSpinBoxVector.clear();
256256
mStateLabels.clear();
@@ -333,7 +333,7 @@ void AbstractAnimationWindow::initInteractiveControlPanel()
333333
void AbstractAnimationWindow::setStateSolveSystem(double val, int idx)
334334
{
335335
if (idx>=0) {
336-
VisualizerFMU* FMUvis = dynamic_cast<VisualizerFMU*>(mpVisualizer);
336+
VisualizationFMU* FMUvis = dynamic_cast<VisualizationFMU*>(mpVisualization);
337337
if (FMUvis) {
338338
FMUvis->getFMU()->getFMUData()->_states[idx] = val;
339339
}
@@ -396,31 +396,31 @@ bool AbstractAnimationWindow::loadVisualization()
396396
Helper::errorLevel));
397397
return false;
398398
} else {
399-
//init visualizer
399+
//init visualization
400400
if (visType == VisType::MAT) {
401-
mpVisualizer = new VisualizerMAT(mFileName, mPathName);
401+
mpVisualization = new VisualizationMAT(mFileName, mPathName);
402402
} else if (visType == VisType::CSV) {
403-
mpVisualizer = new VisualizerCSV(mFileName, mPathName);
403+
mpVisualization = new VisualizationCSV(mFileName, mPathName);
404404
} else if (visType == VisType::FMU) {
405-
mpVisualizer = new VisualizerFMU(mFileName, mPathName);
405+
mpVisualization = new VisualizationFMU(mFileName, mPathName);
406406
} else {
407407
QString msg = tr("Could not init %1 %2.").arg(QString(mPathName.c_str())).arg(QString(mFileName.c_str()));
408408
MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, msg, Helper::scriptingKind,
409409
Helper::errorLevel));
410410
return false;
411411
}
412-
connect(mpVisualizer->getTimeManager()->getUpdateSceneTimer(), SIGNAL(timeout()), SLOT(updateScene()));
413-
mpVisualizer->initData();
414-
mpVisualizer->setUpScene();
415-
mpVisualizer->initVisualization();
412+
connect(mpVisualization->getTimeManager()->getUpdateSceneTimer(), SIGNAL(timeout()), SLOT(updateScene()));
413+
mpVisualization->initData();
414+
mpVisualization->setUpScene();
415+
mpVisualization->initVisualization();
416416
//add scene for the chosen visualization
417-
mpViewerWidget->getSceneView()->setSceneData(mpVisualizer->getOMVisScene()->getScene().getRootNode());
417+
mpViewerWidget->getSceneView()->setSceneData(mpVisualization->getOMVisScene()->getScene().getRootNode());
418418
}
419419
//add window title
420420
setWindowTitle(QString::fromStdString(mFileName));
421421
//open settings dialog for FMU simulation
422422
if (visType == VisType::FMU) {
423-
openFMUSettingsDialog(dynamic_cast<VisualizerFMU*>(mpVisualizer));
423+
openFMUSettingsDialog(dynamic_cast<VisualizationFMU*>(mpVisualization));
424424
mpInteractiveControlAction->setEnabled(true);
425425
initInteractiveControlPanel();
426426
}
@@ -528,11 +528,11 @@ double AbstractAnimationWindow::computeDistanceToOrigin()
528528
/*!
529529
* \brief AbstractAnimationWindow::openFMUSettingsDialog
530530
* Opens a dialog to set the settings for the FMU visualization
531-
* \param pVisualizerFMU
531+
* \param pVisualizationFMU
532532
*/
533-
void AbstractAnimationWindow::openFMUSettingsDialog(VisualizerFMU* pVisualizerFMU)
533+
void AbstractAnimationWindow::openFMUSettingsDialog(VisualizationFMU* pVisualizationFMU)
534534
{
535-
FMUSettingsDialog *pFMUSettingsDialog = new FMUSettingsDialog(this, pVisualizerFMU);
535+
FMUSettingsDialog *pFMUSettingsDialog = new FMUSettingsDialog(this, pVisualizationFMU);
536536
pFMUSettingsDialog->exec();
537537
}
538538

@@ -542,21 +542,21 @@ void AbstractAnimationWindow::openFMUSettingsDialog(VisualizerFMU* pVisualizerFM
542542
*/
543543
void AbstractAnimationWindow::updateScene()
544544
{
545-
if (mpVisualizer) {
545+
if (mpVisualization) {
546546
//set time label
547-
if (!mpVisualizer->getTimeManager()->isPaused()) {
548-
mpTimeTextBox->setText(QString::number(mpVisualizer->getTimeManager()->getVisTime()));
547+
if (!mpVisualization->getTimeManager()->isPaused()) {
548+
mpTimeTextBox->setText(QString::number(mpVisualization->getTimeManager()->getVisTime()));
549549
// set time slider
550-
if (mpVisualizer->getVisType() != VisType::FMU) {
551-
int time = mpVisualizer->getTimeManager()->getTimeFraction();
550+
if (mpVisualization->getVisType() != VisType::FMU) {
551+
int time = mpVisualization->getTimeManager()->getTimeFraction();
552552
bool state = mpAnimationSlider->blockSignals(true);
553553
mpAnimationSlider->setValue(time);
554554
mpAnimationSlider->blockSignals(state);
555555
}
556556
}
557557

558558
//update the scene
559-
mpVisualizer->sceneUpdate();
559+
mpVisualization->sceneUpdate();
560560
mpViewerWidget->update();
561561

562562
updateControlPanelValues();
@@ -583,11 +583,11 @@ void AbstractAnimationWindow::chooseAnimationFileSlotFunction()
583583
*/
584584
void AbstractAnimationWindow::initSlotFunction()
585585
{
586-
mpVisualizer->initVisualization();
586+
mpVisualization->initVisualization();
587587
bool state = mpAnimationSlider->blockSignals(true);
588588
mpAnimationSlider->setValue(0);
589589
mpAnimationSlider->blockSignals(state);
590-
mpTimeTextBox->setText(QString::number(mpVisualizer->getTimeManager()->getVisTime()));
590+
mpTimeTextBox->setText(QString::number(mpVisualization->getTimeManager()->getVisTime()));
591591
mpViewerWidget->update();
592592
updateControlPanelValues();
593593
}
@@ -598,7 +598,7 @@ void AbstractAnimationWindow::initSlotFunction()
598598
*/
599599
void AbstractAnimationWindow::playSlotFunction()
600600
{
601-
mpVisualizer->getTimeManager()->setPause(false);
601+
mpVisualization->getTimeManager()->setPause(false);
602602
}
603603

604604
/*!
@@ -607,7 +607,7 @@ void AbstractAnimationWindow::playSlotFunction()
607607
*/
608608
void AbstractAnimationWindow::pauseSlotFunction()
609609
{
610-
mpVisualizer->getTimeManager()->setPause(true);
610+
mpVisualization->getTimeManager()->setPause(true);
611611
}
612612

613613
/*!
@@ -617,7 +617,7 @@ void AbstractAnimationWindow::pauseSlotFunction()
617617
*/
618618
void AbstractAnimationWindow::repeatSlotFunciton(bool checked)
619619
{
620-
mpVisualizer->getTimeManager()->setRepeat(checked);
620+
mpVisualization->getTimeManager()->setRepeat(checked);
621621
}
622622

623623
/*!
@@ -626,12 +626,12 @@ void AbstractAnimationWindow::repeatSlotFunciton(bool checked)
626626
*/
627627
void AbstractAnimationWindow::sliderSetTimeSlotFunction(int value)
628628
{
629-
float time = (mpVisualizer->getTimeManager()->getEndTime()
630-
- mpVisualizer->getTimeManager()->getStartTime())
629+
float time = (mpVisualization->getTimeManager()->getEndTime()
630+
- mpVisualization->getTimeManager()->getStartTime())
631631
* (float) (value / (float)mSliderRange);
632-
mpVisualizer->getTimeManager()->setVisTime(time);
633-
mpTimeTextBox->setText(QString::number(mpVisualizer->getTimeManager()->getVisTime()));
634-
mpVisualizer->updateScene(time);
632+
mpVisualization->getTimeManager()->setVisTime(time);
633+
mpTimeTextBox->setText(QString::number(mpVisualization->getTimeManager()->getVisTime()));
634+
mpVisualization->updateScene(time);
635635
mpViewerWidget->update();
636636
}
637637

@@ -643,20 +643,20 @@ void AbstractAnimationWindow::jumpToTimeSlotFunction()
643643
{
644644
QString str = mpTimeTextBox->text();
645645
bool isFloat = true;
646-
double start = mpVisualizer->getTimeManager()->getStartTime();
647-
double end = mpVisualizer->getTimeManager()->getEndTime();
646+
double start = mpVisualization->getTimeManager()->getStartTime();
647+
double end = mpVisualization->getTimeManager()->getEndTime();
648648
double value = str.toFloat(&isFloat);
649649
if (isFloat && value >= 0.0) {
650650
if (value < start) {
651651
value = start;
652652
} else if (value > end) {
653653
value = end;
654654
}
655-
mpVisualizer->getTimeManager()->setVisTime(value);
655+
mpVisualization->getTimeManager()->setVisTime(value);
656656
bool state = mpAnimationSlider->blockSignals(true);
657-
mpAnimationSlider->setValue(mpVisualizer->getTimeManager()->getTimeFraction());
657+
mpAnimationSlider->setValue(mpVisualization->getTimeManager()->getTimeFraction());
658658
mpAnimationSlider->blockSignals(state);
659-
mpVisualizer->updateScene(value);
659+
mpVisualization->updateScene(value);
660660
mpViewerWidget->update();
661661
}
662662
}
@@ -671,7 +671,7 @@ void AbstractAnimationWindow::setSpeedSlotFunction()
671671
bool isFloat = true;
672672
double value = str.toFloat(&isFloat);
673673
if (isFloat && value > 0.0) {
674-
mpVisualizer->getTimeManager()->setSpeedUp(value);
674+
mpVisualization->getTimeManager()->setSpeedUp(value);
675675
mpViewerWidget->update();
676676
}
677677
}

‎OMEdit/OMEditLIB/Animation/AbstractAnimationWindow.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
#include "FMUSettingsDialog.h"
4747

48-
class VisualizerAbstract;
48+
class VisualizationAbstract;
4949
class ViewerWidget;
5050
class Label;
5151

@@ -70,7 +70,7 @@ class AbstractAnimationWindow : public QMainWindow
7070
public:
7171
AbstractAnimationWindow(QWidget *pParent);
7272
ViewerWidget* getViewerWidget() {return mpViewerWidget;}
73-
VisualizerAbstract* getVisualizer() {return mpVisualizer;}
73+
VisualizationAbstract* getVisualization() {return mpVisualization;}
7474
void openAnimationFile(QString fileName, bool stashCamera=false);
7575
virtual void createActions();
7676
void clearView();
@@ -83,7 +83,7 @@ class AbstractAnimationWindow : public QMainWindow
8383
std::string mPathName;
8484
std::string mFileName;
8585
//stores the data for the visualizers, time management, functionality for updating the values(mat/fmu) etc.
86-
VisualizerAbstract* mpVisualizer;
86+
VisualizationAbstract* mpVisualization;
8787
//widgets
8888
ViewerWidget *mpViewerWidget;
8989
QToolBar* mpAnimationToolBar;
@@ -114,7 +114,7 @@ class AbstractAnimationWindow : public QMainWindow
114114
void cameraPositionFront();
115115
void cameraPositionTop();
116116
double computeDistanceToOrigin();
117-
void openFMUSettingsDialog(VisualizerFMU *pVisualizerFMU);
117+
void openFMUSettingsDialog(VisualizationFMU *pVisualizationFMU);
118118
void updateControlPanelValues();
119119

120120
public slots:

OMEdit/OMEditLIB/Animation/AbstractVisualizers.cpp renamed to OMEdit/OMEditLIB/Animation/AbstractVisualizer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @author Volker Waurich <volker.waurich@tu-dresden.de>
3333
*/
3434

35-
#include "AbstractVisualizers.h"
35+
#include "AbstractVisualizer.h"
3636

3737
std::string operator+(const std::string& st, const VisualizerType type)
3838
{

OMEdit/OMEditLIB/Animation/AbstractVisualizers.h renamed to OMEdit/OMEditLIB/Animation/AbstractVisualizer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
* @author Volker Waurich <volker.waurich@tu-dresden.de>
3333
*/
3434

35-
#ifndef ABSTRACTVISUALIZERS_H
36-
#define ABSTRACTVISUALIZERS_H
35+
#ifndef ABSTRACTVISUALIZER_H
36+
#define ABSTRACTVISUALIZER_H
3737

3838
#include <iostream>
3939

‎OMEdit/OMEditLIB/Animation/AnimationWindow.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
#include "AnimationWindow.h"
3636
#include "Options/OptionsDialog.h"
37-
#include "Visualizer.h"
37+
#include "Visualization.h"
3838
#include <QAction>
3939

4040
/*!
@@ -56,8 +56,8 @@ AnimationWindow::AnimationWindow(QWidget *pParent)
5656
*/
5757
AnimationWindow::~AnimationWindow()
5858
{
59-
if (mpVisualizer) {
60-
delete mpVisualizer;
59+
if (mpVisualization) {
60+
delete mpVisualization;
6161
}
6262
}
6363

‎OMEdit/OMEditLIB/Animation/ExtraShapes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#ifndef EXTRASHAPES_H
3636
#define EXTRASHAPES_H
3737

38-
#include "Visualizer.h"
38+
#include "Visualization.h"
3939

4040
#include <osg/Node>
4141
#include <osg/Group>

‎OMEdit/OMEditLIB/Animation/FMUSettingsDialog.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
/*!
4444
* \brief FMUSettingsDialog::FMUSettingsDialog
4545
* \param pParent
46-
* \param pVisualizerFMU
46+
* \param pVisualizationFMU
4747
*/
48-
FMUSettingsDialog::FMUSettingsDialog(QWidget *pParent, VisualizerFMU* pVisualizerFMU)
48+
FMUSettingsDialog::FMUSettingsDialog(QWidget *pParent, VisualizationFMU* pVisualizationFMU)
4949
: QDialog(pParent),
50-
mpVisualizerFMU(pVisualizerFMU),
50+
mpVisualizationFMU(pVisualizationFMU),
5151
mStepSize(0.001),
5252
mRenderFreq(0.1)
5353
{
@@ -107,7 +107,7 @@ void FMUSettingsDialog::saveSimSettings()
107107
handleEvents = false;
108108
};
109109
//store in FMU simulator
110-
mpVisualizerFMU->setSimulationSettings(stepSize, static_cast<Solver>(mpSolverComboBox->itemData(mpSolverComboBox->currentIndex()).toInt()),
110+
mpVisualizationFMU->setSimulationSettings(stepSize, static_cast<Solver>(mpSolverComboBox->itemData(mpSolverComboBox->currentIndex()).toInt()),
111111
handleEvents);
112112
accept();
113113
}

‎OMEdit/OMEditLIB/Animation/FMUSettingsDialog.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#ifndef FMU_SETTINGS_WINDOW_H
3636
#define FMU_SETTINGS_WINDOW_H
3737

38-
#include "VisualizerFMU.h"
38+
#include "VisualizationFMU.h"
3939

4040
#include <QDialog>
4141
#include <QLineEdit>
@@ -49,9 +49,9 @@ class FMUSettingsDialog : public QDialog
4949
{
5050
Q_OBJECT
5151
public:
52-
FMUSettingsDialog(QWidget *pParent, VisualizerFMU *pVisualizerFMU);
52+
FMUSettingsDialog(QWidget *pParent, VisualizationFMU *pVisualizationFMU);
5353
private:
54-
VisualizerFMU *mpVisualizerFMU;
54+
VisualizationFMU *mpVisualizationFMU;
5555
double mStepSize;
5656
double mRenderFreq;
5757
bool mHandleEvents;

OMEdit/OMEditLIB/Animation/Shapes.cpp renamed to OMEdit/OMEditLIB/Animation/Shape.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @author Volker Waurich <volker.waurich@tu-dresden.de>
3333
*/
3434

35-
#include "Shapes.h"
35+
#include "Shape.h"
3636

3737
ShapeObject::ShapeObject()
3838
: AbstractVisualizerObject(VisualizerType::shape),

OMEdit/OMEditLIB/Animation/Shapes.h renamed to OMEdit/OMEditLIB/Animation/Shape.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
* @author Volker Waurich <volker.waurich@tu-dresden.de>
3333
*/
3434

35-
#ifndef SHAPES_H
36-
#define SHAPES_H
35+
#ifndef SHAPE_H
36+
#define SHAPE_H
3737

38-
#include "AbstractVisualizers.h"
38+
#include "AbstractVisualizer.h"
3939

4040
class ShapeObject : public AbstractVisualizerObject
4141
{

0 commit comments

Comments
 (0)