Auto status change to "Under Review"
| @@ -59,8 +59,8 void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSerie | |||||
| 59 | xValue.resize(n); |
|
59 | xValue.resize(n); | |
| 60 | vValue.resize(n); |
|
60 | vValue.resize(n); | |
| 61 |
|
61 | |||
| 62 |
qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points displayed" |
|
62 | qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points displayed" | |
| 63 |
<< |
|
63 | << xValue.count(); | |
| 64 |
|
64 | |||
| 65 | qcpGraph->setData(xValue, vValue); |
|
65 | qcpGraph->setData(xValue, vValue); | |
| 66 |
|
66 | |||
| @@ -87,7 +87,6 void VisualizationGraphWidget::addVariableUsingGraph(std::shared_ptr<Variable> v | |||||
| 87 | auto grapheRange = ui->widget->xAxis->range(); |
|
87 | auto grapheRange = ui->widget->xAxis->range(); | |
| 88 | auto dateTime = SqpDateTime{grapheRange.lower, grapheRange.upper}; |
|
88 | auto dateTime = SqpDateTime{grapheRange.lower, grapheRange.upper}; | |
| 89 | variable->setDateTime(dateTime); |
|
89 | variable->setDateTime(dateTime); | |
| 90 | qCInfo(LOG_VisualizationGraphWidget()) << "ADD Variable with range : " << dateTime; |
|
|||
| 91 |
|
90 | |||
| 92 | auto variableDateTimeWithTolerance = dateTime; |
|
91 | auto variableDateTimeWithTolerance = dateTime; | |
| 93 |
|
92 | |||
| @@ -96,9 +95,6 void VisualizationGraphWidget::addVariableUsingGraph(std::shared_ptr<Variable> v | |||||
| 96 | variableDateTimeWithTolerance.m_TStart -= tolerance; |
|
95 | variableDateTimeWithTolerance.m_TStart -= tolerance; | |
| 97 | variableDateTimeWithTolerance.m_TEnd += tolerance; |
|
96 | variableDateTimeWithTolerance.m_TEnd += tolerance; | |
| 98 |
|
97 | |||
| 99 | qCInfo(LOG_VisualizationGraphWidget()) << "ADD Variable with range TOL: " |
|
|||
| 100 | << variableDateTimeWithTolerance; |
|
|||
| 101 |
|
||||
| 102 | // Uses delegate to create the qcpplot components according to the variable |
|
98 | // Uses delegate to create the qcpplot components according to the variable | |
| 103 | auto createdPlottables = VisualizationGraphHelper::create(variable, *ui->widget); |
|
99 | auto createdPlottables = VisualizationGraphHelper::create(variable, *ui->widget); | |
| 104 |
|
100 | |||
| @@ -170,8 +166,7 void VisualizationGraphWidget::onGraphMenuRequested(const QPoint &pos) noexcept | |||||
| 170 |
|
166 | |||
| 171 | void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1) |
|
167 | void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1) | |
| 172 | { |
|
168 | { | |
| 173 |
|
169 | qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged"); | ||
| 174 | qCInfo(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged"); |
|
|||
| 175 |
|
170 | |||
| 176 | for (auto it = impl->m_VariableToPlotMultiMap.cbegin(); |
|
171 | for (auto it = impl->m_VariableToPlotMultiMap.cbegin(); | |
| 177 | it != impl->m_VariableToPlotMultiMap.cend(); ++it) { |
|
172 | it != impl->m_VariableToPlotMultiMap.cend(); ++it) { | |
| @@ -180,7 +175,6 void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1) | |||||
| 180 | auto dateTime = SqpDateTime{t1.lower, t1.upper}; |
|
175 | auto dateTime = SqpDateTime{t1.lower, t1.upper}; | |
| 181 |
|
176 | |||
| 182 | if (!variable->contains(dateTime)) { |
|
177 | if (!variable->contains(dateTime)) { | |
| 183 | qCInfo(LOG_VisualizationGraphWidget()) << dateTime << variable->dateTime(); |
|
|||
| 184 |
|
178 | |||
| 185 | auto variableDateTimeWithTolerance = dateTime; |
|
179 | auto variableDateTimeWithTolerance = dateTime; | |
| 186 | if (variable->intersect(dateTime)) { |
|
180 | if (variable->intersect(dateTime)) { | |
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