I have created a note
@@ -122,6 +122,15 void VisualizationGraphWidget::removeVariable(std::shared_ptr<Variable> variable | |||||
122 | ui->widget->replot(); |
|
122 | ui->widget->replot(); | |
123 | } |
|
123 | } | |
124 |
|
124 | |||
|
125 | void VisualizationGraphWidget::setRange(std::shared_ptr<Variable> variable, | |||
|
126 | const SqpDateTime &range) | |||
|
127 | { | |||
|
128 | // auto componentsIt = impl->m_VariableToPlotMultiMap.equal_range(variable); | |||
|
129 | // for (auto it = componentsIt.first; it != componentsIt.second;) { | |||
|
130 |
// }
|
|||
|
131 | ui->widget->xAxis->setRange(range.m_TStart, range.m_TEnd); | |||
|
132 | } | |||
|
133 | ||||
125 | void VisualizationGraphWidget::accept(IVisualizationWidgetVisitor *visitor) |
|
134 | void VisualizationGraphWidget::accept(IVisualizationWidgetVisitor *visitor) | |
126 | { |
|
135 | { | |
127 | if (visitor) { |
|
136 | if (visitor) { | |
@@ -187,7 +196,8 void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1) | |||||
187 | auto dateTime = SqpDateTime{t1.lower, t1.upper}; |
|
196 | auto dateTime = SqpDateTime{t1.lower, t1.upper}; | |
188 | auto dateTimeRange = dateTime; |
|
197 | auto dateTimeRange = dateTime; | |
189 |
|
198 | |||
190 | auto tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart); |
|
199 |
auto toleranceFactor = 0.2;
Will be modified whith setting. |
|
|
200 | auto tolerance = toleranceFactor * (dateTime.m_TEnd - dateTime.m_TStart); | |||
191 | auto variableDateTimeWithTolerance = dateTime; |
|
201 | auto variableDateTimeWithTolerance = dateTime; | |
192 | variableDateTimeWithTolerance.m_TStart -= tolerance; |
|
202 | variableDateTimeWithTolerance.m_TStart -= tolerance; | |
193 | variableDateTimeWithTolerance.m_TEnd += tolerance; |
|
203 | variableDateTimeWithTolerance.m_TEnd += tolerance; | |
@@ -207,9 +217,8 void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1) | |||||
207 | auto diffEndToKeepDelta = dateTime.m_TEnd - variableDateTime.m_TEnd; |
|
217 | auto diffEndToKeepDelta = dateTime.m_TEnd - variableDateTime.m_TEnd; | |
208 | dateTime.m_TStart = variableDateTime.m_TStart + diffEndToKeepDelta; |
|
218 | dateTime.m_TStart = variableDateTime.m_TStart + diffEndToKeepDelta; | |
209 | // Tolerance have to be added to the right |
|
219 | // Tolerance have to be added to the right | |
210 |
// add |
|
220 | // add tolerance for right (end) side | |
211 |
|
|
221 | tolerance = toleranceFactor * (dateTime.m_TEnd - dateTime.m_TStart); | |
212 | // dateTime.m_TStart); |
|
|||
213 | variableDateTimeWithTolerance.m_TEnd += tolerance; |
|
222 | variableDateTimeWithTolerance.m_TEnd += tolerance; | |
214 | } |
|
223 | } | |
215 | else if (variableDateTime.m_TEnd > dateTime.m_TEnd) { |
|
224 | else if (variableDateTime.m_TEnd > dateTime.m_TEnd) { | |
@@ -217,8 +226,8 void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1) | |||||
217 | auto diffStartToKeepDelta = variableDateTime.m_TStart - dateTime.m_TStart; |
|
226 | auto diffStartToKeepDelta = variableDateTime.m_TStart - dateTime.m_TStart; | |
218 | dateTime.m_TEnd = variableDateTime.m_TEnd - diffStartToKeepDelta; |
|
227 | dateTime.m_TEnd = variableDateTime.m_TEnd - diffStartToKeepDelta; | |
219 | // Tolerance have to be added to the left |
|
228 | // Tolerance have to be added to the left | |
220 |
// add |
|
229 | // add tolerance for left (start) side | |
221 |
tolerance = |
|
230 | tolerance = toleranceFactor * (dateTime.m_TEnd - dateTime.m_TStart); | |
222 | variableDateTimeWithTolerance.m_TStart -= tolerance; |
|
231 | variableDateTimeWithTolerance.m_TStart -= tolerance; | |
223 | } |
|
232 | } | |
224 | else { |
|
233 | else { | |
@@ -234,7 +243,8 void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1) | |||||
234 | variableDateTimeWithTolerance.m_TEnd += tolerance; |
|
243 | variableDateTimeWithTolerance.m_TEnd += tolerance; | |
235 | } |
|
244 | } | |
236 | if (!variable->contains(dateTimeRange)) { |
|
245 | if (!variable->contains(dateTimeRange)) { | |
237 |
qCInfo(LOG_VisualizationGraphWidget()) |
|
246 | qCInfo(LOG_VisualizationGraphWidget()) | |
|
247 | << "TORM: Modif on variable datetime detected" << dateTime; | |||
238 | variable->setDateTime(dateTime); |
|
248 | variable->setDateTime(dateTime); | |
239 | } |
|
249 | } | |
240 |
|
250 | |||
@@ -295,17 +305,3 void VisualizationGraphWidget::onDataCacheVariableUpdated() | |||||
295 | } |
|
305 | } | |
296 | } |
|
306 | } | |
297 | } |
|
307 | } | |
298 |
|
||||
299 | void VisualizationGraphWidget::updateDisplay(std::shared_ptr<Variable> variable) |
|
|||
300 | { |
|
|||
301 | auto abstractPlotableItPair = impl->m_VariableToPlotMultiMap.equal_range(variable); |
|
|||
302 |
|
||||
303 | auto abstractPlotableVect = QVector<QCPAbstractPlottable *>{}; |
|
|||
304 |
|
||||
305 | for (auto it = abstractPlotableItPair.first; it != abstractPlotableItPair.second; ++it) { |
|
|||
306 | abstractPlotableVect.push_back(it->second); |
|
|||
307 | } |
|
|||
308 |
|
||||
309 | VisualizationGraphHelper::updateData(abstractPlotableVect, variable->dataSeries(), |
|
|||
310 | variable->dateTime()); |
|
|||
311 | } |
|
General Comments 3
Pull request updated. Auto status change to "Under Review"
Changed commits: * 3 added * 0 removed Changed files: * A plugins/amda/tests-resources/TestAmdaResultParser/FileNotFound.txt * M gui/src/Visualization/operations/RescaleAxeOperation.cpp * M app/src/MainWindow.cpp * M core/include/Data/IDataProvider.h * M core/include/DataSource/DataSourceItemAction.h * M core/include/Variable/VariableController.h * M core/include/Variable/VariableModel.h * M core/include/Visualization/VisualizationController.h * M core/src/Network/NetworkController.cpp * M core/src/Variable/Variable.cpp * M core/src/Variable/VariableController.cpp * M core/src/Variable/VariableModel.cpp * M gui/include/Visualization/VisualizationGraphWidget.h * M gui/include/Visualization/VisualizationWidget.h * M gui/src/SqpApplication.cpp * M gui/src/Variable/VariableInspectorWidget.cpp * M gui/src/Visualization/VisualizationGraphHelper.cpp * M gui/src/Visualization/VisualizationGraphWidget.cpp * M gui/src/Visualization/VisualizationWidget.cpp * M gui/src/Visualization/VisualizationZoneWidget.cpp * M plugins/amda/include/AmdaProvider.h * M plugins/amda/src/AmdaProvider.cpp * M plugins/amda/src/AmdaResultParser.cpp * M plugins/amda/tests/TestAmdaResultParser.cpp * M plugins/mockplugin/include/CosinusProvider.h * M plugins/mockplugin/src/CosinusProvider.cpp * R COPYING * 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/IDataSeries.h * R core/include/Data/ScalarSeries.h * R core/include/Data/SqpDateTime.h * R core/include/Network/NetworkController.h * R core/include/Plugin/PluginManager.h * R core/include/Time/TimeController.h * R core/include/Variable/Variable.h * R core/include/Variable/VariableCacheController.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/Variable/VariableCacheController.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/VisualizationZoneWidget.h * R gui/include/Visualization/operations/GenerateVariableMenuOperation.h * R gui/include/Visualization/operations/MenuBuilder.h * R gui/include/Visualization/operations/RemoveVariableOperation.h * R gui/include/Visualization/qcustomplot.h * R gui/resources/icones/dataSourceComponent.png * R gui/resources/icones/dataSourceNode.png * R gui/resources/icones/dataSourceProduct.png * R gui/resources/icones/dataSourceRoot.png * R gui/resources/icones/delete.png * R gui/resources/icones/next.png * R gui/resources/icones/openInspector.png * R gui/resources/icones/plot.png * R gui/resources/icones/previous.png * R gui/resources/icones/sciqlop2PNG_1024.png * R gui/resources/icones/unplot.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/VariableMenuHeaderWidget.cpp * R gui/src/Visualization/VisualizationTabWidget.cpp * R gui/src/Visualization/operations/GenerateVariableMenuOperation.cpp * R gui/src/Visualization/operations/MenuBuilder.cpp * R gui/src/Visualization/operations/RemoveVariableOperation.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/amda/CMakeLists.txt * R plugins/amda/cmake/Findsciqlop-amda.cmake * R plugins/amda/include/AmdaDefs.h * R plugins/amda/include/AmdaGlobal.h * R plugins/amda/include/AmdaParser.h * R plugins/amda/include/AmdaPlugin.h * R plugins/amda/include/AmdaResultParser.h * R plugins/amda/resources/amda.json * R plugins/amda/resources/amdaresources.qrc * R plugins/amda/resources/samples/AmdaSample.json * R plugins/amda/src/AmdaDefs.cpp * R plugins/amda/src/AmdaParser.cpp * R plugins/amda/src/AmdaPlugin.cpp * R plugins/amda/tests-resources/TestAmdaParser/TwoRootsFile.json * R plugins/amda/tests-resources/TestAmdaParser/ValidFile1.json * R plugins/amda/tests-resources/TestAmdaParser/WrongRootKey.json * R plugins/amda/tests-resources/TestAmdaParser/WrongRootType.json * R plugins/amda/tests-resources/TestAmdaResultParser/NaNValue.txt * R plugins/amda/tests-resources/TestAmdaResultParser/NoUnit.txt * R plugins/amda/tests-resources/TestAmdaResultParser/TooManyValues.txt * R plugins/amda/tests-resources/TestAmdaResultParser/ValidScalar1.txt * R plugins/amda/tests-resources/TestAmdaResultParser/WrongDate.txt * R plugins/amda/tests-resources/TestAmdaResultParser/WrongUnit.txt * R plugins/amda/tests-resources/TestAmdaResultParser/WrongValue.txt * R plugins/amda/tests/TestAmdaParser.cpp * R plugins/mockplugin/CMakeLists.txt * R plugins/mockplugin/cmake/Findsciqlop-mockplugin.cmake * R plugins/mockplugin/include/MockPlugin.h * R plugins/mockplugin/include/MockPluginGlobal.h * R plugins/mockplugin/resources/mockplugin.json * 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 LICENSE * R app/src/mainwindow.cpp * R app/src/mainwindow.ui
Status change > Approved
You need to be logged in to leave comments.
Login now