Auto status change to "Under Review"
| @@ -1,242 +1,244 | |||
|
|
1 | 1 | #include <Variable/Variable.h> |
|
|
2 | 2 | #include <Variable/VariableCacheController.h> |
|
|
3 | 3 | #include <Variable/VariableController.h> |
|
|
4 | 4 | #include <Variable/VariableModel.h> |
|
|
5 | 5 | |
|
|
6 | 6 | #include <Data/DataProviderParameters.h> |
|
|
7 | 7 | #include <Data/IDataProvider.h> |
|
|
8 | 8 | #include <Data/IDataSeries.h> |
|
|
9 | 9 | #include <Time/TimeController.h> |
|
|
10 | 10 | |
|
|
11 | 11 | #include <QDateTime> |
|
|
12 | 12 | #include <QMutex> |
|
|
13 | 13 | #include <QThread> |
|
|
14 | 14 | #include <QUuid> |
|
|
15 | 15 | #include <QtCore/QItemSelectionModel> |
|
|
16 | 16 | |
|
|
17 | 17 | #include <unordered_map> |
|
|
18 | 18 | |
|
|
19 | 19 | Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController") |
|
|
20 | 20 | |
|
|
21 | 21 | struct VariableController::VariableControllerPrivate { |
|
|
22 | 22 | explicit VariableControllerPrivate(VariableController *parent) |
|
|
23 | 23 | : m_WorkingMutex{}, |
|
|
24 | 24 | m_VariableModel{new VariableModel{parent}}, |
|
|
25 | 25 | m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}}, |
|
|
26 | 26 | m_VariableCacheController{std::make_unique<VariableCacheController>()} |
|
|
27 | 27 | { |
|
|
28 | 28 | } |
|
|
29 | 29 | |
|
|
30 | 30 | QMutex m_WorkingMutex; |
|
|
31 | 31 | /// Variable model. The VariableController has the ownership |
|
|
32 | 32 | VariableModel *m_VariableModel; |
|
|
33 | 33 | QItemSelectionModel *m_VariableSelectionModel; |
|
|
34 | 34 | |
|
|
35 | 35 | |
|
|
36 | 36 | TimeController *m_TimeController{nullptr}; |
|
|
37 | 37 | std::unique_ptr<VariableCacheController> m_VariableCacheController; |
|
|
38 | 38 | |
|
|
39 | 39 | std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> > |
|
|
40 | 40 | m_VariableToProviderMap; |
|
|
41 | 41 | std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToIdentifierMap; |
|
|
42 | 42 | }; |
|
|
43 | 43 | |
|
|
44 | 44 | VariableController::VariableController(QObject *parent) |
|
|
45 | 45 | : QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>(this)} |
|
|
46 | 46 | { |
|
|
47 | 47 | qCDebug(LOG_VariableController()) << tr("VariableController construction") |
|
|
48 | 48 | << QThread::currentThread(); |
|
|
49 | 49 | |
|
|
50 | 50 | connect(impl->m_VariableModel, &VariableModel::abortProgessRequested, this, |
|
|
51 | 51 | &VariableController::onAbortProgressRequested); |
|
|
52 | 52 | } |
|
|
53 | 53 | |
|
|
54 | 54 | VariableController::~VariableController() |
|
|
55 | 55 | { |
|
|
56 | 56 | qCDebug(LOG_VariableController()) << tr("VariableController destruction") |
|
|
57 | 57 | << QThread::currentThread(); |
|
|
58 | 58 | this->waitForFinish(); |
|
|
59 | 59 | } |
|
|
60 | 60 | |
|
|
61 | 61 | VariableModel *VariableController::variableModel() noexcept |
|
|
62 | 62 | { |
|
|
63 | 63 | return impl->m_VariableModel; |
|
|
64 | 64 | } |
|
|
65 | 65 | |
|
|
66 | 66 | QItemSelectionModel *VariableController::variableSelectionModel() noexcept |
|
|
67 | 67 | { |
|
|
68 | 68 | return impl->m_VariableSelectionModel; |
|
|
69 | 69 | } |
|
|
70 | 70 | |
|
|
71 | 71 | void VariableController::setTimeController(TimeController *timeController) noexcept |
|
|
72 | 72 | { |
|
|
73 | 73 | impl->m_TimeController = timeController; |
|
|
74 | 74 | } |
|
|
75 | 75 | |
|
|
76 | 76 | void VariableController::deleteVariable(std::shared_ptr<Variable> variable) noexcept |
|
|
77 | 77 | { |
|
|
78 | 78 | if (!variable) { |
|
|
79 | 79 | qCCritical(LOG_VariableController()) << "Can't delete variable: variable is null"; |
|
|
80 | 80 | return; |
|
|
81 | 81 | } |
|
|
82 | 82 | |
|
|
83 | 83 | // Spreads in SciQlop that the variable will be deleted, so that potential receivers can |
|
|
84 | 84 | // make some treatments before the deletion |
|
|
85 | 85 | emit variableAboutToBeDeleted(variable); |
|
|
86 | 86 | |
|
|
87 | 87 | // Deletes identifier |
|
|
88 | 88 | impl->m_VariableToIdentifierMap.erase(variable); |
|
|
89 | 89 | |
|
|
90 | 90 | // Deletes provider |
|
|
91 | 91 | auto nbProvidersDeleted = impl->m_VariableToProviderMap.erase(variable); |
|
|
92 | 92 | qCDebug(LOG_VariableController()) |
|
|
93 | 93 | << tr("Number of providers deleted for variable %1: %2") |
|
|
94 | 94 | .arg(variable->name(), QString::number(nbProvidersDeleted)); |
|
|
95 | 95 | |
|
|
96 | 96 | // Clears cache |
|
|
97 | 97 | impl->m_VariableCacheController->clear(variable); |
|
|
98 | 98 | |
|
|
99 | 99 | // Deletes from model |
|
|
100 | 100 | impl->m_VariableModel->deleteVariable(variable); |
|
|
101 | 101 | } |
|
|
102 | 102 | |
|
|
103 | 103 | void VariableController::deleteVariables( |
|
|
104 | 104 | const QVector<std::shared_ptr<Variable> > &variables) noexcept |
|
|
105 | 105 | { |
|
|
106 | 106 | for (auto variable : qAsConst(variables)) { |
|
|
107 | 107 | deleteVariable(variable); |
|
|
108 | 108 | } |
|
|
109 | 109 | } |
|
|
110 | 110 | |
|
|
111 | 111 | void VariableController::abortProgress(std::shared_ptr<Variable> variable) |
|
|
112 | 112 | { |
|
|
113 | 113 | } |
|
|
114 | 114 | |
|
|
115 | 115 | void VariableController::createVariable(const QString &name, const QVariantHash &metadata, |
|
|
116 | 116 | std::shared_ptr<IDataProvider> provider) noexcept |
|
|
117 | 117 | { |
|
|
118 | 118 | |
|
|
119 | 119 | if (!impl->m_TimeController) { |
|
|
120 | 120 | qCCritical(LOG_VariableController()) |
|
|
121 | 121 | << tr("Impossible to create variable: The time controller is null"); |
|
|
122 | 122 | return; |
|
|
123 | 123 | } |
|
|
124 | 124 | |
|
|
125 | 125 | auto dateTime = impl->m_TimeController->dateTime(); |
|
|
126 | 126 | |
|
|
127 | 127 | if (auto newVariable = impl->m_VariableModel->createVariable(name, dateTime, metadata)) { |
|
|
128 | 128 | auto identifier = QUuid::createUuid(); |
|
|
129 | 129 | |
|
|
130 | 130 | // store the provider |
|
|
131 | 131 | impl->m_VariableToProviderMap[newVariable] = provider; |
|
|
132 | 132 | impl->m_VariableToIdentifierMap[newVariable] = identifier; |
|
|
133 | 133 | |
|
|
134 | 134 | auto addDateTimeAcquired = [ this, varW = std::weak_ptr<Variable>{newVariable} ]( |
|
|
135 | 135 | QUuid identifier, auto dataSeriesAcquired, auto dateTimeToPutInCache) |
|
|
136 | 136 | { |
|
|
137 | 137 | if (auto variable = varW.lock()) { |
|
|
138 | 138 | auto varIdentifier = impl->m_VariableToIdentifierMap.at(variable); |
|
|
139 | 139 | if (varIdentifier == identifier) { |
|
|
140 | 140 | impl->m_VariableCacheController->addDateTime(variable, dateTimeToPutInCache); |
|
|
141 | 141 | variable->setDataSeries(dataSeriesAcquired); |
|
|
142 | 142 | emit variable->updated(); |
|
|
143 | 143 | } |
|
|
144 | 144 | } |
|
|
145 | 145 | }; |
|
|
146 | 146 | |
|
|
147 | 147 | connect(provider.get(), &IDataProvider::dataProvided, addDateTimeAcquired); |
|
|
148 | 148 | connect(provider.get(), &IDataProvider::dataProvidedProgress, this, |
|
|
149 | 149 | &VariableController::onVariableRetrieveDataInProgress); |
|
|
150 | 150 | this->onRequestDataLoading(newVariable, dateTime); |
|
|
151 | 151 | } |
|
|
152 | 152 | } |
|
|
153 | 153 | |
|
|
154 | 154 | void VariableController::onDateTimeOnSelection(const SqpDateTime &dateTime) |
|
|
155 | 155 | { |
|
|
156 | 156 | qCDebug(LOG_VariableController()) << "VariableController::onDateTimeOnSelection" |
|
|
157 | 157 | << QThread::currentThread()->objectName(); |
|
|
158 | 158 | auto selectedRows = impl->m_VariableSelectionModel->selectedRows(); |
|
|
159 | 159 | |
|
|
160 | 160 | for (const auto &selectedRow : qAsConst(selectedRows)) { |
|
|
161 | 161 | if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) { |
|
|
162 | 162 | selectedVariable->setDateTime(dateTime); |
|
|
163 | 163 | this->onRequestDataLoading(selectedVariable, dateTime); |
|
|
164 | ||
|
|
165 | // notify that rescale operation has to be done | |
|
|
164 | 166 | emit rangeChanged(selectedVariable, dateTime); |
|
|
165 | 167 | } |
|
|
166 | 168 | } |
|
|
167 | 169 | } |
|
|
168 | 170 | |
|
|
169 | 171 | void VariableController::onVariableRetrieveDataInProgress(QUuid identifier, double progress) |
|
|
170 | 172 | { |
|
|
171 | 173 | auto findReply = [identifier](const auto &entry) { return identifier == entry.second; }; |
|
|
172 | 174 | |
|
|
173 | 175 | auto end = impl->m_VariableToIdentifierMap.cend(); |
|
|
174 | 176 | auto it = std::find_if(impl->m_VariableToIdentifierMap.cbegin(), end, findReply); |
|
|
175 | 177 | if (it != end) { |
|
|
176 | 178 | impl->m_VariableModel->setDataProgress(it->first, progress); |
|
|
177 | 179 | } |
|
|
178 | 180 | } |
|
|
179 | 181 | |
|
|
180 | 182 | void VariableController::onAbortProgressRequested(std::shared_ptr<Variable> variable) |
|
|
181 | 183 | { |
|
|
182 | 184 | qCDebug(LOG_VariableController()) << "TORM: VariableController::onAbortProgressRequested" |
|
|
183 | 185 | << QThread::currentThread()->objectName(); |
|
|
184 | 186 | |
|
|
185 | 187 | auto it = impl->m_VariableToIdentifierMap.find(variable); |
|
|
186 | 188 | if (it != impl->m_VariableToIdentifierMap.cend()) { |
|
|
187 | 189 | impl->m_VariableToProviderMap.at(variable)->requestDataAborting(it->second); |
|
|
188 | 190 | } |
|
|
189 | 191 | else { |
|
|
190 | 192 | qCWarning(LOG_VariableController()) |
|
|
191 | 193 | << tr("Aborting progression of inexistant variable detected !!!") |
|
|
192 | 194 | << QThread::currentThread()->objectName(); |
|
|
193 | 195 | } |
|
|
194 | 196 | } |
|
|
195 | 197 | |
|
|
196 | 198 | |
|
|
197 | 199 | void VariableController::onRequestDataLoading(std::shared_ptr<Variable> variable, |
|
|
198 | 200 | const SqpDateTime &dateTime) |
|
|
199 | 201 | { |
|
|
200 | 202 | qCDebug(LOG_VariableController()) << "VariableController::onRequestDataLoading" |
|
|
201 | 203 | << QThread::currentThread()->objectName(); |
|
|
202 | 204 | // we want to load data of the variable for the dateTime. |
|
|
203 | 205 | // First we check if the cache contains some of them. |
|
|
204 | 206 | // For the other, we ask the provider to give them. |
|
|
205 | 207 | if (variable) { |
|
|
206 | 208 | |
|
|
207 | 209 | auto dateTimeListNotInCache |
|
|
208 | 210 | = impl->m_VariableCacheController->provideNotInCacheDateTimeList(variable, dateTime); |
|
|
209 | 211 | |
|
|
210 | 212 | if (!dateTimeListNotInCache.empty()) { |
|
|
211 | 213 | // Ask the provider for each data on the dateTimeListNotInCache |
|
|
212 | 214 | auto identifier = impl->m_VariableToIdentifierMap.at(variable); |
|
|
213 | 215 | impl->m_VariableToProviderMap.at(variable)->requestDataLoading( |
|
|
214 | 216 | identifier, |
|
|
215 | 217 | DataProviderParameters{std::move(dateTimeListNotInCache), variable->metadata()}); |
|
|
216 | 218 | } |
|
|
217 | 219 | else { |
|
|
218 | 220 | emit variable->updated(); |
|
|
219 | 221 | } |
|
|
220 | 222 | } |
|
|
221 | 223 | else { |
|
|
222 | 224 | qCCritical(LOG_VariableController()) << tr("Impossible to load data of a variable null"); |
|
|
223 | 225 | } |
|
|
224 | 226 | } |
|
|
225 | 227 | |
|
|
226 | 228 | |
|
|
227 | 229 | void VariableController::initialize() |
|
|
228 | 230 | { |
|
|
229 | 231 | qCDebug(LOG_VariableController()) << tr("VariableController init") << QThread::currentThread(); |
|
|
230 | 232 | impl->m_WorkingMutex.lock(); |
|
|
231 | 233 | qCDebug(LOG_VariableController()) << tr("VariableController init END"); |
|
|
232 | 234 | } |
|
|
233 | 235 | |
|
|
234 | 236 | void VariableController::finalize() |
|
|
235 | 237 | { |
|
|
236 | 238 | impl->m_WorkingMutex.unlock(); |
|
|
237 | 239 | } |
|
|
238 | 240 | |
|
|
239 | 241 | void VariableController::waitForFinish() |
|
|
240 | 242 | { |
|
|
241 | 243 | QMutexLocker locker{&impl->m_WorkingMutex}; |
|
|
242 | 244 | } |
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