@@ -1,50 +1,50 | |||
|
1 | 1 | #ifndef SCIQLOP_DATASERIES_H |
|
2 | 2 | #define SCIQLOP_DATASERIES_H |
|
3 | 3 | |
|
4 | 4 | #include <Data/ArrayData.h> |
|
5 | 5 | #include <Data/IDataSeries.h> |
|
6 | 6 | |
|
7 | 7 | #include <memory> |
|
8 | 8 | |
|
9 | 9 | /** |
|
10 | 10 | * @brief The DataSeries class is the base (abstract) implementation of IDataSeries. |
|
11 | 11 | * |
|
12 | 12 | * It proposes to set a dimension for the values ββdata |
|
13 | 13 | * |
|
14 | 14 | * @tparam Dim The dimension of the values data |
|
15 | 15 | * |
|
16 | 16 | */ |
|
17 | 17 | template <int Dim> |
|
18 | 18 | class DataSeries : public IDataSeries { |
|
19 | 19 | public: |
|
20 | 20 | /// @sa IDataSeries::xAxisData() |
|
21 | 21 | std::shared_ptr<ArrayData<1> > xAxisData() override { return m_XAxisData; } |
|
22 | 22 | |
|
23 | 23 | /// @sa IDataSeries::xAxisUnit() |
|
24 | 24 | Unit xAxisUnit() const override { return m_XAxisUnit; } |
|
25 | 25 | |
|
26 | 26 | /// @return the values dataset |
|
27 | 27 | std::shared_ptr<ArrayData<Dim> > valuesData() const { return m_ValuesData; } |
|
28 | 28 | |
|
29 | 29 | /// @sa IDataSeries::valuesUnit() |
|
30 | 30 | Unit valuesUnit() const override { return m_ValuesUnit; } |
|
31 | 31 | |
|
32 | 32 | protected: |
|
33 | 33 | /// Protected ctor (DataSeries is abstract) |
|
34 | explicit DataSeries(std::shared_ptr<ArrayData<1> > xAxisData, Unit xAxisUnit, | |
|
35 | std::shared_ptr<ArrayData<Dim> > valuesData, Unit valuesUnit) | |
|
34 | explicit DataSeries(std::shared_ptr<ArrayData<1> > xAxisData, const Unit &xAxisUnit, | |
|
35 | std::shared_ptr<ArrayData<Dim> > valuesData, const Unit &valuesUnit) | |
|
36 | 36 | : m_XAxisData{xAxisData}, |
|
37 |
m_XAxisUnit{ |
|
|
37 | m_XAxisUnit{xAxisUnit}, | |
|
38 | 38 | m_ValuesData{valuesData}, |
|
39 |
m_ValuesUnit{ |
|
|
39 | m_ValuesUnit{valuesUnit} | |
|
40 | 40 | { |
|
41 | 41 | } |
|
42 | 42 | |
|
43 | 43 | private: |
|
44 | 44 | std::shared_ptr<ArrayData<1> > m_XAxisData; |
|
45 | 45 | Unit m_XAxisUnit; |
|
46 | 46 | std::shared_ptr<ArrayData<Dim> > m_ValuesData; |
|
47 | 47 | Unit m_ValuesUnit; |
|
48 | 48 | }; |
|
49 | 49 | |
|
50 | 50 | #endif // SCIQLOP_DATASERIES_H |
@@ -1,28 +1,28 | |||
|
1 | 1 | #ifndef SCIQLOP_SCALARSERIES_H |
|
2 | 2 | #define SCIQLOP_SCALARSERIES_H |
|
3 | 3 | |
|
4 | 4 | #include <Data/DataSeries.h> |
|
5 | 5 | |
|
6 | 6 | /** |
|
7 | 7 | * @brief The ScalarSeries class is the implementation for a data series representing a scalar. |
|
8 | 8 | */ |
|
9 | 9 | class ScalarSeries : public DataSeries<1> { |
|
10 | 10 | public: |
|
11 | 11 | /** |
|
12 | 12 | * Ctor |
|
13 | 13 | * @param size the number of data the series will hold |
|
14 | 14 | * @param xAxisUnit x-axis unit |
|
15 | 15 | * @param valuesUnit values unit |
|
16 | 16 | */ |
|
17 | explicit ScalarSeries(int size, Unit xAxisUnit, Unit valuesUnit); | |
|
17 | explicit ScalarSeries(int size, const Unit &xAxisUnit, const Unit &valuesUnit); | |
|
18 | 18 | |
|
19 | 19 | /** |
|
20 | 20 | * Sets data for a specific index. The index has to be valid to be effective |
|
21 | 21 | * @param index the index to which the data will be set |
|
22 | 22 | * @param x the x-axis data |
|
23 | 23 | * @param value the value data |
|
24 | 24 | */ |
|
25 | 25 | void setData(int index, double x, double value) noexcept; |
|
26 | 26 | }; |
|
27 | 27 | |
|
28 | 28 | #endif // SCIQLOP_SCALARSERIES_H |
@@ -1,13 +1,13 | |||
|
1 | 1 | #include <Data/ScalarSeries.h> |
|
2 | 2 | |
|
3 | ScalarSeries::ScalarSeries(int size, Unit xAxisUnit, Unit valuesUnit) | |
|
4 |
: DataSeries{std::make_shared<ArrayData<1> >(size), |
|
|
5 |
std::make_shared<ArrayData<1> >(size), |
|
|
3 | ScalarSeries::ScalarSeries(int size, const Unit &xAxisUnit, const Unit &valuesUnit) | |
|
4 | : DataSeries{std::make_shared<ArrayData<1> >(size), xAxisUnit, | |
|
5 | std::make_shared<ArrayData<1> >(size), valuesUnit} | |
|
6 | 6 | { |
|
7 | 7 | } |
|
8 | 8 | |
|
9 | 9 | void ScalarSeries::setData(int index, double x, double value) noexcept |
|
10 | 10 | { |
|
11 | 11 | xAxisData()->setData(index, x); |
|
12 | 12 | valuesData()->setData(index, value); |
|
13 | 13 | } |
@@ -1,117 +1,117 | |||
|
1 | 1 | #include "Visualization/VisualizationWidget.h" |
|
2 | 2 | #include "Visualization/VisualizationGraphWidget.h" |
|
3 | 3 | #include "Visualization/VisualizationTabWidget.h" |
|
4 | 4 | #include "Visualization/VisualizationZoneWidget.h" |
|
5 | 5 | #include "Visualization/qcustomplot.h" |
|
6 | 6 | |
|
7 | 7 | #include "ui_VisualizationWidget.h" |
|
8 | 8 | |
|
9 | 9 | #include <QToolButton> |
|
10 | 10 | |
|
11 | 11 | Q_LOGGING_CATEGORY(LOG_VisualizationWidget, "VisualizationWidget") |
|
12 | 12 | |
|
13 | 13 | VisualizationWidget::VisualizationWidget(QWidget *parent) |
|
14 | 14 | : QWidget{parent}, ui{new Ui::VisualizationWidget} |
|
15 | 15 | { |
|
16 | 16 | ui->setupUi(this); |
|
17 | 17 | |
|
18 | 18 | auto addTabViewButton = new QToolButton{ui->tabWidget}; |
|
19 | 19 | addTabViewButton->setText(tr("Add View")); |
|
20 | 20 | addTabViewButton->setCursor(Qt::ArrowCursor); |
|
21 | 21 | ui->tabWidget->setCornerWidget(addTabViewButton, Qt::TopRightCorner); |
|
22 | 22 | |
|
23 |
auto enableMinimu |
|
|
23 | auto enableMinimumCornerWidgetSize = [this](bool enable) { | |
|
24 | 24 | |
|
25 | 25 | auto tabViewCornerWidget = ui->tabWidget->cornerWidget(); |
|
26 | 26 | auto width = enable ? tabViewCornerWidget->width() : 0; |
|
27 | 27 | auto height = enable ? tabViewCornerWidget->height() : 0; |
|
28 | 28 | tabViewCornerWidget->setMinimumHeight(height); |
|
29 | 29 | tabViewCornerWidget->setMinimumWidth(width); |
|
30 | 30 | ui->tabWidget->setMinimumHeight(height); |
|
31 | 31 | ui->tabWidget->setMinimumWidth(width); |
|
32 | 32 | }; |
|
33 | 33 | |
|
34 |
auto addTabView = [this, enableMinimu |
|
|
34 | auto addTabView = [this, enableMinimumCornerWidgetSize]() { | |
|
35 | 35 | auto index = ui->tabWidget->addTab(new VisualizationTabWidget(ui->tabWidget), |
|
36 | 36 | QString("View %1").arg(ui->tabWidget->count() + 1)); |
|
37 | 37 | if (ui->tabWidget->count() > 0) { |
|
38 |
enableMinimu |
|
|
38 | enableMinimumCornerWidgetSize(false); | |
|
39 | 39 | } |
|
40 | 40 | qCInfo(LOG_VisualizationWidget()) << tr("add the tab of index %1").arg(index); |
|
41 | 41 | }; |
|
42 | 42 | |
|
43 |
auto removeTabView = [this, enableMinimu |
|
|
43 | auto removeTabView = [this, enableMinimumCornerWidgetSize](int index) { | |
|
44 | 44 | if (ui->tabWidget->count() == 1) { |
|
45 |
enableMinimu |
|
|
45 | enableMinimumCornerWidgetSize(true); | |
|
46 | 46 | } |
|
47 | 47 | |
|
48 | 48 | ui->tabWidget->removeTab(index); |
|
49 | 49 | qCInfo(LOG_VisualizationWidget()) << tr("remove the tab of index %1").arg(index); |
|
50 | 50 | |
|
51 | 51 | }; |
|
52 | 52 | |
|
53 | 53 | ui->tabWidget->setTabsClosable(true); |
|
54 | 54 | |
|
55 | 55 | connect(addTabViewButton, &QToolButton::clicked, addTabView); |
|
56 | 56 | connect(ui->tabWidget, &QTabWidget::tabCloseRequested, removeTabView); |
|
57 | 57 | } |
|
58 | 58 | |
|
59 | 59 | VisualizationWidget::~VisualizationWidget() |
|
60 | 60 | { |
|
61 | 61 | delete ui; |
|
62 | 62 | } |
|
63 | 63 | |
|
64 | 64 | void VisualizationWidget::addTab(VisualizationTabWidget *tabWidget) |
|
65 | 65 | { |
|
66 | 66 | // NOTE: check is this method has to be deleted because of its dupplicated version visible as |
|
67 | 67 | // lambda function (in the constructor) |
|
68 | 68 | } |
|
69 | 69 | |
|
70 | 70 | VisualizationTabWidget *VisualizationWidget::createTab() |
|
71 | 71 | { |
|
72 | 72 | } |
|
73 | 73 | |
|
74 | 74 | void VisualizationWidget::removeTab(VisualizationTabWidget *tab) |
|
75 | 75 | { |
|
76 | 76 | // NOTE: check is this method has to be deleted because of its dupplicated version visible as |
|
77 | 77 | // lambda function (in the constructor) |
|
78 | 78 | } |
|
79 | 79 | |
|
80 | 80 | void VisualizationWidget::accept(IVisualizationWidget *visitor) |
|
81 | 81 | { |
|
82 | 82 | // TODO: manage the visitor |
|
83 | 83 | } |
|
84 | 84 | |
|
85 | 85 | void VisualizationWidget::close() |
|
86 | 86 | { |
|
87 | 87 | // The main view cannot be directly closed. |
|
88 | 88 | return; |
|
89 | 89 | } |
|
90 | 90 | |
|
91 | 91 | QString VisualizationWidget::name() const |
|
92 | 92 | { |
|
93 | 93 | return QStringLiteral("MainView"); |
|
94 | 94 | } |
|
95 | 95 | |
|
96 | 96 | void VisualizationWidget::displayVariable(std::shared_ptr<Variable> variable) noexcept |
|
97 | 97 | { |
|
98 | 98 | if (auto currentTab = dynamic_cast<VisualizationTabWidget *>(ui->tabWidget->currentWidget())) { |
|
99 | 99 | if (auto newZone = currentTab->createZone()) { |
|
100 | 100 | if (auto newGraph = newZone->createGraph()) { |
|
101 | 101 | newGraph->addVariable(variable); |
|
102 | 102 | } |
|
103 | 103 | else { |
|
104 |
qC |
|
|
104 | qCCritical(LOG_VisualizationWidget()) | |
|
105 | 105 | << tr("Can't display the variable : can't create the graph"); |
|
106 | 106 | } |
|
107 | 107 | } |
|
108 | 108 | else { |
|
109 |
qC |
|
|
109 | qCCritical(LOG_VisualizationWidget()) | |
|
110 | 110 | << tr("Can't display the variable : can't create a new zone in the current tab"); |
|
111 | 111 | } |
|
112 | 112 | } |
|
113 | 113 | else { |
|
114 |
qC |
|
|
114 | qCCritical(LOG_VisualizationWidget()) | |
|
115 | 115 | << tr("Can't display the variable : there is no current tab"); |
|
116 | 116 | } |
|
117 | 117 | } |
General Comments 0
You need to be logged in to leave comments.
Login now