HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r424:0d257d28af1c

Merge branch 'feature/AbortDownload' into develop

perrinel -

r424:0d257d28af1c

parent child

Context file:

r424:0d257d28af1c

core/include/Data/IDataProvider.h +5 0

                  */
                 virtual void requestDataLoading(QUuid identifier, const DataProviderParameters &parameters) = 0;
+                /**
+                 * @brief requestDataAborting stop data loading of the data identified by identifier
+                 */
+                virtual void requestDataAborting(QUuid identifier) = 0;
             signals:
                 /**
                  * @brief dataProvided send dataSeries under dateTime and that corresponds of the data

core/include/Variable/VariableController.h +7 0

                  */
                 void deleteVariables(const QVector<std::shared_ptr<Variable> > &variables) noexcept;
+                /**
+                 * @brief abort the variable retrieve data progression
+                 */
+                void abortProgress(std::shared_ptr<Variable> variable);
             signals:
                 /// Signal emitted when a variable is about to be deleted from the controller
                 void variableAboutToBeDeleted(std::shared_ptr<Variable> variable);
                 void onVariableRetrieveDataInProgress(QUuid identifier, double progress);
+                void onAbortProgressRequested(std::shared_ptr<Variable> variable);
                 void initialize();
                 void finalize();

core/include/Variable/VariableModel.h +8 0

              * @brief The VariableModel class aims to hold the variables that have been created in SciQlop
              */
             class VariableModel : public QAbstractTableModel {
+                Q_OBJECT
             public:
                 explicit VariableModel(QObject *parent = nullptr);
                 void setDataProgress(std::shared_ptr<Variable> variable, double progress);
                 // /////////////////////////// //
                 // QAbstractTableModel methods //
                 // /////////////////////////// //
                 virtual QVariant headerData(int section, Qt::Orientation orientation,
                                             int role = Qt::DisplayRole) const override;
+                void abortProgress(const QModelIndex &index);
+            signals:
+                void abortProgessRequested(std::shared_ptr<Variable> variable);
             private:
                 class VariableModelPrivate;
                 spimpl::unique_impl_ptr<VariableModelPrivate> impl;

core/src/Network/NetworkController.cpp +37 -4

             #include <QNetworkAccessManager>
             #include <QNetworkReply>
             #include <QNetworkRequest>
+            #include <QReadWriteLock>
             #include <QThread>
             #include <unordered_map>
                 explicit NetworkControllerPrivate(NetworkController *parent) : m_WorkingMutex{} {}
                 QMutex m_WorkingMutex;
+                QReadWriteLock m_Lock;
                 std::unordered_map<QNetworkReply *, QUuid> m_NetworkReplyToVariableId;
                 std::unique_ptr<QNetworkAccessManager> m_AccessManager{nullptr};
+                void lockRead() { m_Lock.lockForRead(); }
+                void lockWrite() { m_Lock.lockForWrite(); }
+                void unlock() { m_Lock.unlock(); }
             };
             NetworkController::NetworkController(QObject *parent)
             void NetworkController::onProcessRequested(const QNetworkRequest &request, QUuid identifier,
                                                        std::function<void(QNetworkReply *, QUuid)> callback)
             {
-                qCInfo(LOG_NetworkController()) << tr("NetworkController registered")
-                                                << QThread::currentThread();
                 auto reply = impl->m_AccessManager->get(request);
+                qCDebug(LOG_NetworkController()) << tr("NetworkController registered")
+                                                 << QThread::currentThread() << reply;
                 // Store the couple reply id
+                impl->lockWrite();
                 impl->m_NetworkReplyToVariableId[reply] = identifier;
+                impl->unlock();
                 auto onReplyFinished = [reply, this, identifier, callback]() {
-                    qCInfo(LOG_NetworkController()) << tr("NetworkController onReplyFinished")
+                    qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyFinished")
-                                                    << QThread::currentThread();
+                                                     << QThread::currentThread() << reply;
+                    impl->lockRead();
                     auto it = impl->m_NetworkReplyToVariableId.find(reply);
+                    impl->unlock();
                     if (it != impl->m_NetworkReplyToVariableId.cend()) {
+                        impl->lockWrite();
+                        impl->m_NetworkReplyToVariableId.erase(reply);
+                        impl->unlock();
+                        // Deletes reply
                         callback(reply, identifier);
+                        reply->deleteLater();
+                        emit this->replyDownloadProgress(identifier, 0);
                     }
+                    qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyFinished END")
+                                                     << QThread::currentThread() << reply;
                 };
                 auto onReplyProgress = [reply, this](qint64 bytesRead, qint64 totalBytes) {
                     double progress = (bytesRead * 100.0) / totalBytes;
+                    qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyProgress") << progress
+                                                     << QThread::currentThread() << reply;
+                    impl->lockRead();
                     auto it = impl->m_NetworkReplyToVariableId.find(reply);
+                    impl->unlock();
                     if (it != impl->m_NetworkReplyToVariableId.cend()) {
                         emit this->replyDownloadProgress(it->second, progress);
                     }
+                    qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyProgress END")
+                                                     << QThread::currentThread() << reply;
                 };
             void NetworkController::onReplyCanceled(QUuid identifier)
             {
                 auto findReply = [identifier](const auto &entry) { return identifier == entry.second; };
+                qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyCanceled")
+                                                 << QThread::currentThread();
+                impl->lockRead();
                 auto end = impl->m_NetworkReplyToVariableId.cend();
                 auto it = std::find_if(impl->m_NetworkReplyToVariableId.cbegin(), end, findReply);
+                impl->unlock();
                 if (it != end) {
                     it->first->abort();
                 }
+                qCDebug(LOG_NetworkController()) << tr("NetworkController onReplyCanceled END")
+                                                 << QThread::currentThread();
             }
             void NetworkController::waitForFinish()

core/src/Variable/VariableController.cpp +23 0

             {
                 qCDebug(LOG_VariableController()) << tr("VariableController construction")
                                                   << QThread::currentThread();
+                connect(impl->m_VariableModel, &VariableModel::abortProgessRequested, this,
+                        &VariableController::onAbortProgressRequested);
             }
             VariableController::~VariableController()
                 }
             }
+            void VariableController::abortProgress(std::shared_ptr<Variable> variable)
+            {
+            }
             void VariableController::createVariable(const QString &name, const QVariantHash &metadata,
                                                     std::shared_ptr<IDataProvider> provider) noexcept
             {
                 }
             }
+            void VariableController::onAbortProgressRequested(std::shared_ptr<Variable> variable)
+            {
+                qCDebug(LOG_VariableController()) << "TORM: VariableController::onAbortProgressRequested"
+                                                  << QThread::currentThread()->objectName();
+                auto it = impl->m_VariableToIdentifierMap.find(variable);
+                if (it != impl->m_VariableToIdentifierMap.cend()) {
+                    impl->m_VariableToProviderMap.at(variable)->requestDataAborting(it->second);
+                }
+                else {
+                    qCWarning(LOG_VariableController())
+                        << tr("Aborting progression of inexistant variable detected !!!")
+                        << QThread::currentThread()->objectName();
+                }
+            }
             void VariableController::onRequestDataLoading(std::shared_ptr<Variable> variable,
                                                           const SqpDateTime &dateTime)

core/src/Variable/VariableModel.cpp +7 0

                 return QVariant{};
             }
+            void VariableModel::abortProgress(const QModelIndex &index)
+            {
+                if (auto variable = impl->m_Variables.at(index.row())) {
+                    emit abortProgessRequested(variable);
+                }
+            }
             void VariableModel::onVariableUpdated() noexcept
             {
                 // Finds variable that has been updated in the model

gui/src/Variable/VariableInspectorWidget.cpp +62 -2

@@ -5,6 +5,7
5		5
6	#include <ui_VariableInspectorWidget.h>	6	#include <ui_VariableInspectorWidget.h>
7		7
		8	#include <QMouseEvent>
8	#include <QSortFilterProxyModel>	9	#include <QSortFilterProxyModel>
9	#include <QStyledItemDelegate>	10	#include <QStyledItemDelegate>
10	#include <QWidgetAction>	11	#include <QWidgetAction>
@@ -27,9 +28,12 public:
27	if (data.isValid() && progressData.isValid()) {	28	if (data.isValid() && progressData.isValid()) {
28	auto name = data.value<QString>();	29	auto name = data.value<QString>();
29	auto progress = progressData.value<double>();	30	auto progress = progressData.value<double>();
30	if (progress >= 0) {	31	if (progress > 0) {
		32	auto cancelButtonWidth = 20;
31	auto progressBarOption = QStyleOptionProgressBar{};	33	auto progressBarOption = QStyleOptionProgressBar{};
32	progress~~BarOption~~.rect = option.rect;	34	auto progressRect = option.rect;
		35	progressRect.setWidth(progressRect.width() - cancelButtonWidth);
		36	progressBarOption.rect = progressRect;
33	progressBarOption.minimum = 0;	37	progressBarOption.minimum = 0;
34	progressBarOption.maximum = 100;	38	progressBarOption.maximum = 100;
35	progressBarOption.progress = progress;	39	progressBarOption.progress = progress;
@@ -38,14 +42,70 public:
38	progressBarOption.textVisible = true;	42	progressBarOption.textVisible = true;
39	progressBarOption.textAlignment = Qt::AlignCenter;	43	progressBarOption.textAlignment = Qt::AlignCenter;
40		44
		45
41	QApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption,	46	QApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption,
42	painter);	47	painter);
		48
		49	// Cancel button
		50	auto buttonRect = QRect(progressRect.right(), option.rect.top(), cancelButtonWidth,
		51	option.rect.height());
		52	auto buttonOption = QStyleOptionButton{};
		53	buttonOption.rect = buttonRect;
		54	buttonOption.text = "X";
		55
		56	QApplication::style()->drawControl(QStyle::CE_PushButton, &buttonOption, painter);
		57	}
		58	else {
		59	QStyledItemDelegate::paint(painter, option, index);
43	}	60	}
44	}	61	}
45	else {	62	else {
46	QStyledItemDelegate::paint(painter, option, index);	63	QStyledItemDelegate::paint(painter, option, index);
47	}	64	}
48	}	65	}
		66
		67	bool editorEvent(QEvent event, QAbstractItemModel model, const QStyleOptionViewItem &option,
		68	const QModelIndex &index)
		69	{
		70	if (event->type() == QEvent::MouseButtonRelease) {
		71	auto data = index.data(Qt::DisplayRole);
		72	auto progressData = index.data(VariableRoles::ProgressRole);
		73	if (data.isValid() && progressData.isValid()) {
		74	auto cancelButtonWidth = 20;
		75	auto progressRect = option.rect;
		76	progressRect.setWidth(progressRect.width() - cancelButtonWidth);
		77	// Cancel button
		78	auto buttonRect = QRect(progressRect.right(), option.rect.top(), cancelButtonWidth,
		79	option.rect.height());
		80
		81	QMouseEvent e = (QMouseEvent )event;
		82	int clickX = e->x();
		83	int clickY = e->y();
		84
		85	auto x = buttonRect.left(); // the X coordinate
		86	auto y = buttonRect.top(); // the Y coordinate
		87	auto w = buttonRect.width(); // button width
		88	auto h = buttonRect.height(); // button height
		89
		90	if (clickX > x && clickX < x + w) {
		91	if (clickY > y && clickY < y + h) {
		92	qCritical(LOG_VariableInspectorWidget()) << tr("editorEvent CLIC");
		93	auto variableModel = sqpApp->variableController().variableModel();
		94	variableModel->abortProgress(index);
		95	}
		96	}
		97	else {
		98	QStyledItemDelegate::editorEvent(event, model, option, index);
		99	}
		100	}
		101	else {
		102	QStyledItemDelegate::editorEvent(event, model, option, index);
		103	}
		104	}
		105	else {
		106	QStyledItemDelegate::editorEvent(event, model, option, index);
		107	}
		108	}
49	};	109	};
50		110
51	VariableInspectorWidget::VariableInspectorWidget(QWidget *parent)	111	VariableInspectorWidget::VariableInspectorWidget(QWidget *parent)

plugins/amda/include/AmdaProvider.h +2 0

                 void requestDataLoading(QUuid token, const DataProviderParameters &parameters) override;
+                void requestDataAborting(QUuid identifier) override;
             private:
                 void retrieveData(QUuid token, const SqpDateTime &dateTime, const QVariantHash &data);
             };

plugins/amda/src/AmdaProvider.cpp +10 -5

                 }
             }
+            void AmdaProvider::requestDataAborting(QUuid identifier)
+            {
+                if (auto app = sqpApp) {
+                    auto &networkController = app->networkController();
+                    networkController.onReplyCanceled(identifier);
+                }
+            }
             void AmdaProvider::retrieveData(QUuid token, const SqpDateTime &dateTime, const QVariantHash &data)
             {
                 // Retrieves product ID from data: if the value is invalid, no request is made
                               }
                           }
-                          // Deletes reply
-                          reply->deleteLater();
-                          reply = nullptr;
                       };
                 auto httpFinishedLambda = [this, httpDownloadFinished, tempFile](QNetworkReply *reply,
                                                                                  QUuid dataId) noexcept {
                     auto downloadFileUrl = QUrl{QString{reply->readAll()}};
-                    // Deletes old reply
-                    reply->deleteLater();
                     // Executes request for downloading file //

plugins/mockplugin/include/CosinusProvider.h +3 0

                 void requestDataLoading(QUuid token, const DataProviderParameters &parameters) override;
+                void requestDataAborting(QUuid identifier) override;
             private:
                 /// @sa IDataProvider::retrieveData()
                 std::shared_ptr<IDataSeries> retrieveData(const SqpDateTime &dateTime) const;

plugins/mockplugin/src/CosinusProvider.cpp +5 0

@@ -46,3 +46,8 void CosinusProvider::requestDataLoading(QUuid token, const DataProviderParamete
46	emit dataProvided(token, scalarSeries, dateTime);	46	emit dataProvided(token, scalarSeries, dateTime);
47	}	47	}
48	}	48	}
		49
		50	void CosinusProvider::requestDataAborting(QUuid identifier)
		51	{
		52	// TODO
		53	}

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages