Auto status change to "Under Review"
| @@ -38,7 +38,7 struct VariableController::VariableControllerPrivate { | |||||
| 38 |
|
38 | |||
| 39 | std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> > |
|
39 | std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> > | |
| 40 | m_VariableToProviderMap; |
|
40 | m_VariableToProviderMap; | |
| 41 | std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToIdentifier; |
|
41 | std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToIdentifierMap; | |
| 42 | }; |
|
42 | }; | |
| 43 |
|
43 | |||
| 44 | VariableController::VariableController(QObject *parent) |
|
44 | VariableController::VariableController(QObject *parent) | |
| @@ -81,6 +81,9 void VariableController::deleteVariable(std::shared_ptr<Variable> variable) noex | |||||
| 81 | // make some treatments before the deletion |
|
81 | // make some treatments before the deletion | |
| 82 | emit variableAboutToBeDeleted(variable); |
|
82 | emit variableAboutToBeDeleted(variable); | |
| 83 |
|
83 | |||
|
|
84 | // Deletes identifier | |||
|
|
85 | impl->m_VariableToIdentifierMap.erase(variable); | |||
|
|
86 | ||||
| 84 | // Deletes provider |
|
87 | // Deletes provider | |
| 85 | auto nbProvidersDeleted = impl->m_VariableToProviderMap.erase(variable); |
|
88 | auto nbProvidersDeleted = impl->m_VariableToProviderMap.erase(variable); | |
| 86 | qCDebug(LOG_VariableController()) |
|
89 | qCDebug(LOG_VariableController()) | |
| @@ -119,13 +122,13 void VariableController::createVariable(const QString &name, const QVariantHash | |||||
| 119 |
|
122 | |||
| 120 | // store the provider |
|
123 | // store the provider | |
| 121 | impl->m_VariableToProviderMap[newVariable] = provider; |
|
124 | impl->m_VariableToProviderMap[newVariable] = provider; | |
| 122 | impl->m_VariableToIdentifier[newVariable] = identifier; |
|
125 | impl->m_VariableToIdentifierMap[newVariable] = identifier; | |
| 123 |
|
126 | |||
| 124 | auto addDateTimeAcquired = [ this, varW = std::weak_ptr<Variable>{newVariable} ]( |
|
127 | auto addDateTimeAcquired = [ this, varW = std::weak_ptr<Variable>{newVariable} ]( | |
| 125 | QUuid identifier, auto dataSeriesAcquired, auto dateTimeToPutInCache) |
|
128 | QUuid identifier, auto dataSeriesAcquired, auto dateTimeToPutInCache) | |
| 126 | { |
|
129 | { | |
| 127 | if (auto variable = varW.lock()) { |
|
130 | if (auto variable = varW.lock()) { | |
| 128 | auto varIdentifier = impl->m_VariableToIdentifier.at(variable); |
|
131 | auto varIdentifier = impl->m_VariableToIdentifierMap.at(variable); | |
| 129 | if (varIdentifier == identifier) { |
|
132 | if (varIdentifier == identifier) { | |
| 130 | impl->m_VariableCacheController->addDateTime(variable, dateTimeToPutInCache); |
|
133 | impl->m_VariableCacheController->addDateTime(variable, dateTimeToPutInCache); | |
| 131 | variable->setDataSeries(dataSeriesAcquired); |
|
134 | variable->setDataSeries(dataSeriesAcquired); | |
| @@ -156,8 +159,8 void VariableController::onVariableRetrieveDataInProgress(QUuid identifier, doub | |||||
| 156 | { |
|
159 | { | |
| 157 | auto findReply = [identifier](const auto &entry) { return identifier == entry.second; }; |
|
160 | auto findReply = [identifier](const auto &entry) { return identifier == entry.second; }; | |
| 158 |
|
161 | |||
| 159 | auto end = impl->m_VariableToIdentifier.cend(); |
|
162 | auto end = impl->m_VariableToIdentifierMap.cend(); | |
| 160 | auto it = std::find_if(impl->m_VariableToIdentifier.cbegin(), end, findReply); |
|
163 | auto it = std::find_if(impl->m_VariableToIdentifierMap.cbegin(), end, findReply); | |
| 161 | if (it != end) { |
|
164 | if (it != end) { | |
| 162 | impl->m_VariableModel->setDataProgress(it->first, progress); |
|
165 | impl->m_VariableModel->setDataProgress(it->first, progress); | |
| 163 | } |
|
166 | } | |
| @@ -179,7 +182,7 void VariableController::onRequestDataLoading(std::shared_ptr<Variable> variable | |||||
| 179 |
|
182 | |||
| 180 | if (!dateTimeListNotInCache.empty()) { |
|
183 | if (!dateTimeListNotInCache.empty()) { | |
| 181 | // Ask the provider for each data on the dateTimeListNotInCache |
|
184 | // Ask the provider for each data on the dateTimeListNotInCache | |
| 182 | auto identifier = impl->m_VariableToIdentifier.at(variable); |
|
185 | auto identifier = impl->m_VariableToIdentifierMap.at(variable); | |
| 183 | impl->m_VariableToProviderMap.at(variable)->requestDataLoading( |
|
186 | impl->m_VariableToProviderMap.at(variable)->requestDataLoading( | |
| 184 | identifier, |
|
187 | identifier, | |
| 185 | DataProviderParameters{std::move(dateTimeListNotInCache), variable->metadata()}); |
|
188 | DataProviderParameters{std::move(dateTimeListNotInCache), variable->metadata()}); | |
| @@ -47,8 +47,7 const auto DATETIME_FORMAT = QStringLiteral("dd/MM/yyyy \nhh:mm:ss:zzz"); | |||||
| 47 | struct VariableModel::VariableModelPrivate { |
|
47 | struct VariableModel::VariableModelPrivate { | |
| 48 | /// Variables created in SciQlop |
|
48 | /// Variables created in SciQlop | |
| 49 | std::vector<std::shared_ptr<Variable> > m_Variables; |
|
49 | std::vector<std::shared_ptr<Variable> > m_Variables; | |
| 50 |
std::unordered_map< |
|
50 | std::unordered_map<Variable *, double> m_VariableToProgress; | |
| 51 |
|
||||
| 52 |
|
51 | |||
| 53 | /// Return the row index of the variable. -1 if it's not found |
|
52 | /// Return the row index of the variable. -1 if it's not found | |
| 54 | int indexOfVariable(Variable *variable) const noexcept; |
|
53 | int indexOfVariable(Variable *variable) const noexcept; | |
| @@ -110,8 +109,7 std::shared_ptr<Variable> VariableModel::variable(int index) const | |||||
| 110 |
|
109 | |||
| 111 | void VariableModel::setDataProgress(std::shared_ptr<Variable> variable, double progress) |
|
110 | void VariableModel::setDataProgress(std::shared_ptr<Variable> variable, double progress) | |
| 112 | { |
|
111 | { | |
| 113 |
|
112 | impl->m_VariableToProgress[variable.get()] = progress; | ||
| 114 | impl->m_VariableToProgress[variable] = progress; |
|
|||
| 115 | auto modelIndex = createIndex(impl->indexOfVariable(variable.get()), NAME_COLUMN); |
|
113 | auto modelIndex = createIndex(impl->indexOfVariable(variable.get()), NAME_COLUMN); | |
| 116 |
|
114 | |||
| 117 | emit dataChanged(modelIndex, modelIndex); |
|
115 | emit dataChanged(modelIndex, modelIndex); | |
| @@ -171,7 +169,7 QVariant VariableModel::data(const QModelIndex &index, int role) const | |||||
| 171 | else if (role == VariableRoles::ProgressRole) { |
|
169 | else if (role == VariableRoles::ProgressRole) { | |
| 172 | if (auto variable = impl->m_Variables.at(index.row())) { |
|
170 | if (auto variable = impl->m_Variables.at(index.row())) { | |
| 173 |
|
171 | |||
| 174 | auto it = impl->m_VariableToProgress.find(variable); |
|
172 | auto it = impl->m_VariableToProgress.find(variable.get()); | |
| 175 | if (it != impl->m_VariableToProgress.cend()) { |
|
173 | if (it != impl->m_VariableToProgress.cend()) { | |
| 176 | return it->second; |
|
174 | return it->second; | |
| 177 | } |
|
175 | } | |
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
You need to be logged in to leave comments.
Login now