Skip to content
Snippets Groups Projects
Commit 3c3f8f65 authored by Van Herck, Walter's avatar Van Herck, Walter
Browse files

Rename: SimulationManager --> SimulationView

parent 339da988
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <QGridLayout> #include <QGridLayout>
#include <QMessageBox> #include <QMessageBox>
SimulationManager::SimulationManager(SimulationDataModel *p_simulation_data_model, QWidget *parent) SimulationView::SimulationView(SimulationDataModel *p_simulation_data_model, QWidget *parent)
: QWidget(parent) : QWidget(parent)
, mp_simulation_data_model(p_simulation_data_model) , mp_simulation_data_model(p_simulation_data_model)
{ {
...@@ -76,7 +76,7 @@ SimulationManager::SimulationManager(SimulationDataModel *p_simulation_data_mode ...@@ -76,7 +76,7 @@ SimulationManager::SimulationManager(SimulationDataModel *p_simulation_data_mode
connect(runSimulationButton, SIGNAL(clicked()), this, SLOT(onRunSimulation())); connect(runSimulationButton, SIGNAL(clicked()), this, SLOT(onRunSimulation()));
} }
void SimulationManager::updateViewElements() void SimulationView::updateViewElements()
{ {
instrumentSelectionBox->clear(); instrumentSelectionBox->clear();
instrumentSelectionBox->addItems(mp_simulation_data_model->getInstrumentList().keys()); instrumentSelectionBox->addItems(mp_simulation_data_model->getInstrumentList().keys());
...@@ -84,7 +84,7 @@ void SimulationManager::updateViewElements() ...@@ -84,7 +84,7 @@ void SimulationManager::updateViewElements()
sampleSelectionBox->addItems(mp_simulation_data_model->getSampleList().keys()); sampleSelectionBox->addItems(mp_simulation_data_model->getSampleList().keys());
} }
void SimulationManager::onRunSimulation() void SimulationView::onRunSimulation()
{ {
// initialize a Simulation object and run it // initialize a Simulation object and run it
QMessageBox::information(this, tr("Pushed \"Run Simulation\"-button"), QMessageBox::information(this, tr("Pushed \"Run Simulation\"-button"),
......
#ifndef SIMULATIONMANAGER_H #ifndef SIMULATIONVIEW_H
#define SIMULATIONMANAGER_H #define SIMULATIONVIEW_H
#include <QWidget> #include <QWidget>
...@@ -7,12 +7,12 @@ class SimulationDataModel; ...@@ -7,12 +7,12 @@ class SimulationDataModel;
class QComboBox; class QComboBox;
class QPushButton; class QPushButton;
class SimulationManager : public QWidget class SimulationView : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
SimulationManager(SimulationDataModel *p_simulation_data_model, QWidget *parent = 0); SimulationView(SimulationDataModel *p_simulation_data_model, QWidget *parent = 0);
void updateViewElements(); void updateViewElements();
public slots: public slots:
...@@ -25,4 +25,4 @@ private: ...@@ -25,4 +25,4 @@ private:
QPushButton *runSimulationButton; QPushButton *runSimulationButton;
}; };
#endif // SIMULATIONMANAGER_H #endif // SIMULATIONVIEW_H
...@@ -49,7 +49,7 @@ MainWindow::MainWindow(QWidget *parent) ...@@ -49,7 +49,7 @@ MainWindow::MainWindow(QWidget *parent)
m_welcomeView = new WelcomeManager(this); m_welcomeView = new WelcomeManager(this);
m_instrumentView = new InstrumentView(mp_sim_data_model, this); m_instrumentView = new InstrumentView(mp_sim_data_model, this);
m_sampleView = new SampleManager(this); m_sampleView = new SampleManager(this);
m_simulationView = new SimulationManager(mp_sim_data_model, this); m_simulationView = new SimulationView(mp_sim_data_model, this);
m_fitView = new FitManager(this); m_fitView = new FitManager(this);
m_tabWidget->insertTab(0, m_welcomeView, QIcon(":/images/mode_welcome.png"), "Welcome"); m_tabWidget->insertTab(0, m_welcomeView, QIcon(":/images/mode_welcome.png"), "Welcome");
......
...@@ -12,7 +12,7 @@ class TaskSelectorWidget; ...@@ -12,7 +12,7 @@ class TaskSelectorWidget;
class WelcomeManager; class WelcomeManager;
class InstrumentView; class InstrumentView;
class SampleManager; class SampleManager;
class SimulationManager; class SimulationView;
class FitManager; class FitManager;
class SimulationDataModel; class SimulationDataModel;
class Instrument; class Instrument;
...@@ -37,7 +37,7 @@ private: ...@@ -37,7 +37,7 @@ private:
WelcomeManager *m_welcomeView; WelcomeManager *m_welcomeView;
InstrumentView *m_instrumentView; InstrumentView *m_instrumentView;
SampleManager *m_sampleView; SampleManager *m_sampleView;
SimulationManager *m_simulationView; SimulationView *m_simulationView;
FitManager * m_fitView; FitManager * m_fitView;
SimulationDataModel *mp_sim_data_model; SimulationDataModel *mp_sim_data_model;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment