override miss
@@ -1,24 +1,25 | |||||
1 | #ifndef SCIQLOP_IVISUALIZATIONWIDGET_H |
|
1 | #ifndef SCIQLOP_IVISUALIZATIONWIDGET_H | |
2 | #define SCIQLOP_IVISUALIZATIONWIDGET_H |
|
2 | #define SCIQLOP_IVISUALIZATIONWIDGET_H | |
3 |
|
3 | |||
4 | #include "Visualization/IVisualizationWidgetVisitor.h" |
|
|||
5 |
|
4 | |||
6 | #include <QString> |
|
5 | #include <QString> | |
7 | #include <memory> |
|
6 | #include <memory> | |
8 |
|
7 | |||
|
8 | class IVisualizationWidgetVisitor; | |||
|
9 | ||||
9 | /** |
|
10 | /** | |
10 | * @brief The IVisualizationWidget handles the visualization widget. |
|
11 | * @brief The IVisualizationWidget handles the visualization widget. | |
11 | */ |
|
12 | */ | |
12 | class IVisualizationWidget { |
|
13 | class IVisualizationWidget { | |
13 |
|
14 | |||
14 | public: |
|
15 | public: | |
15 | virtual ~IVisualizationWidget() = default; |
|
16 | virtual ~IVisualizationWidget() = default; | |
16 |
|
17 | |||
17 | /// Initializes the plugin |
|
18 | /// Initializes the plugin | |
18 | virtual void accept(IVisualizationWidget *visitor) = 0; |
|
19 | virtual void accept(IVisualizationWidgetVisitor *visitor) = 0; | |
19 | virtual void close() = 0; |
|
20 | virtual void close() = 0; | |
20 | virtual QString name() const = 0; |
|
21 | virtual QString name() const = 0; | |
21 | }; |
|
22 | }; | |
22 |
|
23 | |||
23 |
|
24 | |||
24 | #endif // SCIQLOP_IVISUALIZATIONWIDGET_H |
|
25 | #endif // SCIQLOP_IVISUALIZATIONWIDGET_H |
@@ -1,25 +1,28 | |||||
1 | #ifndef SCIQLOP_IVISUALIZATIONWIDGETVISITOR_H |
|
1 | #ifndef SCIQLOP_IVISUALIZATIONWIDGETVISITOR_H | |
2 | #define SCIQLOP_IVISUALIZATIONWIDGETVISITOR_H |
|
2 | #define SCIQLOP_IVISUALIZATIONWIDGETVISITOR_H | |
3 |
|
3 | |||
4 |
|
4 | |||
5 | class VisualizationWidget; |
|
5 | class VisualizationWidget; | |
6 | class VisualizationTabWidget; |
|
6 | class VisualizationTabWidget; | |
7 | class VisualizationZoneWidget; |
|
7 | class VisualizationZoneWidget; | |
8 | class VisualizationGraphWidget; |
|
8 | class VisualizationGraphWidget; | |
9 |
|
9 | |||
10 | /** |
|
10 | /** | |
11 | * @brief The IVisualizationWidgetVisitor handles the visualization widget vistor pattern. |
|
11 | * @brief The IVisualizationWidgetVisitor handles the visualization widget vistor pattern. | |
12 | */ |
|
12 | */ | |
13 | class IVisualizationWidgetVisitor { |
|
13 | class IVisualizationWidgetVisitor { | |
14 |
|
14 | |||
15 | public: |
|
15 | public: | |
16 | virtual ~IVisualizationWidgetVisitor() = default; |
|
16 | virtual ~IVisualizationWidgetVisitor() = default; | |
17 |
|
17 | |||
18 | virtual void visit(VisualizationWidget *widget) = 0; |
|
18 | virtual void visitEnter(VisualizationWidget *widget) = 0; | |
19 |
virtual void visit(Visualization |
|
19 | virtual void visitLeave(VisualizationWidget *widget) = 0; | |
20 |
virtual void visit(Visualization |
|
20 | virtual void visitEnter(VisualizationTabWidget *tabWidget) = 0; | |
|
21 | virtual void visitLeave(VisualizationTabWidget *tabWidget) = 0; | |||
|
22 | virtual void visitEnter(VisualizationZoneWidget *zoneWidget) = 0; | |||
|
23 | virtual void visitLeave(VisualizationZoneWidget *zoneWidget) = 0; | |||
21 | virtual void visit(VisualizationGraphWidget *graphWidget) = 0; |
|
24 | virtual void visit(VisualizationGraphWidget *graphWidget) = 0; | |
22 | }; |
|
25 | }; | |
23 |
|
26 | |||
24 |
|
27 | |||
25 | #endif // SCIQLOP_IVISUALIZATIONWIDGETVISITOR_H |
|
28 | #endif // SCIQLOP_IVISUALIZATIONWIDGETVISITOR_H |
@@ -1,43 +1,43 | |||||
1 | #ifndef SCIQLOP_VISUALIZATIONGRAPHWIDGET_H |
|
1 | #ifndef SCIQLOP_VISUALIZATIONGRAPHWIDGET_H | |
2 | #define SCIQLOP_VISUALIZATIONGRAPHWIDGET_H |
|
2 | #define SCIQLOP_VISUALIZATIONGRAPHWIDGET_H | |
3 |
|
3 | |||
4 | #include "Visualization/IVisualizationWidget.h" |
|
4 | #include "Visualization/IVisualizationWidget.h" | |
5 |
|
5 | |||
6 | #include <QWidget> |
|
6 | #include <QWidget> | |
7 |
|
7 | |||
8 | #include <memory> |
|
8 | #include <memory> | |
9 |
|
9 | |||
10 | #include <Common/spimpl.h> |
|
10 | #include <Common/spimpl.h> | |
11 |
|
11 | |||
12 | class Variable; |
|
12 | class Variable; | |
13 |
|
13 | |||
14 | namespace Ui { |
|
14 | namespace Ui { | |
15 | class VisualizationGraphWidget; |
|
15 | class VisualizationGraphWidget; | |
16 | } // namespace Ui |
|
16 | } // namespace Ui | |
17 |
|
17 | |||
18 | class VisualizationGraphWidget : public QWidget, public IVisualizationWidget { |
|
18 | class VisualizationGraphWidget : public QWidget, public IVisualizationWidget { | |
19 | Q_OBJECT |
|
19 | Q_OBJECT | |
20 |
|
20 | |||
21 | public: |
|
21 | public: | |
22 | explicit VisualizationGraphWidget(const QString &name = {}, QWidget *parent = 0); |
|
22 | explicit VisualizationGraphWidget(const QString &name = {}, QWidget *parent = 0); | |
23 | virtual ~VisualizationGraphWidget(); |
|
23 | virtual ~VisualizationGraphWidget(); | |
24 |
|
24 | |||
25 | void addVariable(std::shared_ptr<Variable> variable); |
|
25 | void addVariable(std::shared_ptr<Variable> variable); | |
26 |
|
26 | |||
27 | // IVisualizationWidget interface |
|
27 | // IVisualizationWidget interface | |
28 | void accept(IVisualizationWidget *visitor) override; |
|
28 | void accept(IVisualizationWidgetVisitor *visitor) override; | |
29 | void close() override; |
|
29 | void close() override; | |
30 | QString name() const; |
|
30 | QString name() const; | |
31 |
|
31 | |||
32 | private: |
|
32 | private: | |
33 | Ui::VisualizationGraphWidget *ui; |
|
33 | Ui::VisualizationGraphWidget *ui; | |
34 |
|
34 | |||
35 | class VisualizationGraphWidgetPrivate; |
|
35 | class VisualizationGraphWidgetPrivate; | |
36 | spimpl::unique_impl_ptr<VisualizationGraphWidgetPrivate> impl; |
|
36 | spimpl::unique_impl_ptr<VisualizationGraphWidgetPrivate> impl; | |
37 |
|
37 | |||
38 | private slots: |
|
38 | private slots: | |
39 | /// Slot called when a mouse wheel was made, to perform some processing before the zoom is done |
|
39 | /// Slot called when a mouse wheel was made, to perform some processing before the zoom is done | |
40 | void onMouseWheel(QWheelEvent *event) noexcept; |
|
40 | void onMouseWheel(QWheelEvent *event) noexcept; | |
41 | }; |
|
41 | }; | |
42 |
|
42 | |||
43 | #endif // SCIQLOP_VISUALIZATIONGRAPHWIDGET_H |
|
43 | #endif // SCIQLOP_VISUALIZATIONGRAPHWIDGET_H |
@@ -1,50 +1,50 | |||||
1 | #ifndef SCIQLOP_VISUALIZATIONTABWIDGET_H |
|
1 | #ifndef SCIQLOP_VISUALIZATIONTABWIDGET_H | |
2 | #define SCIQLOP_VISUALIZATIONTABWIDGET_H |
|
2 | #define SCIQLOP_VISUALIZATIONTABWIDGET_H | |
3 |
|
3 | |||
4 | #include "Visualization/IVisualizationWidget.h" |
|
4 | #include "Visualization/IVisualizationWidget.h" | |
5 |
|
5 | |||
6 | #include <Common/spimpl.h> |
|
6 | #include <Common/spimpl.h> | |
7 |
|
7 | |||
8 | #include <QWidget> |
|
8 | #include <QWidget> | |
9 |
|
9 | |||
10 | class Variable; |
|
10 | class Variable; | |
11 | class VisualizationZoneWidget; |
|
11 | class VisualizationZoneWidget; | |
12 |
|
12 | |||
13 | namespace Ui { |
|
13 | namespace Ui { | |
14 | class VisualizationTabWidget; |
|
14 | class VisualizationTabWidget; | |
15 | } // namespace Ui |
|
15 | } // namespace Ui | |
16 |
|
16 | |||
17 | class VisualizationTabWidget : public QWidget, public IVisualizationWidget { |
|
17 | class VisualizationTabWidget : public QWidget, public IVisualizationWidget { | |
18 | Q_OBJECT |
|
18 | Q_OBJECT | |
19 |
|
19 | |||
20 | public: |
|
20 | public: | |
21 | explicit VisualizationTabWidget(const QString &name = {}, QWidget *parent = 0); |
|
21 | explicit VisualizationTabWidget(const QString &name = {}, QWidget *parent = 0); | |
22 | virtual ~VisualizationTabWidget(); |
|
22 | virtual ~VisualizationTabWidget(); | |
23 |
|
23 | |||
24 | /// Add a zone widget |
|
24 | /// Add a zone widget | |
25 | void addZone(VisualizationZoneWidget *zoneWidget); |
|
25 | void addZone(VisualizationZoneWidget *zoneWidget); | |
26 |
|
26 | |||
27 | /** |
|
27 | /** | |
28 | * Creates a zone using a variable. The variable will be displayed in a new graph of the new |
|
28 | * Creates a zone using a variable. The variable will be displayed in a new graph of the new | |
29 | * zone. |
|
29 | * zone. | |
30 | * @param variable the variable for which to create the zone |
|
30 | * @param variable the variable for which to create the zone | |
31 | * @return the pointer to the created zone |
|
31 | * @return the pointer to the created zone | |
32 | */ |
|
32 | */ | |
33 | VisualizationZoneWidget *createZone(std::shared_ptr<Variable> variable); |
|
33 | VisualizationZoneWidget *createZone(std::shared_ptr<Variable> variable); | |
34 |
|
34 | |||
35 | /// Remove a zone |
|
35 | /// Remove a zone | |
36 | void removeZone(VisualizationZoneWidget *zone); |
|
36 | void removeZone(VisualizationZoneWidget *zone); | |
37 |
|
37 | |||
38 | // IVisualizationWidget interface |
|
38 | // IVisualizationWidget interface | |
39 | void accept(IVisualizationWidget *visitor) override; |
|
39 | void accept(IVisualizationWidgetVisitor *visitor) override; | |
40 | void close() override; |
|
40 | void close() override; | |
41 | QString name() const override; |
|
41 | QString name() const override; | |
42 |
|
42 | |||
43 | private: |
|
43 | private: | |
44 | Ui::VisualizationTabWidget *ui; |
|
44 | Ui::VisualizationTabWidget *ui; | |
45 |
|
45 | |||
46 | class VisualizationTabWidgetPrivate; |
|
46 | class VisualizationTabWidgetPrivate; | |
47 | spimpl::unique_impl_ptr<VisualizationTabWidgetPrivate> impl; |
|
47 | spimpl::unique_impl_ptr<VisualizationTabWidgetPrivate> impl; | |
48 | }; |
|
48 | }; | |
49 |
|
49 | |||
50 | #endif // SCIQLOP_VISUALIZATIONTABWIDGET_H |
|
50 | #endif // SCIQLOP_VISUALIZATIONTABWIDGET_H |
@@ -1,52 +1,52 | |||||
1 | #ifndef SCIQLOP_VISUALIZATIONWIDGET_H |
|
1 | #ifndef SCIQLOP_VISUALIZATIONWIDGET_H | |
2 | #define SCIQLOP_VISUALIZATIONWIDGET_H |
|
2 | #define SCIQLOP_VISUALIZATIONWIDGET_H | |
3 |
|
3 | |||
4 | #include "Visualization/IVisualizationWidget.h" |
|
4 | #include "Visualization/IVisualizationWidget.h" | |
5 |
|
5 | |||
6 | #include <QLoggingCategory> |
|
6 | #include <QLoggingCategory> | |
7 | #include <QWidget> |
|
7 | #include <QWidget> | |
8 |
|
8 | |||
9 | class Variable; |
|
9 | class Variable; | |
10 | class VisualizationTabWidget; |
|
10 | class VisualizationTabWidget; | |
11 |
|
11 | |||
12 | Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationWidget) |
|
12 | Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationWidget) | |
13 |
|
13 | |||
14 | namespace Ui { |
|
14 | namespace Ui { | |
15 | class VisualizationWidget; |
|
15 | class VisualizationWidget; | |
16 | } // namespace Ui |
|
16 | } // namespace Ui | |
17 |
|
17 | |||
18 | class VisualizationWidget : public QWidget, public IVisualizationWidget { |
|
18 | class VisualizationWidget : public QWidget, public IVisualizationWidget { | |
19 | Q_OBJECT |
|
19 | Q_OBJECT | |
20 |
|
20 | |||
21 | public: |
|
21 | public: | |
22 | explicit VisualizationWidget(QWidget *parent = 0); |
|
22 | explicit VisualizationWidget(QWidget *parent = 0); | |
23 | virtual ~VisualizationWidget(); |
|
23 | virtual ~VisualizationWidget(); | |
24 |
|
24 | |||
25 | /// Add a zone widget |
|
25 | /// Add a zone widget | |
26 | virtual void addTab(VisualizationTabWidget *tabWidget); |
|
26 | virtual void addTab(VisualizationTabWidget *tabWidget); | |
27 |
|
27 | |||
28 | /// Create a tab using a Variable |
|
28 | /// Create a tab using a Variable | |
29 | VisualizationTabWidget *createTab(); |
|
29 | VisualizationTabWidget *createTab(); | |
30 |
|
30 | |||
31 | /// Remove a tab |
|
31 | /// Remove a tab | |
32 | void removeTab(VisualizationTabWidget *tab); |
|
32 | void removeTab(VisualizationTabWidget *tab); | |
33 |
|
33 | |||
34 | // IVisualizationWidget interface |
|
34 | // IVisualizationWidget interface | |
35 | void accept(IVisualizationWidget *visitor) override; |
|
35 | void accept(IVisualizationWidgetVisitor *visitor) override; | |
36 | void close() override; |
|
36 | void close() override; | |
37 | QString name() const; |
|
37 |
QString name() const;
|
|
38 |
|
38 | |||
39 | public slots: |
|
39 | public slots: | |
40 | /** |
|
40 | /** | |
41 | * Displays a variable in a new graph of a new zone of the current tab |
|
41 | * Displays a variable in a new graph of a new zone of the current tab | |
42 | * @param variable the variable to display |
|
42 | * @param variable the variable to display | |
43 | * @todo this is a temporary method that will be replaced by own actions for each type of |
|
43 | * @todo this is a temporary method that will be replaced by own actions for each type of | |
44 | * visualization widget |
|
44 | * visualization widget | |
45 | */ |
|
45 | */ | |
46 | void displayVariable(std::shared_ptr<Variable> variable) noexcept; |
|
46 | void displayVariable(std::shared_ptr<Variable> variable) noexcept; | |
47 |
|
47 | |||
48 | private: |
|
48 | private: | |
49 | Ui::VisualizationWidget *ui; |
|
49 | Ui::VisualizationWidget *ui; | |
50 | }; |
|
50 | }; | |
51 |
|
51 | |||
52 | #endif // VISUALIZATIONWIDGET_H |
|
52 | #endif // VISUALIZATIONWIDGET_H |
@@ -1,44 +1,44 | |||||
1 | #ifndef SCIQLOP_VISUALIZATIONZONEWIDGET_H |
|
1 | #ifndef SCIQLOP_VISUALIZATIONZONEWIDGET_H | |
2 | #define SCIQLOP_VISUALIZATIONZONEWIDGET_H |
|
2 | #define SCIQLOP_VISUALIZATIONZONEWIDGET_H | |
3 |
|
3 | |||
4 | #include "Visualization/IVisualizationWidget.h" |
|
4 | #include "Visualization/IVisualizationWidget.h" | |
5 |
|
5 | |||
6 | #include <QWidget> |
|
6 | #include <QWidget> | |
7 |
|
7 | |||
8 | namespace Ui { |
|
8 | namespace Ui { | |
9 | class VisualizationZoneWidget; |
|
9 | class VisualizationZoneWidget; | |
10 | } // Ui |
|
10 | } // Ui | |
11 |
|
11 | |||
12 | class Variable; |
|
12 | class Variable; | |
13 | class VisualizationGraphWidget; |
|
13 | class VisualizationGraphWidget; | |
14 |
|
14 | |||
15 | class VisualizationZoneWidget : public QWidget, public IVisualizationWidget { |
|
15 | class VisualizationZoneWidget : public QWidget, public IVisualizationWidget { | |
16 | Q_OBJECT |
|
16 | Q_OBJECT | |
17 |
|
17 | |||
18 | public: |
|
18 | public: | |
19 | explicit VisualizationZoneWidget(const QString &name = {}, QWidget *parent = 0); |
|
19 | explicit VisualizationZoneWidget(const QString &name = {}, QWidget *parent = 0); | |
20 | virtual ~VisualizationZoneWidget(); |
|
20 | virtual ~VisualizationZoneWidget(); | |
21 |
|
21 | |||
22 | /// Add a graph widget |
|
22 | /// Add a graph widget | |
23 | void addGraph(VisualizationGraphWidget *graphWidget); |
|
23 | void addGraph(VisualizationGraphWidget *graphWidget); | |
24 |
|
24 | |||
25 | /** |
|
25 | /** | |
26 | * Creates a graph using a variable. The variable will be displayed in the new graph. |
|
26 | * Creates a graph using a variable. The variable will be displayed in the new graph. | |
27 | * @param variable the variable for which to create the graph |
|
27 | * @param variable the variable for which to create the graph | |
28 | * @return the pointer to the created graph |
|
28 | * @return the pointer to the created graph | |
29 | */ |
|
29 | */ | |
30 | VisualizationGraphWidget *createGraph(std::shared_ptr<Variable> variable); |
|
30 | VisualizationGraphWidget *createGraph(std::shared_ptr<Variable> variable); | |
31 |
|
31 | |||
32 | /// Remove a graph |
|
32 | /// Remove a graph | |
33 | void removeGraph(VisualizationGraphWidget *graph); |
|
33 | void removeGraph(VisualizationGraphWidget *graph); | |
34 |
|
34 | |||
35 | // IVisualizationWidget interface |
|
35 | // IVisualizationWidget interface | |
36 | void accept(IVisualizationWidget *visitor) override; |
|
36 | void accept(IVisualizationWidgetVisitor *visitor) override; | |
37 | void close() override; |
|
37 | void close() override; | |
38 | QString name() const override; |
|
38 | QString name() const override; | |
39 |
|
39 | |||
40 | private: |
|
40 | private: | |
41 | Ui::VisualizationZoneWidget *ui; |
|
41 | Ui::VisualizationZoneWidget *ui; | |
42 | }; |
|
42 | }; | |
43 |
|
43 | |||
44 | #endif // SCIQLOP_VISUALIZATIONZONEWIDGET_H |
|
44 | #endif // SCIQLOP_VISUALIZATIONZONEWIDGET_H |
@@ -1,95 +1,96 | |||||
1 | #include "Visualization/VisualizationGraphWidget.h" |
|
1 | #include "Visualization/VisualizationGraphWidget.h" | |
2 | #include "Visualization/GraphPlottablesFactory.h" |
|
2 | #include "Visualization/GraphPlottablesFactory.h" | |
|
3 | #include "Visualization/IVisualizationWidgetVisitor.h" | |||
3 | #include "ui_VisualizationGraphWidget.h" |
|
4 | #include "ui_VisualizationGraphWidget.h" | |
4 |
|
5 | |||
5 | #include <Variable/Variable.h> |
|
6 | #include <Variable/Variable.h> | |
6 |
|
7 | |||
7 | #include <unordered_map> |
|
8 | #include <unordered_map> | |
8 |
|
9 | |||
9 | namespace { |
|
10 | namespace { | |
10 |
|
11 | |||
11 | /// Key pressed to enable zoom on horizontal axis |
|
12 | /// Key pressed to enable zoom on horizontal axis | |
12 | const auto HORIZONTAL_ZOOM_MODIFIER = Qt::NoModifier; |
|
13 | const auto HORIZONTAL_ZOOM_MODIFIER = Qt::NoModifier; | |
13 |
|
14 | |||
14 | /// Key pressed to enable zoom on vertical axis |
|
15 | /// Key pressed to enable zoom on vertical axis | |
15 | const auto VERTICAL_ZOOM_MODIFIER = Qt::ControlModifier; |
|
16 | const auto VERTICAL_ZOOM_MODIFIER = Qt::ControlModifier; | |
16 |
|
17 | |||
17 | } // namespace |
|
18 | } // namespace | |
18 |
|
19 | |||
19 | struct VisualizationGraphWidget::VisualizationGraphWidgetPrivate { |
|
20 | struct VisualizationGraphWidget::VisualizationGraphWidgetPrivate { | |
20 |
|
21 | |||
21 | // 1 variable -> n qcpplot |
|
22 | // 1 variable -> n qcpplot | |
22 | std::unordered_map<std::shared_ptr<Variable>, QCPAbstractPlottable *> m_VariableToPlotMap; |
|
23 | std::unordered_map<std::shared_ptr<Variable>, QCPAbstractPlottable *> m_VariableToPlotMap; | |
23 | }; |
|
24 | }; | |
24 |
|
25 | |||
25 | VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget *parent) |
|
26 | VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget *parent) | |
26 | : QWidget{parent}, |
|
27 | : QWidget{parent}, | |
27 | ui{new Ui::VisualizationGraphWidget}, |
|
28 | ui{new Ui::VisualizationGraphWidget}, | |
28 | impl{spimpl::make_unique_impl<VisualizationGraphWidgetPrivate>()} |
|
29 | impl{spimpl::make_unique_impl<VisualizationGraphWidgetPrivate>()} | |
29 | { |
|
30 | { | |
30 | ui->setupUi(this); |
|
31 | ui->setupUi(this); | |
31 |
|
32 | |||
32 | // qcpplot title |
|
33 | // qcpplot title | |
33 | ui->widget->plotLayout()->insertRow(0); |
|
34 | ui->widget->plotLayout()->insertRow(0); | |
34 | ui->widget->plotLayout()->addElement(0, 0, new QCPTextElement{ui->widget, name}); |
|
35 | ui->widget->plotLayout()->addElement(0, 0, new QCPTextElement{ui->widget, name}); | |
35 |
|
36 | |||
36 | // Set qcpplot properties : |
|
37 | // Set qcpplot properties : | |
37 | // - Drag (on x-axis) and zoom are enabled |
|
38 | // - Drag (on x-axis) and zoom are enabled | |
38 | // - Mouse wheel on qcpplot is intercepted to determine the zoom orientation |
|
39 | // - Mouse wheel on qcpplot is intercepted to determine the zoom orientation | |
39 | ui->widget->setInteractions(QCP::iRangeDrag | QCP::iRangeZoom); |
|
40 | ui->widget->setInteractions(QCP::iRangeDrag | QCP::iRangeZoom); | |
40 | ui->widget->axisRect()->setRangeDrag(Qt::Horizontal); |
|
41 | ui->widget->axisRect()->setRangeDrag(Qt::Horizontal); | |
41 | connect(ui->widget, &QCustomPlot::mouseWheel, this, &VisualizationGraphWidget::onMouseWheel); |
|
42 | connect(ui->widget, &QCustomPlot::mouseWheel, this, &VisualizationGraphWidget::onMouseWheel); | |
42 | } |
|
43 | } | |
43 |
|
44 | |||
44 | VisualizationGraphWidget::~VisualizationGraphWidget() |
|
45 | VisualizationGraphWidget::~VisualizationGraphWidget() | |
45 | { |
|
46 | { | |
46 | delete ui; |
|
47 | delete ui; | |
47 | } |
|
48 | } | |
48 |
|
49 | |||
49 | void VisualizationGraphWidget::addVariable(std::shared_ptr<Variable> variable) |
|
50 | void VisualizationGraphWidget::addVariable(std::shared_ptr<Variable> variable) | |
50 | { |
|
51 | { | |
51 | // Uses delegate to create the qcpplot components according to the variable |
|
52 | // Uses delegate to create the qcpplot components according to the variable | |
52 | auto createdPlottables = GraphPlottablesFactory::create(variable, *ui->widget); |
|
53 | auto createdPlottables = GraphPlottablesFactory::create(variable, *ui->widget); | |
53 |
|
54 | |||
54 | for (auto createdPlottable : qAsConst(createdPlottables)) { |
|
55 | for (auto createdPlottable : qAsConst(createdPlottables)) { | |
55 | impl->m_VariableToPlotMap.insert({variable, createdPlottable}); |
|
56 | impl->m_VariableToPlotMap.insert({variable, createdPlottable}); | |
56 | } |
|
57 | } | |
57 | } |
|
58 | } | |
58 |
|
59 | |||
59 | void VisualizationGraphWidget::accept(IVisualizationWidget *visitor) |
|
60 | void VisualizationGraphWidget::accept(IVisualizationWidgetVisitor *visitor) | |
60 | { |
|
61 | { | |
61 | // TODO: manage the visitor |
|
62 | // TODO: manage the visitor | |
62 | } |
|
63 | } | |
63 |
|
64 | |||
64 | void VisualizationGraphWidget::close() |
|
65 | void VisualizationGraphWidget::close() | |
65 | { |
|
66 | { | |
66 | // The main view cannot be directly closed. |
|
67 | // The main view cannot be directly closed. | |
67 | return; |
|
68 | return; | |
68 | } |
|
69 | } | |
69 |
|
70 | |||
70 | QString VisualizationGraphWidget::name() const |
|
71 | QString VisualizationGraphWidget::name() const | |
71 | { |
|
72 | { | |
72 | if (auto title = dynamic_cast<QCPTextElement *>(ui->widget->plotLayout()->elementAt(0))) { |
|
73 | if (auto title = dynamic_cast<QCPTextElement *>(ui->widget->plotLayout()->elementAt(0))) { | |
73 | return title->text(); |
|
74 | return title->text(); | |
74 | } |
|
75 | } | |
75 | else { |
|
76 | else { | |
76 | return QString{}; |
|
77 | return QString{}; | |
77 | } |
|
78 | } | |
78 | } |
|
79 | } | |
79 |
|
80 | |||
80 | void VisualizationGraphWidget::onMouseWheel(QWheelEvent *event) noexcept |
|
81 | void VisualizationGraphWidget::onMouseWheel(QWheelEvent *event) noexcept | |
81 | { |
|
82 | { | |
82 | auto zoomOrientations = QFlags<Qt::Orientation>{}; |
|
83 | auto zoomOrientations = QFlags<Qt::Orientation>{}; | |
83 |
|
84 | |||
84 | // Lambda that enables a zoom orientation if the key modifier related to this orientation has |
|
85 | // Lambda that enables a zoom orientation if the key modifier related to this orientation has | |
85 | // been pressed |
|
86 | // been pressed | |
86 | auto enableOrientation |
|
87 | auto enableOrientation | |
87 | = [&zoomOrientations, event](const auto &orientation, const auto &modifier) { |
|
88 | = [&zoomOrientations, event](const auto &orientation, const auto &modifier) { | |
88 | auto orientationEnabled = event->modifiers().testFlag(modifier); |
|
89 | auto orientationEnabled = event->modifiers().testFlag(modifier); | |
89 | zoomOrientations.setFlag(orientation, orientationEnabled); |
|
90 | zoomOrientations.setFlag(orientation, orientationEnabled); | |
90 | }; |
|
91 | }; | |
91 | enableOrientation(Qt::Vertical, VERTICAL_ZOOM_MODIFIER); |
|
92 | enableOrientation(Qt::Vertical, VERTICAL_ZOOM_MODIFIER); | |
92 | enableOrientation(Qt::Horizontal, HORIZONTAL_ZOOM_MODIFIER); |
|
93 | enableOrientation(Qt::Horizontal, HORIZONTAL_ZOOM_MODIFIER); | |
93 |
|
94 | |||
94 | ui->widget->axisRect()->setRangeZoom(zoomOrientations); |
|
95 | ui->widget->axisRect()->setRangeZoom(zoomOrientations); | |
95 | } |
|
96 | } |
@@ -1,77 +1,78 | |||||
1 | #include "Visualization/VisualizationTabWidget.h" |
|
1 | #include "Visualization/VisualizationTabWidget.h" | |
|
2 | #include "Visualization/IVisualizationWidgetVisitor.h" | |||
2 | #include "ui_VisualizationTabWidget.h" |
|
3 | #include "ui_VisualizationTabWidget.h" | |
3 |
|
4 | |||
4 | #include "Visualization/VisualizationZoneWidget.h" |
|
5 | #include "Visualization/VisualizationZoneWidget.h" | |
5 |
|
6 | |||
6 | namespace { |
|
7 | namespace { | |
7 |
|
8 | |||
8 | /// Generates a default name for a new zone, according to the number of zones already displayed in |
|
9 | /// Generates a default name for a new zone, according to the number of zones already displayed in | |
9 | /// the tab |
|
10 | /// the tab | |
10 | QString defaultZoneName(const QLayout &layout) |
|
11 | QString defaultZoneName(const QLayout &layout) | |
11 | { |
|
12 | { | |
12 | auto count = 0; |
|
13 | auto count = 0; | |
13 | for (auto i = 0; i < layout.count(); ++i) { |
|
14 | for (auto i = 0; i < layout.count(); ++i) { | |
14 | if (dynamic_cast<VisualizationZoneWidget *>(layout.itemAt(i)->widget())) { |
|
15 | if (dynamic_cast<VisualizationZoneWidget *>(layout.itemAt(i)->widget())) { | |
15 | count++; |
|
16 | count++; | |
16 | } |
|
17 | } | |
17 | } |
|
18 | } | |
18 |
|
19 | |||
19 | return QObject::tr("Zone %1").arg(count + 1); |
|
20 | return QObject::tr("Zone %1").arg(count + 1); | |
20 | } |
|
21 | } | |
21 |
|
22 | |||
22 | } // namespace |
|
23 | } // namespace | |
23 |
|
24 | |||
24 | struct VisualizationTabWidget::VisualizationTabWidgetPrivate { |
|
25 | struct VisualizationTabWidget::VisualizationTabWidgetPrivate { | |
25 | explicit VisualizationTabWidgetPrivate(const QString &name) : m_Name{name} {} |
|
26 | explicit VisualizationTabWidgetPrivate(const QString &name) : m_Name{name} {} | |
26 |
|
27 | |||
27 | QString m_Name; |
|
28 | QString m_Name; | |
28 | }; |
|
29 | }; | |
29 |
|
30 | |||
30 | VisualizationTabWidget::VisualizationTabWidget(const QString &name, QWidget *parent) |
|
31 | VisualizationTabWidget::VisualizationTabWidget(const QString &name, QWidget *parent) | |
31 | : QWidget{parent}, |
|
32 | : QWidget{parent}, | |
32 | ui{new Ui::VisualizationTabWidget}, |
|
33 | ui{new Ui::VisualizationTabWidget}, | |
33 | impl{spimpl::make_unique_impl<VisualizationTabWidgetPrivate>(name)} |
|
34 | impl{spimpl::make_unique_impl<VisualizationTabWidgetPrivate>(name)} | |
34 | { |
|
35 | { | |
35 | ui->setupUi(this); |
|
36 | ui->setupUi(this); | |
36 | } |
|
37 | } | |
37 |
|
38 | |||
38 | VisualizationTabWidget::~VisualizationTabWidget() |
|
39 | VisualizationTabWidget::~VisualizationTabWidget() | |
39 | { |
|
40 | { | |
40 | delete ui; |
|
41 | delete ui; | |
41 | } |
|
42 | } | |
42 |
|
43 | |||
43 | void VisualizationTabWidget::addZone(VisualizationZoneWidget *zoneWidget) |
|
44 | void VisualizationTabWidget::addZone(VisualizationZoneWidget *zoneWidget) | |
44 | { |
|
45 | { | |
45 | this->layout()->addWidget(zoneWidget); |
|
46 | this->layout()->addWidget(zoneWidget); | |
46 | } |
|
47 | } | |
47 |
|
48 | |||
48 | VisualizationZoneWidget *VisualizationTabWidget::createZone(std::shared_ptr<Variable> variable) |
|
49 | VisualizationZoneWidget *VisualizationTabWidget::createZone(std::shared_ptr<Variable> variable) | |
49 | { |
|
50 | { | |
50 | auto zoneWidget = new VisualizationZoneWidget{defaultZoneName(*layout()), this}; |
|
51 | auto zoneWidget = new VisualizationZoneWidget{defaultZoneName(*layout()), this}; | |
51 | this->addZone(zoneWidget); |
|
52 | this->addZone(zoneWidget); | |
52 |
|
53 | |||
53 | // Creates a new graph into the zone |
|
54 | // Creates a new graph into the zone | |
54 | zoneWidget->createGraph(variable); |
|
55 | zoneWidget->createGraph(variable); | |
55 |
|
56 | |||
56 | return zoneWidget; |
|
57 | return zoneWidget; | |
57 | } |
|
58 | } | |
58 |
|
59 | |||
59 | void VisualizationTabWidget::removeZone(VisualizationZoneWidget *zone) |
|
60 | void VisualizationTabWidget::removeZone(VisualizationZoneWidget *zone) | |
60 | { |
|
61 | { | |
61 | } |
|
62 | } | |
62 |
|
63 | |||
63 | void VisualizationTabWidget::accept(IVisualizationWidget *visitor) |
|
64 | void VisualizationTabWidget::accept(IVisualizationWidgetVisitor *visitor) | |
64 | { |
|
65 | { | |
65 | // TODO: manage the visitor |
|
66 | // TODO: manage the visitor | |
66 | } |
|
67 | } | |
67 |
|
68 | |||
68 | void VisualizationTabWidget::close() |
|
69 | void VisualizationTabWidget::close() | |
69 | { |
|
70 | { | |
70 | // The main view cannot be directly closed. |
|
71 | // The main view cannot be directly closed. | |
71 | return; |
|
72 | return; | |
72 | } |
|
73 | } | |
73 |
|
74 | |||
74 | QString VisualizationTabWidget::name() const |
|
75 | QString VisualizationTabWidget::name() const | |
75 | { |
|
76 | { | |
76 | return impl->m_Name; |
|
77 | return impl->m_Name; | |
77 | } |
|
78 | } |
@@ -1,112 +1,113 | |||||
1 | #include "Visualization/VisualizationWidget.h" |
|
1 | #include "Visualization/VisualizationWidget.h" | |
|
2 | #include "Visualization/IVisualizationWidgetVisitor.h" | |||
2 | #include "Visualization/VisualizationGraphWidget.h" |
|
3 | #include "Visualization/VisualizationGraphWidget.h" | |
3 | #include "Visualization/VisualizationTabWidget.h" |
|
4 | #include "Visualization/VisualizationTabWidget.h" | |
4 | #include "Visualization/VisualizationZoneWidget.h" |
|
5 | #include "Visualization/VisualizationZoneWidget.h" | |
5 | #include "Visualization/qcustomplot.h" |
|
6 | #include "Visualization/qcustomplot.h" | |
6 |
|
7 | |||
7 | #include "ui_VisualizationWidget.h" |
|
8 | #include "ui_VisualizationWidget.h" | |
8 |
|
9 | |||
9 | #include <QToolButton> |
|
10 | #include <QToolButton> | |
10 |
|
11 | |||
11 | Q_LOGGING_CATEGORY(LOG_VisualizationWidget, "VisualizationWidget") |
|
12 | Q_LOGGING_CATEGORY(LOG_VisualizationWidget, "VisualizationWidget") | |
12 |
|
13 | |||
13 | VisualizationWidget::VisualizationWidget(QWidget *parent) |
|
14 | VisualizationWidget::VisualizationWidget(QWidget *parent) | |
14 | : QWidget{parent}, ui{new Ui::VisualizationWidget} |
|
15 | : QWidget{parent}, ui{new Ui::VisualizationWidget} | |
15 | { |
|
16 | { | |
16 | ui->setupUi(this); |
|
17 | ui->setupUi(this); | |
17 |
|
18 | |||
18 | auto addTabViewButton = new QToolButton{ui->tabWidget}; |
|
19 | auto addTabViewButton = new QToolButton{ui->tabWidget}; | |
19 | addTabViewButton->setText(tr("Add View")); |
|
20 | addTabViewButton->setText(tr("Add View")); | |
20 | addTabViewButton->setCursor(Qt::ArrowCursor); |
|
21 | addTabViewButton->setCursor(Qt::ArrowCursor); | |
21 | ui->tabWidget->setCornerWidget(addTabViewButton, Qt::TopRightCorner); |
|
22 | ui->tabWidget->setCornerWidget(addTabViewButton, Qt::TopRightCorner); | |
22 |
|
23 | |||
23 | auto enableMinimumCornerWidgetSize = [this](bool enable) { |
|
24 | auto enableMinimumCornerWidgetSize = [this](bool enable) { | |
24 |
|
25 | |||
25 | auto tabViewCornerWidget = ui->tabWidget->cornerWidget(); |
|
26 | auto tabViewCornerWidget = ui->tabWidget->cornerWidget(); | |
26 | auto width = enable ? tabViewCornerWidget->width() : 0; |
|
27 | auto width = enable ? tabViewCornerWidget->width() : 0; | |
27 | auto height = enable ? tabViewCornerWidget->height() : 0; |
|
28 | auto height = enable ? tabViewCornerWidget->height() : 0; | |
28 | tabViewCornerWidget->setMinimumHeight(height); |
|
29 | tabViewCornerWidget->setMinimumHeight(height); | |
29 | tabViewCornerWidget->setMinimumWidth(width); |
|
30 | tabViewCornerWidget->setMinimumWidth(width); | |
30 | ui->tabWidget->setMinimumHeight(height); |
|
31 | ui->tabWidget->setMinimumHeight(height); | |
31 | ui->tabWidget->setMinimumWidth(width); |
|
32 | ui->tabWidget->setMinimumWidth(width); | |
32 | }; |
|
33 | }; | |
33 |
|
34 | |||
34 | auto addTabView = [this, enableMinimumCornerWidgetSize]() { |
|
35 | auto addTabView = [this, enableMinimumCornerWidgetSize]() { | |
35 | auto widget = new VisualizationTabWidget{QString{"View %1"}.arg(ui->tabWidget->count() + 1), |
|
36 | auto widget = new VisualizationTabWidget{QString{"View %1"}.arg(ui->tabWidget->count() + 1), | |
36 | ui->tabWidget}; |
|
37 | ui->tabWidget}; | |
37 | auto index = ui->tabWidget->addTab(widget, widget->name()); |
|
38 | auto index = ui->tabWidget->addTab(widget, widget->name()); | |
38 | if (ui->tabWidget->count() > 0) { |
|
39 | if (ui->tabWidget->count() > 0) { | |
39 | enableMinimumCornerWidgetSize(false); |
|
40 | enableMinimumCornerWidgetSize(false); | |
40 | } |
|
41 | } | |
41 | qCInfo(LOG_VisualizationWidget()) << tr("add the tab of index %1").arg(index); |
|
42 | qCInfo(LOG_VisualizationWidget()) << tr("add the tab of index %1").arg(index); | |
42 | }; |
|
43 | }; | |
43 |
|
44 | |||
44 | auto removeTabView = [this, enableMinimumCornerWidgetSize](int index) { |
|
45 | auto removeTabView = [this, enableMinimumCornerWidgetSize](int index) { | |
45 | if (ui->tabWidget->count() == 1) { |
|
46 | if (ui->tabWidget->count() == 1) { | |
46 | enableMinimumCornerWidgetSize(true); |
|
47 | enableMinimumCornerWidgetSize(true); | |
47 | } |
|
48 | } | |
48 |
|
49 | |||
49 | ui->tabWidget->removeTab(index); |
|
50 | ui->tabWidget->removeTab(index); | |
50 | qCInfo(LOG_VisualizationWidget()) << tr("remove the tab of index %1").arg(index); |
|
51 | qCInfo(LOG_VisualizationWidget()) << tr("remove the tab of index %1").arg(index); | |
51 |
|
52 | |||
52 | }; |
|
53 | }; | |
53 |
|
54 | |||
54 | ui->tabWidget->setTabsClosable(true); |
|
55 | ui->tabWidget->setTabsClosable(true); | |
55 |
|
56 | |||
56 | connect(addTabViewButton, &QToolButton::clicked, addTabView); |
|
57 | connect(addTabViewButton, &QToolButton::clicked, addTabView); | |
57 | connect(ui->tabWidget, &QTabWidget::tabCloseRequested, removeTabView); |
|
58 | connect(ui->tabWidget, &QTabWidget::tabCloseRequested, removeTabView); | |
58 |
|
59 | |||
59 | // Adds default tab |
|
60 | // Adds default tab | |
60 | addTabView(); |
|
61 | addTabView(); | |
61 | } |
|
62 | } | |
62 |
|
63 | |||
63 | VisualizationWidget::~VisualizationWidget() |
|
64 | VisualizationWidget::~VisualizationWidget() | |
64 | { |
|
65 | { | |
65 | delete ui; |
|
66 | delete ui; | |
66 | } |
|
67 | } | |
67 |
|
68 | |||
68 | void VisualizationWidget::addTab(VisualizationTabWidget *tabWidget) |
|
69 | void VisualizationWidget::addTab(VisualizationTabWidget *tabWidget) | |
69 | { |
|
70 | { | |
70 | // NOTE: check is this method has to be deleted because of its dupplicated version visible as |
|
71 | // NOTE: check is this method has to be deleted because of its dupplicated version visible as | |
71 | // lambda function (in the constructor) |
|
72 | // lambda function (in the constructor) | |
72 | } |
|
73 | } | |
73 |
|
74 | |||
74 | VisualizationTabWidget *VisualizationWidget::createTab() |
|
75 | VisualizationTabWidget *VisualizationWidget::createTab() | |
75 | { |
|
76 | { | |
76 | } |
|
77 | } | |
77 |
|
78 | |||
78 | void VisualizationWidget::removeTab(VisualizationTabWidget *tab) |
|
79 | void VisualizationWidget::removeTab(VisualizationTabWidget *tab) | |
79 | { |
|
80 | { | |
80 | // NOTE: check is this method has to be deleted because of its dupplicated version visible as |
|
81 | // NOTE: check is this method has to be deleted because of its dupplicated version visible as | |
81 | // lambda function (in the constructor) |
|
82 | // lambda function (in the constructor) | |
82 | } |
|
83 | } | |
83 |
|
84 | |||
84 | void VisualizationWidget::accept(IVisualizationWidget *visitor) |
|
85 | void VisualizationWidget::accept(IVisualizationWidgetVisitor *visitor) | |
85 | { |
|
86 | { | |
86 | // TODO: manage the visitor |
|
87 | // TODO: manage the visitor | |
87 | } |
|
88 | } | |
88 |
|
89 | |||
89 | void VisualizationWidget::close() |
|
90 | void VisualizationWidget::close() | |
90 | { |
|
91 | { | |
91 | // The main view cannot be directly closed. |
|
92 | // The main view cannot be directly closed. | |
92 | return; |
|
93 | return; | |
93 | } |
|
94 | } | |
94 |
|
95 | |||
95 | QString VisualizationWidget::name() const |
|
96 | QString VisualizationWidget::name() const | |
96 | { |
|
97 | { | |
97 | return QStringLiteral("MainView"); |
|
98 | return QStringLiteral("MainView"); | |
98 | } |
|
99 | } | |
99 |
|
100 | |||
100 | void VisualizationWidget::displayVariable(std::shared_ptr<Variable> variable) noexcept |
|
101 | void VisualizationWidget::displayVariable(std::shared_ptr<Variable> variable) noexcept | |
101 | { |
|
102 | { | |
102 | if (auto currentTab = dynamic_cast<VisualizationTabWidget *>(ui->tabWidget->currentWidget())) { |
|
103 | if (auto currentTab = dynamic_cast<VisualizationTabWidget *>(ui->tabWidget->currentWidget())) { | |
103 | if (!currentTab->createZone(variable)) { |
|
104 | if (!currentTab->createZone(variable)) { | |
104 | qCCritical(LOG_VisualizationWidget()) |
|
105 | qCCritical(LOG_VisualizationWidget()) | |
105 | << tr("Can't display the variable : can't create a new zone in the current tab"); |
|
106 | << tr("Can't display the variable : can't create a new zone in the current tab"); | |
106 | } |
|
107 | } | |
107 | } |
|
108 | } | |
108 | else { |
|
109 | else { | |
109 | qCCritical(LOG_VisualizationWidget()) |
|
110 | qCCritical(LOG_VisualizationWidget()) | |
110 | << tr("Can't display the variable : there is no current tab"); |
|
111 | << tr("Can't display the variable : there is no current tab"); | |
111 | } |
|
112 | } | |
112 | } |
|
113 | } |
@@ -1,71 +1,72 | |||||
1 | #include "Visualization/VisualizationZoneWidget.h" |
|
1 | #include "Visualization/VisualizationZoneWidget.h" | |
|
2 | #include "Visualization/IVisualizationWidgetVisitor.h" | |||
2 | #include "ui_VisualizationZoneWidget.h" |
|
3 | #include "ui_VisualizationZoneWidget.h" | |
3 |
|
4 | |||
4 | #include "Visualization/VisualizationGraphWidget.h" |
|
5 | #include "Visualization/VisualizationGraphWidget.h" | |
5 |
|
6 | |||
6 | namespace { |
|
7 | namespace { | |
7 |
|
8 | |||
8 | /// Generates a default name for a new graph, according to the number of graphs already displayed in |
|
9 | /// Generates a default name for a new graph, according to the number of graphs already displayed in | |
9 | /// the zone |
|
10 | /// the zone | |
10 | QString defaultGraphName(const QLayout &layout) |
|
11 | QString defaultGraphName(const QLayout &layout) | |
11 | { |
|
12 | { | |
12 | auto count = 0; |
|
13 | auto count = 0; | |
13 | for (auto i = 0; i < layout.count(); ++i) { |
|
14 | for (auto i = 0; i < layout.count(); ++i) { | |
14 | if (dynamic_cast<VisualizationGraphWidget *>(layout.itemAt(i)->widget())) { |
|
15 | if (dynamic_cast<VisualizationGraphWidget *>(layout.itemAt(i)->widget())) { | |
15 | count++; |
|
16 | count++; | |
16 | } |
|
17 | } | |
17 | } |
|
18 | } | |
18 |
|
19 | |||
19 | return QObject::tr("Graph %1").arg(count + 1); |
|
20 | return QObject::tr("Graph %1").arg(count + 1); | |
20 | } |
|
21 | } | |
21 |
|
22 | |||
22 | } // namespace |
|
23 | } // namespace | |
23 |
|
24 | |||
24 | VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *parent) |
|
25 | VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *parent) | |
25 | : QWidget{parent}, ui{new Ui::VisualizationZoneWidget} |
|
26 | : QWidget{parent}, ui{new Ui::VisualizationZoneWidget} | |
26 | { |
|
27 | { | |
27 | ui->setupUi(this); |
|
28 | ui->setupUi(this); | |
28 |
|
29 | |||
29 | ui->zoneNameLabel->setText(name); |
|
30 | ui->zoneNameLabel->setText(name); | |
30 | } |
|
31 | } | |
31 |
|
32 | |||
32 | VisualizationZoneWidget::~VisualizationZoneWidget() |
|
33 | VisualizationZoneWidget::~VisualizationZoneWidget() | |
33 | { |
|
34 | { | |
34 | delete ui; |
|
35 | delete ui; | |
35 | } |
|
36 | } | |
36 |
|
37 | |||
37 | void VisualizationZoneWidget::addGraph(VisualizationGraphWidget *graphWidget) |
|
38 | void VisualizationZoneWidget::addGraph(VisualizationGraphWidget *graphWidget) | |
38 | { |
|
39 | { | |
39 | ui->visualizationZoneFrame->layout()->addWidget(graphWidget); |
|
40 | ui->visualizationZoneFrame->layout()->addWidget(graphWidget); | |
40 | } |
|
41 | } | |
41 |
|
42 | |||
42 | VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<Variable> variable) |
|
43 | VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<Variable> variable) | |
43 | { |
|
44 | { | |
44 | auto graphWidget = new VisualizationGraphWidget{ |
|
45 | auto graphWidget = new VisualizationGraphWidget{ | |
45 | defaultGraphName(*ui->visualizationZoneFrame->layout()), this}; |
|
46 | defaultGraphName(*ui->visualizationZoneFrame->layout()), this}; | |
46 | this->addGraph(graphWidget); |
|
47 | this->addGraph(graphWidget); | |
47 |
|
48 | |||
48 | graphWidget->addVariable(variable); |
|
49 | graphWidget->addVariable(variable); | |
49 |
|
50 | |||
50 | return graphWidget; |
|
51 | return graphWidget; | |
51 | } |
|
52 | } | |
52 |
|
53 | |||
53 | void VisualizationZoneWidget::removeGraph(VisualizationGraphWidget *graph) |
|
54 | void VisualizationZoneWidget::removeGraph(VisualizationGraphWidget *graph) | |
54 | { |
|
55 | { | |
55 | } |
|
56 | } | |
56 |
|
57 | |||
57 | void VisualizationZoneWidget::accept(IVisualizationWidget *visitor) |
|
58 | void VisualizationZoneWidget::accept(IVisualizationWidgetVisitor *visitor) | |
58 | { |
|
59 | { | |
59 | // TODO: manage the visitor |
|
60 | // TODO: manage the visitor | |
60 | } |
|
61 | } | |
61 |
|
62 | |||
62 | void VisualizationZoneWidget::close() |
|
63 | void VisualizationZoneWidget::close() | |
63 | { |
|
64 | { | |
64 | // The main view cannot be directly closed. |
|
65 | // The main view cannot be directly closed. | |
65 | return; |
|
66 | return; | |
66 | } |
|
67 | } | |
67 |
|
68 | |||
68 | QString VisualizationZoneWidget::name() const |
|
69 | QString VisualizationZoneWidget::name() const | |
69 | { |
|
70 | { | |
70 | return ui->zoneNameLabel->text(); |
|
71 | return ui->zoneNameLabel->text(); | |
71 | } |
|
72 | } |
General Comments 0
You need to be logged in to leave comments.
Login now