Auto status change to "Under Review"
@@ -28,6 +28,7 public: | |||
|
28 | 28 | virtual ~VisualizationGraphWidget(); |
|
29 | 29 | |
|
30 | 30 | void addVariable(std::shared_ptr<Variable> variable); |
|
31 | void addVariableUsingGraph(std::shared_ptr<Variable> variable); | |
|
31 | 32 | /// Removes a variable from the graph |
|
32 | 33 | void removeVariable(std::shared_ptr<Variable> variable) noexcept; |
|
33 | 34 | |
@@ -52,7 +53,7 private slots: | |||
|
52 | 53 | /// Slot called when right clicking on the graph (displays a menu) |
|
53 | 54 | void onGraphMenuRequested(const QPoint &pos) noexcept; |
|
54 | 55 | |
|
55 |
void onRangeChanged(const QCPRange &t1 |
|
|
56 | void onRangeChanged(const QCPRange &t1); | |
|
56 | 57 | |
|
57 | 58 | /// Slot called when a mouse wheel was made, to perform some processing before the zoom is done |
|
58 | 59 | void onMouseWheel(QWheelEvent *event) noexcept; |
@@ -63,6 +63,11 void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSerie | |||
|
63 | 63 | << xValue.count(); |
|
64 | 64 | |
|
65 | 65 | qcpGraph->setData(xValue, vValue); |
|
66 | ||
|
67 | // Display all data | |
|
68 | // component->parentPlot()->xAxis->setRange(dateTime.m_TStart, dateTime.m_TEnd); | |
|
69 | component->rescaleAxes(); | |
|
70 | component->parentPlot()->replot(); | |
|
66 | 71 | } |
|
67 | 72 | else { |
|
68 | 73 | /// @todo DEBUG |
@@ -97,7 +102,6 QCPAbstractPlottable *createScalarSeriesComponent(ScalarSeries &scalarSeries, QC | |||
|
97 | 102 | |
|
98 | 103 | // Display all data |
|
99 | 104 | component->rescaleAxes(); |
|
100 | ||
|
101 | 105 | plot.replot(); |
|
102 | 106 | } |
|
103 | 107 | else { |
@@ -49,9 +49,9 VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget | |||
|
49 | 49 | ui->widget->setInteractions(QCP::iRangeDrag | QCP::iRangeZoom); |
|
50 | 50 | ui->widget->axisRect()->setRangeDrag(Qt::Horizontal); |
|
51 | 51 | connect(ui->widget, &QCustomPlot::mouseWheel, this, &VisualizationGraphWidget::onMouseWheel); |
|
52 | connect(ui->widget->xAxis, static_cast<void (QCPAxis::*)(const QCPRange &, const QCPRange &)>( | |
|
53 | &QCPAxis::rangeChanged), | |
|
54 |
|
|
|
52 | connect(ui->widget->xAxis, | |
|
53 | static_cast<void (QCPAxis::*)(const QCPRange &)>(&QCPAxis::rangeChanged), this, | |
|
54 | &VisualizationGraphWidget::onRangeChanged); | |
|
55 | 55 | |
|
56 | 56 | // Activates menu when right clicking on the graph |
|
57 | 57 | ui->widget->setContextMenuPolicy(Qt::CustomContextMenu); |
@@ -80,6 +80,34 void VisualizationGraphWidget::addVariable(std::shared_ptr<Variable> variable) | |||
|
80 | 80 | connect(variable.get(), SIGNAL(updated()), this, SLOT(onDataCacheVariableUpdated())); |
|
81 | 81 | } |
|
82 | 82 | |
|
83 | void VisualizationGraphWidget::addVariableUsingGraph(std::shared_ptr<Variable> variable) | |
|
84 | { | |
|
85 | ||
|
86 | // when adding a variable, we need to set its time range to the current graph range | |
|
87 | auto grapheRange = ui->widget->xAxis->range(); | |
|
88 | auto dateTime = SqpDateTime{grapheRange.lower, grapheRange.upper}; | |
|
89 | variable->setDateTime(dateTime); | |
|
90 | ||
|
91 | auto variableDateTimeWithTolerance = dateTime; | |
|
92 | ||
|
93 | // add 10% tolerance for each side | |
|
94 | auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart); | |
|
95 | variableDateTimeWithTolerance.m_TStart -= tolerance; | |
|
96 | variableDateTimeWithTolerance.m_TEnd += tolerance; | |
|
97 | ||
|
98 | // Uses delegate to create the qcpplot components according to the variable | |
|
99 | auto createdPlottables = VisualizationGraphHelper::create(variable, *ui->widget); | |
|
100 | ||
|
101 | for (auto createdPlottable : qAsConst(createdPlottables)) { | |
|
102 | impl->m_VariableToPlotMultiMap.insert({variable, createdPlottable}); | |
|
103 | } | |
|
104 | ||
|
105 | connect(variable.get(), SIGNAL(updated()), this, SLOT(onDataCacheVariableUpdated())); | |
|
106 | ||
|
107 | // CHangement detected, we need to ask controller to request data loading | |
|
108 | emit requestDataLoading(variable, variableDateTimeWithTolerance); | |
|
109 | } | |
|
110 | ||
|
83 | 111 | void VisualizationGraphWidget::removeVariable(std::shared_ptr<Variable> variable) noexcept |
|
84 | 112 | { |
|
85 | 113 | // Each component associated to the variable : |
@@ -136,16 +164,15 void VisualizationGraphWidget::onGraphMenuRequested(const QPoint &pos) noexcept | |||
|
136 | 164 | } |
|
137 | 165 | } |
|
138 | 166 | |
|
139 |
void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1 |
|
|
167 | void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1) | |
|
140 | 168 | { |
|
141 | ||
|
142 | 169 | qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged"); |
|
143 | 170 | |
|
144 | 171 | for (auto it = impl->m_VariableToPlotMultiMap.cbegin(); |
|
145 | 172 | it != impl->m_VariableToPlotMultiMap.cend(); ++it) { |
|
146 | 173 | |
|
147 | 174 | auto variable = it->first; |
|
148 |
auto dateTime = SqpDateTime{t |
|
|
175 | auto dateTime = SqpDateTime{t1.lower, t1.upper}; | |
|
149 | 176 | |
|
150 | 177 | if (!variable->contains(dateTime)) { |
|
151 | 178 |
@@ -137,7 +137,7 void GenerateVariableMenuOperation::visit(VisualizationGraphWidget *graphWidget) | |||
|
137 | 137 | if (graphWidget) { |
|
138 | 138 | impl->visitLeaf( |
|
139 | 139 | *graphWidget, QObject::tr("Open in %1").arg(graphWidget->name()), |
|
140 | [ var = impl->m_Variable, graphWidget ]() { graphWidget->addVariable(var); }); | |
|
140 | [ var = impl->m_Variable, graphWidget ]() { graphWidget->addVariableUsingGraph(var); }); | |
|
141 | 141 | } |
|
142 | 142 | else { |
|
143 | 143 | qCCritical(LOG_GenerateVariableMenuOperation(), |
General Comments 2
Pull request updated. Auto status change to "Under Review"
Changed commits: * 3 added * 0 removed Changed files: * M core/include/Data/SqpDateTime.h * M core/include/Variable/Variable.h * M core/include/Variable/VariableModel.h * M core/src/Variable/Variable.cpp * M core/src/Variable/VariableCacheController.cpp * M core/src/Variable/VariableController.cpp * M core/src/Variable/VariableModel.cpp * M gui/include/Visualization/VisualizationGraphWidget.h * M gui/src/Visualization/VisualizationGraphHelper.cpp * M gui/src/Visualization/VisualizationGraphWidget.cpp * M gui/src/Visualization/operations/GenerateVariableMenuOperation.cpp * R COPYING * R app/src/MainWindow.cpp * R app/ui/MainWindow.ui * R cmake/sciqlop_package_qt.cmake * R core/include/Common/MetaTypes.h * R core/include/Data/ArrayData.h * R core/include/Data/DataProviderParameters.h * R core/include/Data/DataSeries.h * R core/include/Data/IDataProvider.h * R core/include/Data/IDataSeries.h * R core/include/Data/ScalarSeries.h * R core/include/DataSource/DataSourceItemAction.h * R core/include/Plugin/PluginManager.h * R core/include/Time/TimeController.h * R core/include/Variable/VariableCacheController.h * R core/include/Variable/VariableController.h * R core/include/Visualization/VisualizationController.h * R core/src/Data/ScalarSeries.cpp * R core/src/DataSource/DataSourceItemAction.cpp * R core/src/Plugin/PluginManager.cpp * R core/src/Time/TimeController.cpp * R core/src/Visualization/VisualizationController.cpp * R core/tests/Variable/TestVariableCacheController.cpp * R gui/include/DataSource/DataSourceTreeWidgetItem.h * R gui/include/DataSource/DataSourceWidget.h * R gui/include/SidePane/SqpSidePane.h * R gui/include/TimeWidget/TimeWidget.h * R gui/include/Variable/VariableInspectorWidget.h * R gui/include/Variable/VariableMenuHeaderWidget.h * R gui/include/Visualization/IVariableContainer.h * R gui/include/Visualization/IVisualizationWidget.h * R gui/include/Visualization/IVisualizationWidgetVisitor.h * R gui/include/Visualization/VisualizationGraphHelper.h * R gui/include/Visualization/VisualizationTabWidget.h * R gui/include/Visualization/VisualizationWidget.h * R gui/include/Visualization/VisualizationZoneWidget.h * R gui/include/Visualization/operations/GenerateVariableMenuOperation.h * R gui/include/Visualization/operations/MenuBuilder.h * R gui/include/Visualization/qcustomplot.h * R gui/resources/icones/delete.png * R gui/resources/icones/next.png * R gui/resources/icones/openInspector.png * R gui/resources/icones/previous.png * R gui/resources/icones/sciqlop2PNG_1024.png * R gui/resources/sqpguiresources.qrc * R gui/src/DataSource/DataSourceTreeWidgetItem.cpp * R gui/src/DataSource/DataSourceWidget.cpp * R gui/src/SidePane/SqpSidePane.cpp * R gui/src/TimeWidget/TimeWidget.cpp * R gui/src/Variable/VariableInspectorWidget.cpp * R gui/src/Variable/VariableMenuHeaderWidget.cpp * R gui/src/Visualization/VisualizationTabWidget.cpp * R gui/src/Visualization/VisualizationWidget.cpp * R gui/src/Visualization/VisualizationZoneWidget.cpp * R gui/src/Visualization/operations/MenuBuilder.cpp * R gui/src/Visualization/qcustomplot.cpp * R gui/ui/DataSource/DataSourceWidget.ui * R gui/ui/SidePane/SqpSidePane.ui * R gui/ui/TimeWidget/TimeWidget.ui * R gui/ui/Variable/VariableInspectorWidget.ui * R gui/ui/Variable/VariableMenuHeaderWidget.ui * R gui/ui/Visualization/VisualizationGraphWidget.ui * R gui/ui/Visualization/VisualizationTabWidget.ui * R gui/ui/Visualization/VisualizationWidget.ui * R gui/ui/Visualization/VisualizationZoneWidget.ui * R gui/vera-exclusions/exclusions.txt * R plugin/CMakeLists.txt * R plugin/cmake/Findsciqlop-plugin.cmake * R plugin/include/Plugin/IPlugin.h * R plugins/mockplugin/CMakeLists.txt * R plugins/mockplugin/cmake/Findsciqlop-mockplugin.cmake * R plugins/mockplugin/include/CosinusProvider.h * R plugins/mockplugin/include/MockPlugin.h * R plugins/mockplugin/resources/mockplugin.json * R plugins/mockplugin/src/CosinusProvider.cpp * R plugins/mockplugin/src/MockPlugin.cpp * R README.md * R app/CMakeLists.txt * R app/include/MainWindow.h * R app/src/Main.cpp * R app/vera-exclusions/exclusions.txt * R cmake/sciqlop.cmake * R cmake/sciqlop_applications.cmake * R cmake/sciqlop_package.cmake * R cmake/sciqlop_params.cmake * R core/CMakeLists.txt * R core/include/Common/spimpl.h * R core/include/DataSource/DataSourceController.h * R core/include/DataSource/DataSourceItem.h * R core/src/DataSource/DataSourceController.cpp * R core/src/DataSource/DataSourceItem.cpp * R core/tests/DataSource/TestDataSourceController.cpp * R core/vera-exclusions/exclusions.txt * R formatting/cmake/use_clangformat.cmake * R formatting/vera-exclusions/exclusions.txt * R gui/CMakeLists.txt * R gui/include/SqpApplication.h * R gui/src/SqpApplication.cpp * R LICENSE * R app/src/mainwindow.cpp * R app/src/mainwindow.ui
You need to be logged in to leave comments.
Login now