GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r448:f7cb609ac07f

Merge pull request from SCIQLOP-Initialisation develop...

leroux -

r448:f7cb609ac07f

parent child

Context file:

r448:f7cb609ac07f

Expand all files

gui/include/Visualization/operations/RescaleAxeOperation.h created 644 +42 0

@@ -0,0 +1,42
	1	#ifndef SCIQLOP_RESCALEAXEOPERATION_H
	2	#define SCIQLOP_RESCALEAXEOPERATION_H
	3
	4	#include "Visualization/IVisualizationWidgetVisitor.h"
	5	#include <Data/SqpDateTime.h>
	6
	7	#include <Common/spimpl.h>
	8
	9	#include <QLoggingCategory>
	10
	11	#include <memory>
	12
	13	class Variable;
	14
	15	Q_DECLARE_LOGGING_CATEGORY(LOG_RescaleAxeOperation)
	16
	17	/**
	18	* @brief The RescaleAxeOperation class defines an operation that traverses all of visualization
	19	* widgets to remove a variable if they contain it
	20	*/
	21	class RescaleAxeOperation : public IVisualizationWidgetVisitor {
	22	public:
	23	/**
	24	* Ctor
	25	* @param variable the variable to remove from widgets
	26	*/
	27	explicit RescaleAxeOperation(std::shared_ptr<Variable> variable, const SqpDateTime &range);
	28
	29	void visitEnter(VisualizationWidget *widget) override final;
	30	void visitLeave(VisualizationWidget *widget) override final;
	31	void visitEnter(VisualizationTabWidget *tabWidget) override final;
	32	void visitLeave(VisualizationTabWidget *tabWidget) override final;
	33	void visitEnter(VisualizationZoneWidget *zoneWidget) override final;
	34	void visitLeave(VisualizationZoneWidget *zoneWidget) override final;
	35	void visit(VisualizationGraphWidget *graphWidget) override final;
	36
	37	private:
	38	class RescaleAxeOperationPrivate;
	39	spimpl::unique_impl_ptr<RescaleAxeOperationPrivate> impl;
	40	};
	41
	42	#endif // SCIQLOP_RESCALEAXEOPERATION_H

gui/src/Visualization/operations/RescaleAxeOperation.cpp created 644 +71 0

@@ -0,0 +1,71
	1	#include "Visualization/operations/RescaleAxeOperation.h"
	2	#include "Visualization/VisualizationGraphWidget.h"
	3
	4	Q_LOGGING_CATEGORY(LOG_RescaleAxeOperation, "RescaleAxeOperation")
	5
	6	struct RescaleAxeOperation::RescaleAxeOperationPrivate {
	7	explicit RescaleAxeOperationPrivate(std::shared_ptr<Variable> variable,
	8	const SqpDateTime &range)
	9	: m_Variable{variable}, m_Range{range}
	10	{
	11	}
	12
	13	std::shared_ptr<Variable> m_Variable;
	14	SqpDateTime m_Range;
	15	};
	16
	17	RescaleAxeOperation::RescaleAxeOperation(std::shared_ptr<Variable> variable,
	18	const SqpDateTime &range)
	19	: impl{spimpl::make_unique_impl<RescaleAxeOperationPrivate>(variable, range)}
	20	{
	21	}
	22
	23	void RescaleAxeOperation::visitEnter(VisualizationWidget *widget)
	24	{
	25	// VisualizationWidget is not intended to contain a variable
	26	Q_UNUSED(widget)
	27	}
	28
	29	void RescaleAxeOperation::visitLeave(VisualizationWidget *widget)
	30	{
	31	// VisualizationWidget is not intended to contain a variable
	32	Q_UNUSED(widget)
	33	}
	34
	35	void RescaleAxeOperation::visitEnter(VisualizationTabWidget *tabWidget)
	36	{
	37	// VisualizationTabWidget is not intended to contain a variable
	38	Q_UNUSED(tabWidget)
	39	}
	40
	41	void RescaleAxeOperation::visitLeave(VisualizationTabWidget *tabWidget)
	42	{
	43	// VisualizationTabWidget is not intended to contain a variable
	44	Q_UNUSED(tabWidget)
	45	}
	46
	47	void RescaleAxeOperation::visitEnter(VisualizationZoneWidget *zoneWidget)
	48	{
	49	// VisualizationZoneWidget is not intended to contain a variable
	50	Q_UNUSED(zoneWidget)
	51	}
	52
	53	void RescaleAxeOperation::visitLeave(VisualizationZoneWidget *zoneWidget)
	54	{
	55	// VisualizationZoneWidget is not intended to contain a variable
	56	Q_UNUSED(zoneWidget)
	57	}
	58
	59	void RescaleAxeOperation::visit(VisualizationGraphWidget *graphWidget)
	60	{
	61	if (graphWidget) {
	62	// If the widget contains the variable, rescale it
	63	if (impl->m_Variable && graphWidget->contains(*impl->m_Variable)) {
	64	graphWidget->setRange(impl->m_Variable, impl->m_Range);
	65	}
	66	}
	67	else {
	68	qCCritical(LOG_RescaleAxeOperation(),
	69	"Can't visit VisualizationGraphWidget : the widget is null");
	70	}
	71	}

plugins/amda/tests-resources/TestAmdaResultParser/FileNotFound.txt created 644 +3 0

@@ -0,0 +1,3
	1	Not Found
	2
	3	The requested URL /AMDA/data/WSRESULT/imf(0)-1343153090-1343153092-60.txt was not found on this server. No newline at end of file

app/src/MainWindow.cpp +4 0

             /*------------------------------------------------------------------------------
             -- This file is a part of the SciQLop Software
             -- Copyright (C) 2017, Plasma Physics Laboratory - CNRS
             --
             -- This program is free software; you can redistribute it and/or modify
             -- it under the terms of the GNU General Public License as published by
             -- the Free Software Foundation; either version 2 of the License, or
             -- (at your option) any later version.
             --
             -- This program is distributed in the hope that it will be useful,
             -- but WITHOUT ANY WARRANTY; without even the implied warranty of
             -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
             -- GNU General Public License for more details.
             --
             -- You should have received a copy of the GNU General Public License
             -- along with this program; if not, write to the Free Software
             -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
             -------------------------------------------------------------------------------*/
             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
             #include "MainWindow.h"
             #include "ui_MainWindow.h"
             #include <DataSource/DataSourceController.h>
             #include <DataSource/DataSourceWidget.h>
             #include <SidePane/SqpSidePane.h>
             #include <SqpApplication.h>
             #include <Time/TimeController.h>
             #include <TimeWidget/TimeWidget.h>
             #include <Variable/Variable.h>
             #include <Variable/VariableController.h>
             #include <Visualization/VisualizationController.h>
             #include <QAction>
             #include <QDate>
             #include <QDateTime>
             #include <QDir>
             #include <QFileDialog>
             #include <QToolBar>
             #include <QToolButton>
             #include <memory.h>
             //#include <omp.h>
             //#include <network/filedownloader.h>
             //#include <qlopdatabase.h>
             //#include <qlopsettings.h>
             //#include <qlopgui.h>
             //#include <spacedata.h>
             //#include "qlopcore.h"
             //#include "qlopcodecmanager.h"
             //#include "cdfcodec.h"
             //#include "amdatxtcodec.h"
             //#include <qlopplotmanager.h>
             #include "iostream"
             Q_LOGGING_CATEGORY(LOG_MainWindow, "MainWindow")
             namespace {
             const auto LEFTMAININSPECTORWIDGETSPLITTERINDEX = 0;
             const auto LEFTINSPECTORSIDEPANESPLITTERINDEX = 1;
             const auto VIEWPLITTERINDEX = 2;
             const auto RIGHTINSPECTORSIDEPANESPLITTERINDEX = 3;
             const auto RIGHTMAININSPECTORWIDGETSPLITTERINDEX = 4;
             }
             class MainWindow::MainWindowPrivate {
             public:
                 QSize m_LastOpenLeftInspectorSize;
                 QSize m_LastOpenRightInspectorSize;
             };
             MainWindow::MainWindow(QWidget *parent)
                     : QMainWindow{parent},
                       m_Ui{new Ui::MainWindow},
                       impl{spimpl::make_unique_impl<MainWindowPrivate>()}
             {
                 m_Ui->setupUi(this);
                 m_Ui->splitter->setCollapsible(LEFTINSPECTORSIDEPANESPLITTERINDEX, false);
                 m_Ui->splitter->setCollapsible(RIGHTINSPECTORSIDEPANESPLITTERINDEX, false);
                 auto leftSidePane = m_Ui->leftInspectorSidePane->sidePane();
                 auto openLeftInspectorAction = new QAction{QIcon{
                                                                ":/icones/previous.png",
                                                            },
                                                            tr("Show/hide the left inspector"), this};
                 auto spacerLeftTop = new QWidget{};
                 spacerLeftTop->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                 auto spacerLeftBottom = new QWidget{};
                 spacerLeftBottom->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                 leftSidePane->addWidget(spacerLeftTop);
                 leftSidePane->addAction(openLeftInspectorAction);
                 leftSidePane->addWidget(spacerLeftBottom);
                 auto rightSidePane = m_Ui->rightInspectorSidePane->sidePane();
                 auto openRightInspectorAction = new QAction{QIcon{
                                                                 ":/icones/next.png",
                                                             },
                                                             tr("Show/hide the right inspector"), this};
                 auto spacerRightTop = new QWidget{};
                 spacerRightTop->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                 auto spacerRightBottom = new QWidget{};
                 spacerRightBottom->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                 rightSidePane->addWidget(spacerRightTop);
                 rightSidePane->addAction(openRightInspectorAction);
                 rightSidePane->addWidget(spacerRightBottom);
                 openLeftInspectorAction->setCheckable(true);
                 openRightInspectorAction->setCheckable(true);
                 auto openInspector = [this](bool checked, bool right, auto action) {
                     action->setIcon(QIcon{(checked xor right) ? ":/icones/next.png" : ":/icones/previous.png"});
                     auto &lastInspectorSize
                         = right ? impl->m_LastOpenRightInspectorSize : impl->m_LastOpenLeftInspectorSize;
                     auto nextInspectorSize = right ? m_Ui->rightMainInspectorWidget->size()
                                                    : m_Ui->leftMainInspectorWidget->size();
                     // Update of the last opened geometry
                     if (checked) {
                         lastInspectorSize = nextInspectorSize;
                     }
                     auto startSize = lastInspectorSize;
                     auto endSize = startSize;
                     endSize.setWidth(0);
                     auto splitterInspectorIndex
                         = right ? RIGHTMAININSPECTORWIDGETSPLITTERINDEX : LEFTMAININSPECTORWIDGETSPLITTERINDEX;
                     auto currentSizes = m_Ui->splitter->sizes();
                     if (checked) {
                         // adjust sizes individually here, e.g.
                         currentSizes[splitterInspectorIndex] -= lastInspectorSize.width();
                         currentSizes[VIEWPLITTERINDEX] += lastInspectorSize.width();
                         m_Ui->splitter->setSizes(currentSizes);
                     }
                     else {
                         // adjust sizes individually here, e.g.
                         currentSizes[splitterInspectorIndex] += lastInspectorSize.width();
                         currentSizes[VIEWPLITTERINDEX] -= lastInspectorSize.width();
                         m_Ui->splitter->setSizes(currentSizes);
                     }
                 };
                 connect(openLeftInspectorAction, &QAction::triggered,
                         [openInspector, openLeftInspectorAction](bool checked) {
                             openInspector(checked, false, openLeftInspectorAction);
                         });
                 connect(openRightInspectorAction, &QAction::triggered,
                         [openInspector, openRightInspectorAction](bool checked) {
                             openInspector(checked, true, openRightInspectorAction);
                         });
                 this->menuBar()->addAction(tr("File"));
                 auto mainToolBar = this->addToolBar(QStringLiteral("MainToolBar"));
                 auto timeWidget = new TimeWidget{};
                 mainToolBar->addWidget(timeWidget);
                 // Controllers / controllers connections
                 connect(&sqpApp->timeController(), SIGNAL(timeUpdated(SqpDateTime)),
                         &sqpApp->variableController(), SLOT(onDateTimeOnSelection(SqpDateTime)));
                 // Widgets / controllers connections
                 // DataSource
                 connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem *)),
                         m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem *)));
                 // Time
                 connect(timeWidget, SIGNAL(timeUpdated(SqpDateTime)), &sqpApp->timeController(),
                         SLOT(onTimeToUpdate(SqpDateTime)));
                 // Visualization
                 connect(&sqpApp->visualizationController(),
                         SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), m_Ui->view,
                         SLOT(onVariableAboutToBeDeleted(std::shared_ptr<Variable>)));
+                connect(&sqpApp->visualizationController(),
+                        SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpDateTime &)), m_Ui->view,
+                        SLOT(onRangeChanged(std::shared_ptr<Variable>, const SqpDateTime &)));
                 // Widgets / widgets connections
                 // For the following connections, we use DirectConnection to allow each widget that can
                 // potentially attach a menu to the variable's menu to do so before this menu is displayed.
                 // The order of connections is also important, since it determines the order in which each
                 // widget will attach its menu
                 connect(
                     m_Ui->variableInspectorWidget,
                     SIGNAL(tableMenuAboutToBeDisplayed(QMenu *, const QVector<std::shared_ptr<Variable> > &)),
                     m_Ui->view, SLOT(attachVariableMenu(QMenu *, const QVector<std::shared_ptr<Variable> > &)),
                     Qt::DirectConnection);
                 /*    QLopGUI::registerMenuBar(menuBar());
                     this->setWindowIcon(QIcon(":/sciqlopLOGO.svg"));
                     this->m_progressWidget = new QWidget();
                     this->m_progressLayout = new QVBoxLayout(this->m_progressWidget);
                     this->m_progressWidget->setLayout(this->m_progressLayout);
                     this->m_progressWidget->setWindowModality(Qt::WindowModal);
                     m_progressThreadIds = (int*) malloc(OMP_THREADS*sizeof(int));
                     for(int i=0;i<OMP_THREADS;i++)
                     {
                         this->m_progress.append(new QProgressBar(this->m_progressWidget));
                         this->m_progress.last()->setMinimum(0);
                         this->m_progress.last()->setMaximum(100);
                         this->m_progressLayout->addWidget(this->m_progress.last());
                         this->m_progressWidget->hide();
                         this->m_progressThreadIds[i] = -1;
                     }
                     this->m_progressWidget->setWindowTitle("Loading File");
                     const QList<QLopService*>ServicesToLoad=QList<QLopService*>()
                             << QLopCore::self()
                             << QLopPlotManager::self()
                             << QLopCodecManager::self()
                             << FileDownloader::self()
                             << QLopDataBase::self()
                             << SpaceData::self();
                     CDFCodec::registerToManager();
                     AMDATXTCodec::registerToManager();
                     for(int i=0;i<ServicesToLoad.count();i++)
                     {
                         qDebug()<<ServicesToLoad.at(i)->serviceName();
                         ServicesToLoad.at(i)->initialize(); //must be called before getGUI
                         QDockWidget* wdgt=ServicesToLoad.at(i)->getGUI();
                         if(wdgt)
                         {
                             wdgt->setAllowedAreas(Qt::AllDockWidgetAreas);
                             this->addDockWidget(Qt::TopDockWidgetArea,wdgt);
                         }
                         PythonQt::self()->getMainModule().addObject(ServicesToLoad.at(i)->serviceName(),(QObject*)ServicesToLoad.at(i));
                     }*/
             }
             MainWindow::~MainWindow()
             {
             }
             void MainWindow::changeEvent(QEvent *e)
             {
                 QMainWindow::changeEvent(e);
                 switch (e->type()) {
                     case QEvent::LanguageChange:
                         m_Ui->retranslateUi(this);
                         break;
                     default:
                         break;
                 }
             }

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

             #ifndef SCIQLOP_IDATAPROVIDER_H
             #define SCIQLOP_IDATAPROVIDER_H
             #include <memory>
             #include <QObject>
             #include <QUuid>
             #include <Common/MetaTypes.h>
             #include <Data/SqpDateTime.h>
+            #include <functional>
             class DataProviderParameters;
             class IDataSeries;
             class QNetworkReply;
             class QNetworkRequest;
             /**
              * @brief The IDataProvider interface aims to declare a data provider.
              *
              * A data provider is an entity that generates data and returns it according to various parameters
              * (time interval, product to retrieve the data, etc.)
              *
              * @sa IDataSeries
              */
             class IDataProvider : public QObject {
                 Q_OBJECT
             public:
                 virtual ~IDataProvider() noexcept = default;
                 /**
                  * @brief requestDataLoading provide datas for the data identified by identifier and parameters
                  */
                 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
                  * identified by identifier
                  */
                 void dataProvided(QUuid identifier, std::shared_ptr<IDataSeries> dateSerie,
                                   const SqpDateTime &dateTime);
+                /**
+                    * @brief dataProvided send dataSeries under dateTime and that corresponds of the data
+                    * identified by identifier
+                    */
+                void dataProvidedProgress(QUuid identifier, double progress);
                 /**
                  * @brief requestConstructed send a request for the data identified by identifier
                  * @callback is the methode call by the reply of the request when it is finished.
                  */
                 void requestConstructed(const QNetworkRequest &request, QUuid identifier,
                                         std::function<void(QNetworkReply *, QUuid)> callback);
             };
             // Required for using shared_ptr in signals/slots
             SCIQLOP_REGISTER_META_TYPE(IDATAPROVIDER_PTR_REGISTRY, std::shared_ptr<IDataProvider>)
             SCIQLOP_REGISTER_META_TYPE(IDATAPROVIDER_FUNCTION_REGISTRY,
                                        std::function<void(QNetworkReply *, QUuid)>)
             #endif // SCIQLOP_IDATAPROVIDER_H

core/include/DataSource/DataSourceItemAction.h +2 0

             #ifndef SCIQLOP_DATASOURCEITEMACTION_H
             #define SCIQLOP_DATASOURCEITEMACTION_H
             #include <Common/spimpl.h>
             #include <QLoggingCategory>
             #include <QObject>
+            #include <functional>
             Q_DECLARE_LOGGING_CATEGORY(LOG_DataSourceItemAction)
             class DataSourceItem;
             /**
              * @brief The DataSourceItemAction class represents an action on a data source item.
              *
              * An action is a function that will be executed when the slot execute() is called.
              */
             class DataSourceItemAction : public QObject {
                 Q_OBJECT
             public:
                 /// Signature of the function associated to the action
                 using ExecuteFunction = std::function<void(DataSourceItem &dataSourceItem)>;
                 /**
                  * Ctor
                  * @param name the name of the action
                  * @param fun the function that will be called when the action is executed
                  * @sa execute()
                  */
                 explicit DataSourceItemAction(const QString &name, ExecuteFunction fun);
                 QString name() const noexcept;
                 /// Sets the data source item concerned by the action
                 void setDataSourceItem(DataSourceItem *dataSourceItem) noexcept;
             public slots:
                 /// Executes the action
                 void execute();
             private:
                 class DataSourceItemActionPrivate;
                 spimpl::unique_impl_ptr<DataSourceItemActionPrivate> impl;
             };
             #endif // SCIQLOP_DATASOURCEITEMACTION_H

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

             #ifndef SCIQLOP_VARIABLECONTROLLER_H
             #define SCIQLOP_VARIABLECONTROLLER_H
             #include <Data/SqpDateTime.h>
             #include <QLoggingCategory>
             #include <QObject>
             #include <Common/spimpl.h>
             class IDataProvider;
             class QItemSelectionModel;
             class TimeController;
             class Variable;
             class VariableModel;
             Q_DECLARE_LOGGING_CATEGORY(LOG_VariableController)
             /**
              * @brief The VariableController class aims to handle the variables in SciQlop.
              */
             class VariableController : public QObject {
                 Q_OBJECT
             public:
                 explicit VariableController(QObject *parent = 0);
                 virtual ~VariableController();
                 VariableModel *variableModel() noexcept;
                 QItemSelectionModel *variableSelectionModel() noexcept;
                 void setTimeController(TimeController *timeController) noexcept;
                 /**
                  * Deletes from the controller the variable passed in parameter.
                  *
                  * Delete a variable includes:
                  * - the deletion of the various references to the variable in SciQlop
                  * - the deletion of the model variable
                  * - the deletion of the provider associated with the variable
                  * - removing the cache associated with the variable
                  *
                  * @param variable the variable to delete from the controller.
                  */
                 void deleteVariable(std::shared_ptr<Variable> variable) noexcept;
                 /**
                  * Deletes from the controller the variables passed in parameter.
                  * @param variables the variables to delete from the controller.
                  * @sa deleteVariable()
                  */
                 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);
+                /// Signal emitted when a data acquisition is requested on a range for a variable
+                void rangeChanged(std::shared_ptr<Variable> variable, const SqpDateTime &range);
             public slots:
                 /// Request the data loading of the variable whithin dateTime
                 void onRequestDataLoading(std::shared_ptr<Variable> variable, const SqpDateTime &dateTime);
                 /**
                  * Creates a new variable and adds it to the model
                  * @param name the name of the new variable
                  * @param metadata the metadata of the new variable
                  * @param provider the data provider for the new variable
                  */
                 void createVariable(const QString &name, const QVariantHash &metadata,
                                     std::shared_ptr<IDataProvider> provider) noexcept;
                 /// Update the temporal parameters of every selected variable to dateTime
                 void onDateTimeOnSelection(const SqpDateTime &dateTime);
                 void onVariableRetrieveDataInProgress(QUuid identifier, double progress);
+                void onAbortProgressRequested(std::shared_ptr<Variable> variable);
                 void initialize();
                 void finalize();
             private:
                 void waitForFinish();
                 class VariableControllerPrivate;
                 spimpl::unique_impl_ptr<VariableControllerPrivate> impl;
             };
             #endif // SCIQLOP_VARIABLECONTROLLER_H

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

             #ifndef SCIQLOP_VARIABLEMODEL_H
             #define SCIQLOP_VARIABLEMODEL_H
             #include <Data/SqpDateTime.h>
             #include <QAbstractTableModel>
             #include <QLoggingCategory>
             #include <Common/MetaTypes.h>
             #include <Common/spimpl.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_VariableModel)
             enum VariableRoles { ProgressRole = Qt::UserRole };
             class IDataSeries;
             class Variable;
             /**
              * @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);
                 /**
                  * Creates a new variable in the model
                  * @param name the name of the new variable
                  * @param dateTime the dateTime of the new variable
                  * @param metadata the metadata associated to the new variable
                  * @return the pointer to the new variable
                  */
                 std::shared_ptr<Variable> createVariable(const QString &name, const SqpDateTime &dateTime,
                                                          const QVariantHash &metadata) noexcept;
                 /**
                  * Deletes a variable from the model, if it exists
                  * @param variable the variable to delete
                  */
                 void deleteVariable(std::shared_ptr<Variable> variable) noexcept;
                 std::shared_ptr<Variable> variable(int index) const;
                 void setDataProgress(std::shared_ptr<Variable> variable, double progress);
                 // /////////////////////////// //
                 // QAbstractTableModel methods //
                 // /////////////////////////// //
                 virtual int columnCount(const QModelIndex &parent = QModelIndex{}) const override;
                 virtual int rowCount(const QModelIndex &parent = QModelIndex{}) const override;
                 virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
                 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;
             private slots:
                 /// Slot called when data of a variable has been updated
                 void onVariableUpdated() noexcept;
             };
             // Registers QVector<int> metatype so it can be used in VariableModel::dataChanged() signal
             SCIQLOP_REGISTER_META_TYPE(QVECTOR_INT_REGISTRY, QVector<int>)
             #endif // SCIQLOP_VARIABLEMODEL_H

core/include/Visualization/VisualizationController.h +5 0

             #ifndef SCIQLOP_VISUALIZATIONCONTROLLER_H
             #define SCIQLOP_VISUALIZATIONCONTROLLER_H
+            #include <Data/SqpDateTime.h>
             #include <QLoggingCategory>
             #include <QObject>
             #include <QUuid>
             #include <Common/spimpl.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationController)
             class DataSourceItem;
             class Variable;
             /**
              * @brief The VisualizationController class aims to make the link between SciQlop and its plugins.
              * This is the intermediate class that SciQlop has to use in the way to connect a data source.
              * Please first use register method to initialize a plugin specified by its metadata name (JSON
              * plugin source) then others specifics method will be able to access it. You can load a data source
              * driver plugin then create a data source.
              */
             class VisualizationController : public QObject {
                 Q_OBJECT
             public:
                 explicit VisualizationController(QObject *parent = 0);
                 virtual ~VisualizationController();
             signals:
                 /// Signal emitted when a variable is about to be deleted from SciQlop
                 void variableAboutToBeDeleted(std::shared_ptr<Variable> variable);
+                /// Signal emitted when a data acquisition is requested on a range for a variable
+                void rangeChanged(std::shared_ptr<Variable> variable, const SqpDateTime &range);
             public slots:
                 /// Manage init/end of the controller
                 void initialize();
                 void finalize();
             private:
                 void waitForFinish();
                 class VisualizationControllerPrivate;
                 spimpl::unique_impl_ptr<VisualizationControllerPrivate> impl;
             };
             #endif // SCIQLOP_VISUALIZATIONCONTROLLER_H

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

             #include "Network/NetworkController.h"
             #include <QMutex>
             #include <QNetworkAccessManager>
             #include <QNetworkReply>
             #include <QNetworkRequest>
+            #include <QReadWriteLock>
             #include <QThread>
             #include <unordered_map>
             Q_LOGGING_CATEGORY(LOG_NetworkController, "NetworkController")
             struct NetworkController::NetworkControllerPrivate {
                 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)
                     : QObject(parent), impl{spimpl::make_unique_impl<NetworkControllerPrivate>(this)}
             {
             }
             void NetworkController::onProcessRequested(const QNetworkRequest &request, QUuid identifier,
                                                        std::function<void(QNetworkReply *, QUuid)> callback)
             {
-                qCInfo(LOG_NetworkController()) << tr("NetworkController registered")
+                qCDebug(LOG_NetworkController()) << tr("NetworkController registered")
-                                                << QThread::currentThread();
+                                                 << QThread::currentThread()->objectName();
                 auto reply = impl->m_AccessManager->get(request);
                 // 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;
                 };
                 connect(reply, &QNetworkReply::finished, this, onReplyFinished);
                 connect(reply, &QNetworkReply::downloadProgress, this, onReplyProgress);
+                qCDebug(LOG_NetworkController()) << tr("NetworkController registered END")
+                                                 << QThread::currentThread()->objectName() << reply;
             }
             void NetworkController::initialize()
             {
                 qCDebug(LOG_NetworkController()) << tr("NetworkController init") << QThread::currentThread();
                 impl->m_WorkingMutex.lock();
                 impl->m_AccessManager = std::make_unique<QNetworkAccessManager>();
+                auto onReplyErrors = [this](QNetworkReply *reply, const QList<QSslError> &errors) {
+                    qCCritical(LOG_NetworkController()) << tr("NetworkAcessManager errors: ") << errors;
+                };
+                connect(impl->m_AccessManager.get(), &QNetworkAccessManager::sslErrors, this, onReplyErrors);
                 qCDebug(LOG_NetworkController()) << tr("NetworkController init END");
             }
             void NetworkController::finalize()
             {
                 impl->m_WorkingMutex.unlock();
             }
             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()
             {
                 QMutexLocker locker{&impl->m_WorkingMutex};
             }

core/src/Variable/Variable.cpp +1 -1

             #include "Variable/Variable.h"
             #include <Data/IDataSeries.h>
             #include <Data/SqpDateTime.h>
             #include <QReadWriteLock>
             #include <QThread>
             Q_LOGGING_CATEGORY(LOG_Variable, "Variable")
             struct Variable::VariablePrivate {
                 explicit VariablePrivate(const QString &name, const SqpDateTime &dateTime,
                                          const QVariantHash &metadata)
                         : m_Name{name}, m_DateTime{dateTime}, m_Metadata{metadata}, m_DataSeries{nullptr}
                 {
                 }
                 QString m_Name;
                 SqpDateTime m_DateTime; // The dateTime available in the view and loaded. not the cache.
                 QVariantHash m_Metadata;
                 std::unique_ptr<IDataSeries> m_DataSeries;
             };
             Variable::Variable(const QString &name, const SqpDateTime &dateTime, const QVariantHash &metadata)
                     : impl{spimpl::make_unique_impl<VariablePrivate>(name, dateTime, metadata)}
             {
             }
             QString Variable::name() const noexcept
             {
                 return impl->m_Name;
             }
             SqpDateTime Variable::dateTime() const noexcept
             {
                 return impl->m_DateTime;
             }
             void Variable::setDateTime(const SqpDateTime &dateTime) noexcept
             {
                 impl->m_DateTime = dateTime;
             }
             void Variable::setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept
             {
                 qCDebug(LOG_Variable()) << "Variable::setDataSeries" << QThread::currentThread()->objectName();
                 if (!dataSeries) {
                     /// @todo ALX : log
                     return;
                 }
                 // Inits the data series of the variable
                 if (!impl->m_DataSeries) {
                     impl->m_DataSeries = dataSeries->clone();
                 }
                 else {
                     dataSeries->lockWrite();
                     impl->m_DataSeries->lockWrite();
                     impl->m_DataSeries->merge(dataSeries.get());
                     impl->m_DataSeries->unlock();
                     dataSeries->unlock();
-                    emit updated();
+                    //  emit updated();
                 }
             }
             IDataSeries *Variable::dataSeries() const noexcept
             {
                 return impl->m_DataSeries.get();
             }
             QVariantHash Variable::metadata() const noexcept
             {
                 return impl->m_Metadata;
             }
             bool Variable::contains(const SqpDateTime &dateTime) const noexcept
             {
                 return impl->m_DateTime.contains(dateTime);
             }
             bool Variable::intersect(const SqpDateTime &dateTime) const noexcept
             {
                 return impl->m_DateTime.intersect(dateTime);
             }
             bool Variable::isInside(const SqpDateTime &dateTime) const noexcept
             {
                 return dateTime.contains(SqpDateTime{impl->m_DateTime.m_TStart, impl->m_DateTime.m_TEnd});
             }

core/src/Variable/VariableController.cpp +38 -6

             #include <Variable/Variable.h>
             #include <Variable/VariableCacheController.h>
             #include <Variable/VariableController.h>
             #include <Variable/VariableModel.h>
             #include <Data/DataProviderParameters.h>
             #include <Data/IDataProvider.h>
             #include <Data/IDataSeries.h>
             #include <Time/TimeController.h>
             #include <QDateTime>
             #include <QMutex>
             #include <QThread>
             #include <QUuid>
             #include <QtCore/QItemSelectionModel>
             #include <unordered_map>
             Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")
             struct VariableController::VariableControllerPrivate {
                 explicit VariableControllerPrivate(VariableController *parent)
                         : m_WorkingMutex{},
                           m_VariableModel{new VariableModel{parent}},
                           m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}},
                           m_VariableCacheController{std::make_unique<VariableCacheController>()}
                 {
                 }
                 QMutex m_WorkingMutex;
                 /// Variable model. The VariableController has the ownership
                 VariableModel *m_VariableModel;
                 QItemSelectionModel *m_VariableSelectionModel;
                 TimeController *m_TimeController{nullptr};
                 std::unique_ptr<VariableCacheController> m_VariableCacheController;
                 std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> >
                     m_VariableToProviderMap;
-                std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToIdentifier;
+                std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToIdentifierMap;
             };
             VariableController::VariableController(QObject *parent)
                     : QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>(this)}
             {
                 qCDebug(LOG_VariableController()) << tr("VariableController construction")
                                                   << QThread::currentThread();
+                connect(impl->m_VariableModel, &VariableModel::abortProgessRequested, this,
+                        &VariableController::onAbortProgressRequested);
             }
             VariableController::~VariableController()
             {
                 qCDebug(LOG_VariableController()) << tr("VariableController destruction")
                                                   << QThread::currentThread();
                 this->waitForFinish();
             }
             VariableModel *VariableController::variableModel() noexcept
             {
                 return impl->m_VariableModel;
             }
             QItemSelectionModel *VariableController::variableSelectionModel() noexcept
             {
                 return impl->m_VariableSelectionModel;
             }
             void VariableController::setTimeController(TimeController *timeController) noexcept
             {
                 impl->m_TimeController = timeController;
             }
             void VariableController::deleteVariable(std::shared_ptr<Variable> variable) noexcept
             {
                 if (!variable) {
                     qCCritical(LOG_VariableController()) << "Can't delete variable: variable is null";
                     return;
                 }
                 // Spreads in SciQlop that the variable will be deleted, so that potential receivers can
                 // make some treatments before the deletion
                 emit variableAboutToBeDeleted(variable);
+                // Deletes identifier
+                impl->m_VariableToIdentifierMap.erase(variable);
                 // Deletes provider
                 auto nbProvidersDeleted = impl->m_VariableToProviderMap.erase(variable);
                 qCDebug(LOG_VariableController())
                     << tr("Number of providers deleted for variable %1: %2")
                            .arg(variable->name(), QString::number(nbProvidersDeleted));
                 // Clears cache
                 impl->m_VariableCacheController->clear(variable);
                 // Deletes from model
                 impl->m_VariableModel->deleteVariable(variable);
             }
             void VariableController::deleteVariables(
                 const QVector<std::shared_ptr<Variable> > &variables) noexcept
             {
                 for (auto variable : qAsConst(variables)) {
                     deleteVariable(variable);
                 }
             }
+            void VariableController::abortProgress(std::shared_ptr<Variable> variable)
+            {
+            }
             void VariableController::createVariable(const QString &name, const QVariantHash &metadata,
                                                     std::shared_ptr<IDataProvider> provider) noexcept
             {
                 if (!impl->m_TimeController) {
                     qCCritical(LOG_VariableController())
                         << tr("Impossible to create variable: The time controller is null");
                     return;
                 }
                 auto dateTime = impl->m_TimeController->dateTime();
                 if (auto newVariable = impl->m_VariableModel->createVariable(name, dateTime, metadata)) {
                     auto identifier = QUuid::createUuid();
                     // store the provider
                     impl->m_VariableToProviderMap[newVariable] = provider;
-                    impl->m_VariableToIdentifier[newVariable] = identifier;
+                    impl->m_VariableToIdentifierMap[newVariable] = identifier;
                     auto addDateTimeAcquired = [ this, varW = std::weak_ptr<Variable>{newVariable} ](
                         QUuid identifier, auto dataSeriesAcquired, auto dateTimeToPutInCache)
                     {
                         if (auto variable = varW.lock()) {
-                            auto varIdentifier = impl->m_VariableToIdentifier.at(variable);
+                            auto varIdentifier = impl->m_VariableToIdentifierMap.at(variable);
                             if (varIdentifier == identifier) {
                                 impl->m_VariableCacheController->addDateTime(variable, dateTimeToPutInCache);
                                 variable->setDataSeries(dataSeriesAcquired);
+                                emit variable->updated();
                             }
                         }
                     };
                     connect(provider.get(), &IDataProvider::dataProvided, addDateTimeAcquired);
+                    connect(provider.get(), &IDataProvider::dataProvidedProgress, this,
+                            &VariableController::onVariableRetrieveDataInProgress);
                     this->onRequestDataLoading(newVariable, dateTime);
                 }
             }
             void VariableController::onDateTimeOnSelection(const SqpDateTime &dateTime)
             {
                 qCDebug(LOG_VariableController()) << "VariableController::onDateTimeOnSelection"
                                                   << QThread::currentThread()->objectName();
                 auto selectedRows = impl->m_VariableSelectionModel->selectedRows();
                 for (const auto &selectedRow : qAsConst(selectedRows)) {
                     if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) {
                         selectedVariable->setDateTime(dateTime);
                         this->onRequestDataLoading(selectedVariable, dateTime);
+                        // notify that rescale operation has to be done
+                        emit rangeChanged(selectedVariable, dateTime);
                     }
                 }
             }
             void VariableController::onVariableRetrieveDataInProgress(QUuid identifier, double progress)
             {
                 auto findReply = [identifier](const auto &entry) { return identifier == entry.second; };
-                auto end = impl->m_VariableToIdentifier.cend();
+                auto end = impl->m_VariableToIdentifierMap.cend();
-                auto it = std::find_if(impl->m_VariableToIdentifier.cbegin(), end, findReply);
+                auto it = std::find_if(impl->m_VariableToIdentifierMap.cbegin(), end, findReply);
                 if (it != end) {
                     impl->m_VariableModel->setDataProgress(it->first, progress);
                 }
             }
+            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)
             {
                 qCDebug(LOG_VariableController()) << "VariableController::onRequestDataLoading"
                                                   << QThread::currentThread()->objectName();
                 // we want to load data of the variable for the dateTime.
                 // First we check if the cache contains some of them.
                 // For the other, we ask the provider to give them.
                 if (variable) {
                     auto dateTimeListNotInCache
                         = impl->m_VariableCacheController->provideNotInCacheDateTimeList(variable, dateTime);
                     if (!dateTimeListNotInCache.empty()) {
                         // Ask the provider for each data on the dateTimeListNotInCache
-                        auto identifier = impl->m_VariableToIdentifier.at(variable);
+                        auto identifier = impl->m_VariableToIdentifierMap.at(variable);
                         impl->m_VariableToProviderMap.at(variable)->requestDataLoading(
                             identifier,
                             DataProviderParameters{std::move(dateTimeListNotInCache), variable->metadata()});
                     }
                     else {
                         emit variable->updated();
                     }
                 }
                 else {
                     qCCritical(LOG_VariableController()) << tr("Impossible to load data of a variable null");
                 }
             }
             void VariableController::initialize()
             {
                 qCDebug(LOG_VariableController()) << tr("VariableController init") << QThread::currentThread();
                 impl->m_WorkingMutex.lock();
                 qCDebug(LOG_VariableController()) << tr("VariableController init END");
             }
             void VariableController::finalize()
             {
                 impl->m_WorkingMutex.unlock();
             }
             void VariableController::waitForFinish()
             {
                 QMutexLocker locker{&impl->m_WorkingMutex};
             }

core/src/Variable/VariableModel.cpp +16 -3

             #include <Variable/Variable.h>
             #include <Variable/VariableModel.h>
             #include <Data/IDataSeries.h>
             #include <QDateTime>
             #include <QSize>
             #include <unordered_map>
             Q_LOGGING_CATEGORY(LOG_VariableModel, "VariableModel")
             namespace {
             // Column indexes
             const auto NAME_COLUMN = 0;
             const auto TSTART_COLUMN = 1;
             const auto TEND_COLUMN = 2;
             const auto NB_COLUMNS = 3;
             // Column properties
             const auto DEFAULT_HEIGHT = 25;
             const auto DEFAULT_WIDTH = 100;
             struct ColumnProperties {
                 ColumnProperties(const QString &name = {}, int width = DEFAULT_WIDTH,
                                  int height = DEFAULT_HEIGHT)
                         : m_Name{name}, m_Width{width}, m_Height{height}
                 {
                 }
                 QString m_Name;
                 int m_Width;
                 int m_Height;
             };
             const auto COLUMN_PROPERTIES
                 = QHash<int, ColumnProperties>{{NAME_COLUMN, {QObject::tr("Name")}},
                                                {TSTART_COLUMN, {QObject::tr("tStart"), 180}},
                                                {TEND_COLUMN, {QObject::tr("tEnd"), 180}}};
             /// Format for datetimes
             const auto DATETIME_FORMAT = QStringLiteral("dd/MM/yyyy \nhh:mm:ss:zzz");
             } // namespace
             struct VariableModel::VariableModelPrivate {
                 /// Variables created in SciQlop
                 std::vector<std::shared_ptr<Variable> > m_Variables;
                 std::unordered_map<std::shared_ptr<Variable>, double> m_VariableToProgress;
                 /// Return the row index of the variable. -1 if it's not found
                 int indexOfVariable(Variable *variable) const noexcept;
             };
             VariableModel::VariableModel(QObject *parent)
                     : QAbstractTableModel{parent}, impl{spimpl::make_unique_impl<VariableModelPrivate>()}
             {
             }
             std::shared_ptr<Variable> VariableModel::createVariable(const QString &name,
                                                                     const SqpDateTime &dateTime,
                                                                     const QVariantHash &metadata) noexcept
             {
                 auto insertIndex = rowCount();
                 beginInsertRows({}, insertIndex, insertIndex);
                 auto variable = std::make_shared<Variable>(name, dateTime, metadata);
                 impl->m_Variables.push_back(variable);
                 connect(variable.get(), &Variable::updated, this, &VariableModel::onVariableUpdated);
                 endInsertRows();
                 return variable;
             }
             void VariableModel::deleteVariable(std::shared_ptr<Variable> variable) noexcept
             {
                 if (!variable) {
                     qCCritical(LOG_Variable()) << "Can't delete a null variable from the model";
                     return;
                 }
                 // Finds variable in the model
                 auto begin = impl->m_Variables.cbegin();
                 auto end = impl->m_Variables.cend();
                 auto it = std::find(begin, end, variable);
                 if (it != end) {
                     auto removeIndex = std::distance(begin, it);
                     // Deletes variable
                     beginRemoveRows({}, removeIndex, removeIndex);
                     impl->m_Variables.erase(it);
                     endRemoveRows();
                 }
                 else {
                     qCritical(LOG_VariableModel())
                         << tr("Can't delete variable %1 from the model: the variable is not in the model")
                                .arg(variable->name());
                 }
+                // Removes variable from progress map
+                impl->m_VariableToProgress.erase(variable);
             }
             std::shared_ptr<Variable> VariableModel::variable(int index) const
             {
                 return (index >= 0 && index < impl->m_Variables.size()) ? impl->m_Variables[index] : nullptr;
             }
             void VariableModel::setDataProgress(std::shared_ptr<Variable> variable, double progress)
             {
+                if (progress > 0.0) {
-                impl->m_VariableToProgress[variable] = progress;
+                    impl->m_VariableToProgress[variable] = progress;
+                }
+                else {
+                    impl->m_VariableToProgress.erase(variable);
+                }
                 auto modelIndex = createIndex(impl->indexOfVariable(variable.get()), NAME_COLUMN);
                 emit dataChanged(modelIndex, modelIndex);
             }
             int VariableModel::columnCount(const QModelIndex &parent) const
             {
                 Q_UNUSED(parent);
                 return NB_COLUMNS;
             }
             int VariableModel::rowCount(const QModelIndex &parent) const
             {
                 Q_UNUSED(parent);
                 return impl->m_Variables.size();
             }
             QVariant VariableModel::data(const QModelIndex &index, int role) const
             {
                 if (!index.isValid()) {
                     return QVariant{};
                 }
                 if (index.row() < 0 || index.row() >= rowCount()) {
                     return QVariant{};
                 }
                 if (role == Qt::DisplayRole) {
                     if (auto variable = impl->m_Variables.at(index.row()).get()) {
                         /// Lambda function that builds the variant to return for a time value
                         auto dateTimeVariant = [](double time) {
                             auto dateTime = QDateTime::fromMSecsSinceEpoch(time * 1000.);
                             return dateTime.toString(DATETIME_FORMAT);
                         };
                         switch (index.column()) {
                             case NAME_COLUMN:
                                 return variable->name();
                             case TSTART_COLUMN:
                                 return dateTimeVariant(variable->dateTime().m_TStart);
                             case TEND_COLUMN:
                                 return dateTimeVariant(variable->dateTime().m_TEnd);
                             default:
                                 // No action
                                 break;
                         }
                         qWarning(LOG_VariableModel())
                             << tr("Can't get data (unknown column %1)").arg(index.column());
                     }
                     else {
                         qWarning(LOG_VariableModel()) << tr("Can't get data (no variable)");
                     }
                 }
                 else if (role == VariableRoles::ProgressRole) {
                     if (auto variable = impl->m_Variables.at(index.row())) {
                         auto it = impl->m_VariableToProgress.find(variable);
                         if (it != impl->m_VariableToProgress.cend()) {
                             return it->second;
                         }
                     }
                 }
                 return QVariant{};
             }
             QVariant VariableModel::headerData(int section, Qt::Orientation orientation, int role) const
             {
                 if (role != Qt::DisplayRole && role != Qt::SizeHintRole) {
                     return QVariant{};
                 }
                 if (orientation == Qt::Horizontal) {
                     auto propertiesIt = COLUMN_PROPERTIES.find(section);
                     if (propertiesIt != COLUMN_PROPERTIES.cend()) {
                         // Role is either DisplayRole or SizeHintRole
                         return (role == Qt::DisplayRole)
                                    ? QVariant{propertiesIt->m_Name}
                                    : QVariant{QSize{propertiesIt->m_Width, propertiesIt->m_Height}};
                     }
                     else {
                         qWarning(LOG_VariableModel())
                             << tr("Can't get header data (unknown column %1)").arg(section);
                     }
                 }
                 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
                 if (auto updatedVariable = dynamic_cast<Variable *>(sender())) {
                     auto updatedVariableIndex = impl->indexOfVariable(updatedVariable);
                     if (updatedVariableIndex > -1) {
                         emit dataChanged(createIndex(updatedVariableIndex, 0),
                                          createIndex(updatedVariableIndex, columnCount() - 1));
                     }
                 }
             }
             int VariableModel::VariableModelPrivate::indexOfVariable(Variable *variable) const noexcept
             {
                 auto begin = std::cbegin(m_Variables);
                 auto end = std::cend(m_Variables);
                 auto it
                     = std::find_if(begin, end, [variable](const auto &var) { return var.get() == variable; });
                 if (it != end) {
                     // Gets the index of the variable in the model: we assume here that views have the same
                     // order as the model
                     return std::distance(begin, it);
                 }
                 else {
                     return -1;
                 }
             }

gui/include/Visualization/VisualizationGraphWidget.h +19 -2

             #ifndef SCIQLOP_VISUALIZATIONGRAPHWIDGET_H
             #define SCIQLOP_VISUALIZATIONGRAPHWIDGET_H
             #include "Visualization/IVisualizationWidget.h"
             #include <QLoggingCategory>
             #include <QWidget>
             #include <memory>
             #include <Common/spimpl.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationGraphWidget)
             class QCPRange;
             class SqpDateTime;
             class Variable;
+            /**
+             * Possible types of zoom operation
+             */
+            enum class VisualizationGraphWidgetZoomType { ZoomOut, ZoomIn, PanRight, PanLeft, Unknown };
             namespace Ui {
             class VisualizationGraphWidget;
             } // namespace Ui
             class VisualizationGraphWidget : public QWidget, public IVisualizationWidget {
                 Q_OBJECT
             public:
                 explicit VisualizationGraphWidget(const QString &name = {}, QWidget *parent = 0);
                 virtual ~VisualizationGraphWidget();
+                void enableSynchronize(bool enable);
                 void addVariable(std::shared_ptr<Variable> variable);
                 void addVariableUsingGraph(std::shared_ptr<Variable> variable);
                 /// Removes a variable from the graph
                 void removeVariable(std::shared_ptr<Variable> variable) noexcept;
+                void setRange(std::shared_ptr<Variable> variable, const SqpDateTime &range);
+                SqpDateTime graphRange() const noexcept;
+                void setGraphRange(const SqpDateTime &range);
                 // IVisualizationWidget interface
                 void accept(IVisualizationWidgetVisitor *visitor) override;
                 bool canDrop(const Variable &variable) const override;
                 bool contains(const Variable &variable) const override;
                 QString name() const override;
-                void updateDisplay(std::shared_ptr<Variable> variable);
             signals:
                 void requestDataLoading(std::shared_ptr<Variable> variable, const SqpDateTime &dateTime);
+                void synchronize(const SqpDateTime &dateTime, const SqpDateTime &oldDateTime,
+                                 VisualizationGraphWidgetZoomType zoomType);
             private:
                 Ui::VisualizationGraphWidget *ui;
                 class VisualizationGraphWidgetPrivate;
                 spimpl::unique_impl_ptr<VisualizationGraphWidgetPrivate> impl;
             private slots:
                 /// Slot called when right clicking on the graph (displays a menu)
                 void onGraphMenuRequested(const QPoint &pos) noexcept;
-                void onRangeChanged(const QCPRange &t1);
+                /// Rescale the X axe to range parameter
+                void onRangeChanged(const QCPRange &t1, const QCPRange &t2);
                 /// Slot called when a mouse wheel was made, to perform some processing before the zoom is done
                 void onMouseWheel(QWheelEvent *event) noexcept;
+                /// Slot called when a mouse press was made, to activate the calibration of a graph
+                void onMousePress(QMouseEvent *event) noexcept;
+                /// Slot called when a mouse release was made, to deactivate the calibration of a graph
+                void onMouseRelease(QMouseEvent *event) noexcept;
                 void onDataCacheVariableUpdated();
             };
             #endif // SCIQLOP_VISUALIZATIONGRAPHWIDGET_H

gui/include/Visualization/VisualizationWidget.h +3 0

             #ifndef SCIQLOP_VISUALIZATIONWIDGET_H
             #define SCIQLOP_VISUALIZATIONWIDGET_H
             #include "Visualization/IVisualizationWidget.h"
+            #include <Data/SqpDateTime.h>
             #include <QLoggingCategory>
             #include <QWidget>
             Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationWidget)
             class QMenu;
             class Variable;
             class VisualizationTabWidget;
             namespace Ui {
             class VisualizationWidget;
             } // namespace Ui
             class VisualizationWidget : public QWidget, public IVisualizationWidget {
                 Q_OBJECT
             public:
                 explicit VisualizationWidget(QWidget *parent = 0);
                 virtual ~VisualizationWidget();
                 // IVisualizationWidget interface
                 void accept(IVisualizationWidgetVisitor *visitor) override;
                 bool canDrop(const Variable &variable) const override;
                 bool contains(const Variable &variable) const override;
                 QString name() const override;
             public slots:
                 /**
                  * Attaches to a menu the menu relative to the visualization of variables
                  * @param menu the parent menu of the generated menu
                  * @param variables the variables for which to generate the menu
                  */
                 void attachVariableMenu(QMenu *menu,
                                         const QVector<std::shared_ptr<Variable> > &variables) noexcept;
                 /// Slot called when a variable is about to be deleted from SciQlop
                 void onVariableAboutToBeDeleted(std::shared_ptr<Variable> variable) noexcept;
+                void onRangeChanged(std::shared_ptr<Variable> variable, const SqpDateTime &range) noexcept;
             private:
                 Ui::VisualizationWidget *ui;
             };
             #endif // VISUALIZATIONWIDGET_H

gui/src/SqpApplication.cpp +9 -5

             #include "SqpApplication.h"
             #include <Data/IDataProvider.h>
             #include <DataSource/DataSourceController.h>
             #include <Network/NetworkController.h>
             #include <QThread>
             #include <Time/TimeController.h>
             #include <Variable/Variable.h>
             #include <Variable/VariableController.h>
             #include <Visualization/VisualizationController.h>
             Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication")
             class SqpApplication::SqpApplicationPrivate {
             public:
                 SqpApplicationPrivate()
                         : m_DataSourceController{std::make_unique<DataSourceController>()},
                           m_NetworkController{std::make_unique<NetworkController>()},
                           m_TimeController{std::make_unique<TimeController>()},
                           m_VariableController{std::make_unique<VariableController>()},
                           m_VisualizationController{std::make_unique<VisualizationController>()}
                 {
                     // /////////////////////////////// //
                     // Connections between controllers //
                     // /////////////////////////////// //
                     // VariableController <-> DataSourceController
                     connect(m_DataSourceController.get(),
                             SIGNAL(variableCreationRequested(const QString &, const QVariantHash &,
                                                              std::shared_ptr<IDataProvider>)),
                             m_VariableController.get(),
                             SLOT(createVariable(const QString &, const QVariantHash &,
                                                 std::shared_ptr<IDataProvider>)));
                     // VariableController <-> VisualizationController
                     connect(m_VariableController.get(),
                             SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)),
                             m_VisualizationController.get(),
                             SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), Qt::DirectConnection);
+                    connect(m_VariableController.get(),
+                            SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpDateTime &)),
+                            m_VisualizationController.get(),
+                            SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpDateTime &)));
                     m_DataSourceController->moveToThread(&m_DataSourceControllerThread);
+                    m_DataSourceControllerThread.setObjectName("DataSourceControllerThread");
                     m_NetworkController->moveToThread(&m_NetworkControllerThread);
+                    m_NetworkControllerThread.setObjectName("NetworkControllerThread");
                     m_VariableController->moveToThread(&m_VariableControllerThread);
+                    m_VariableControllerThread.setObjectName("VariableControllerThread");
                     m_VisualizationController->moveToThread(&m_VisualizationControllerThread);
+                    m_VisualizationControllerThread.setObjectName("VsualizationControllerThread");
                     // Additionnal init
                     m_VariableController->setTimeController(m_TimeController.get());
                 }
                 virtual ~SqpApplicationPrivate()
                 {
                     qCInfo(LOG_SqpApplication()) << tr("SqpApplicationPrivate destruction");
                     m_DataSourceControllerThread.quit();
                     m_DataSourceControllerThread.wait();
                     m_NetworkControllerThread.quit();
                     m_NetworkControllerThread.wait();
                     m_VariableControllerThread.quit();
                     m_VariableControllerThread.wait();
                     m_VisualizationControllerThread.quit();
                     m_VisualizationControllerThread.wait();
                 }
                 std::unique_ptr<DataSourceController> m_DataSourceController;
                 std::unique_ptr<VariableController> m_VariableController;
                 std::unique_ptr<TimeController> m_TimeController;
                 std::unique_ptr<NetworkController> m_NetworkController;
                 std::unique_ptr<VisualizationController> m_VisualizationController;
                 QThread m_DataSourceControllerThread;
                 QThread m_NetworkControllerThread;
                 QThread m_VariableControllerThread;
                 QThread m_VisualizationControllerThread;
             };
             SqpApplication::SqpApplication(int &argc, char **argv)
                     : QApplication{argc, argv}, impl{spimpl::make_unique_impl<SqpApplicationPrivate>()}
             {
                 qCDebug(LOG_SqpApplication()) << tr("SqpApplication construction") << QThread::currentThread();
                 connect(&impl->m_DataSourceControllerThread, &QThread::started,
                         impl->m_DataSourceController.get(), &DataSourceController::initialize);
                 connect(&impl->m_DataSourceControllerThread, &QThread::finished,
                         impl->m_DataSourceController.get(), &DataSourceController::finalize);
                 connect(&impl->m_NetworkControllerThread, &QThread::started, impl->m_NetworkController.get(),
                         &NetworkController::initialize);
                 connect(&impl->m_NetworkControllerThread, &QThread::finished, impl->m_NetworkController.get(),
                         &NetworkController::finalize);
                 connect(&impl->m_VariableControllerThread, &QThread::started, impl->m_VariableController.get(),
                         &VariableController::initialize);
                 connect(&impl->m_VariableControllerThread, &QThread::finished, impl->m_VariableController.get(),
                         &VariableController::finalize);
                 connect(&impl->m_VisualizationControllerThread, &QThread::started,
                         impl->m_VisualizationController.get(), &VisualizationController::initialize);
                 connect(&impl->m_VisualizationControllerThread, &QThread::finished,
                         impl->m_VisualizationController.get(), &VisualizationController::finalize);
                 impl->m_DataSourceControllerThread.start();
                 impl->m_NetworkControllerThread.start();
                 impl->m_VariableControllerThread.start();
                 impl->m_VisualizationControllerThread.start();
-                // Core connections:
-                // NetworkController <-> VariableController
-                connect(&sqpApp->networkController(), &NetworkController::replyDownloadProgress,
-                        &sqpApp->variableController(), &VariableController::onVariableRetrieveDataInProgress);
             }
             SqpApplication::~SqpApplication()
             {
             }
             void SqpApplication::initialize()
             {
             }
             DataSourceController &SqpApplication::dataSourceController() noexcept
             {
                 return *impl->m_DataSourceController;
             }
             NetworkController &SqpApplication::networkController() noexcept
             {
                 return *impl->m_NetworkController;
             }
             TimeController &SqpApplication::timeController() noexcept
             {
                 return *impl->m_TimeController;
             }
             VariableController &SqpApplication::variableController() noexcept
             {
                 return *impl->m_VariableController;
             }
             VisualizationController &SqpApplication::visualizationController() noexcept
             {
                 return *impl->m_VisualizationController;
             }

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

             #include <Variable/VariableController.h>
             #include <Variable/VariableInspectorWidget.h>
             #include <Variable/VariableMenuHeaderWidget.h>
             #include <Variable/VariableModel.h>
             #include <ui_VariableInspectorWidget.h>
+            #include <QMouseEvent>
             #include <QSortFilterProxyModel>
             #include <QStyledItemDelegate>
             #include <QWidgetAction>
             #include <SqpApplication.h>
             Q_LOGGING_CATEGORY(LOG_VariableInspectorWidget, "VariableInspectorWidget")
             class QProgressBarItemDelegate : public QStyledItemDelegate {
             public:
                 QProgressBarItemDelegate(QObject *parent) : QStyledItemDelegate{parent} {}
                 void paint(QPainter *painter, const QStyleOptionViewItem &option,
                            const QModelIndex &index) const
                 {
                     auto data = index.data(Qt::DisplayRole);
                     auto progressData = index.data(VariableRoles::ProgressRole);
                     if (data.isValid() && progressData.isValid()) {
                         auto name = data.value<QString>();
                         auto progress = progressData.value<double>();
-                        if (progress >= 0) {
+                        if (progress > 0) {
+                            auto cancelButtonWidth = 20;
                             auto progressBarOption = QStyleOptionProgressBar{};
-                            progressBarOption.rect = option.rect;
+                            auto progressRect = option.rect;
+                            progressRect.setWidth(progressRect.width() - cancelButtonWidth);
+                            progressBarOption.rect = progressRect;
                             progressBarOption.minimum = 0;
                             progressBarOption.maximum = 100;
                             progressBarOption.progress = progress;
                             progressBarOption.text
                                 = QString("%1 %2").arg(name).arg(QString::number(progress, 'f', 2) + "%");
                             progressBarOption.textVisible = true;
                             progressBarOption.textAlignment = Qt::AlignCenter;
                             QApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption,
                                                                painter);
+                            // Cancel button
+                            auto buttonRect = QRect(progressRect.right(), option.rect.top(), cancelButtonWidth,
+                                                    option.rect.height());
+                            auto buttonOption = QStyleOptionButton{};
+                            buttonOption.rect = buttonRect;
+                            buttonOption.text = "X";
+                            QApplication::style()->drawControl(QStyle::CE_PushButton, &buttonOption, painter);
+                        }
+                        else {
+                            QStyledItemDelegate::paint(painter, option, index);
                         }
                     }
                     else {
                         QStyledItemDelegate::paint(painter, option, index);
                     }
                 }
+                bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option,
+                                 const QModelIndex &index)
+                {
+                    if (event->type() == QEvent::MouseButtonRelease) {
+                        auto data = index.data(Qt::DisplayRole);
+                        auto progressData = index.data(VariableRoles::ProgressRole);
+                        if (data.isValid() && progressData.isValid()) {
+                            auto cancelButtonWidth = 20;
+                            auto progressRect = option.rect;
+                            progressRect.setWidth(progressRect.width() - cancelButtonWidth);
+                            // Cancel button
+                            auto buttonRect = QRect(progressRect.right(), option.rect.top(), cancelButtonWidth,
+                                                    option.rect.height());
+                            auto e = (QMouseEvent *)event;
+                            auto clickX = e->x();
+                            auto clickY = e->y();
+                            auto x = buttonRect.left();   // the X coordinate
+                            auto y = buttonRect.top();    // the Y coordinate
+                            auto w = buttonRect.width();  // button width
+                            auto h = buttonRect.height(); // button height
+                            if (clickX > x && clickX < x + w) {
+                                if (clickY > y && clickY < y + h) {
+                                    auto variableModel = sqpApp->variableController().variableModel();
+                                    variableModel->abortProgress(index);
+                                }
+                            }
+                            else {
+                                QStyledItemDelegate::editorEvent(event, model, option, index);
+                            }
+                        }
+                        else {
+                            QStyledItemDelegate::editorEvent(event, model, option, index);
+                        }
+                    }
+                    else {
+                        QStyledItemDelegate::editorEvent(event, model, option, index);
+                    }
+                }
             };
             VariableInspectorWidget::VariableInspectorWidget(QWidget *parent)
                     : QWidget{parent},
                       ui{new Ui::VariableInspectorWidget},
                       m_ProgressBarItemDelegate{new QProgressBarItemDelegate{this}}
             {
                 ui->setupUi(this);
                 // Sets model for table
                 //    auto sortFilterModel = new QSortFilterProxyModel{this};
                 //    sortFilterModel->setSourceModel(sqpApp->variableController().variableModel());
                 auto variableModel = sqpApp->variableController().variableModel();
                 ui->tableView->setModel(variableModel);
                 // Adds extra signal/slot between view and model, so the view can be updated instantly when
                 // there is a change of data in the model
                 connect(variableModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), this,
                         SLOT(refresh()));
                 ui->tableView->setSelectionModel(sqpApp->variableController().variableSelectionModel());
                 ui->tableView->setItemDelegateForColumn(0, m_ProgressBarItemDelegate);
                 // Fixes column sizes
                 auto model = ui->tableView->model();
                 const auto count = model->columnCount();
                 for (auto i = 0; i < count; ++i) {
                     ui->tableView->setColumnWidth(
                         i, model->headerData(i, Qt::Horizontal, Qt::SizeHintRole).toSize().width());
                 }
                 // Sets selection options
                 ui->tableView->setSelectionBehavior(QTableView::SelectRows);
                 ui->tableView->setSelectionMode(QTableView::ExtendedSelection);
                 // Connection to show a menu when right clicking on the tree
                 ui->tableView->setContextMenuPolicy(Qt::CustomContextMenu);
                 connect(ui->tableView, &QTableView::customContextMenuRequested, this,
                         &VariableInspectorWidget::onTableMenuRequested);
             }
             VariableInspectorWidget::~VariableInspectorWidget()
             {
                 delete ui;
             }
             void VariableInspectorWidget::onTableMenuRequested(const QPoint &pos) noexcept
             {
                 auto selectedRows = ui->tableView->selectionModel()->selectedRows();
                 // Gets the model to retrieve the underlying selected variables
                 auto model = sqpApp->variableController().variableModel();
                 auto selectedVariables = QVector<std::shared_ptr<Variable> >{};
                 for (const auto &selectedRow : qAsConst(selectedRows)) {
                     if (auto selectedVariable = model->variable(selectedRow.row())) {
                         selectedVariables.push_back(selectedVariable);
                     }
                 }
                 QMenu tableMenu{};
                 // Emits a signal so that potential receivers can populate the menu before displaying it
                 emit tableMenuAboutToBeDisplayed(&tableMenu, selectedVariables);
                 // Adds menu-specific actions
                 if (!selectedVariables.isEmpty()) {
                     // 'Delete' action
                     auto deleteFun = [&selectedVariables]() {
                         sqpApp->variableController().deleteVariables(selectedVariables);
                     };
                     tableMenu.addSeparator();
                     tableMenu.addAction(QIcon{":/icones/delete.png"}, tr("Delete"), deleteFun);
                 }
                 if (!tableMenu.isEmpty()) {
                     // Generates menu header (inserted before first action)
                     auto firstAction = tableMenu.actions().first();
                     auto headerAction = new QWidgetAction{&tableMenu};
                     headerAction->setDefaultWidget(new VariableMenuHeaderWidget{selectedVariables, &tableMenu});
                     tableMenu.insertAction(firstAction, headerAction);
                     // Displays menu
                     tableMenu.exec(mapToGlobal(pos));
                 }
             }
             void VariableInspectorWidget::refresh() noexcept
             {
                 ui->tableView->viewport()->update();
             }

gui/src/Visualization/VisualizationGraphHelper.cpp 0 -1

             #include "Visualization/VisualizationGraphHelper.h"
             #include "Visualization/qcustomplot.h"
             #include <Data/ScalarSeries.h>
             #include <Variable/Variable.h>
             Q_LOGGING_CATEGORY(LOG_VisualizationGraphHelper, "VisualizationGraphHelper")
             namespace {
             class SqpDataContainer : public QCPGraphDataContainer {
             public:
                 void appendGraphDataUnsorted(const QCPGraphData &data) { mData.append(data); }
             };
             /// Format for datetimes on a axis
             const auto DATETIME_TICKER_FORMAT = QStringLiteral("yyyy/MM/dd \nhh:mm:ss");
             /// Generates the appropriate ticker for an axis, depending on whether the axis displays time or
             /// non-time data
             QSharedPointer<QCPAxisTicker> axisTicker(bool isTimeAxis)
             {
                 if (isTimeAxis) {
                     auto dateTicker = QSharedPointer<QCPAxisTickerDateTime>::create();
                     dateTicker->setDateTimeFormat(DATETIME_TICKER_FORMAT);
                     return dateTicker;
                 }
                 else {
                     // default ticker
                     return QSharedPointer<QCPAxisTicker>::create();
                 }
             }
             void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSeries,
                                   const SqpDateTime &dateTime)
             {
                 qCDebug(LOG_VisualizationGraphHelper()) << "TORM: updateScalarData"
                                                         << QThread::currentThread()->objectName();
                 if (auto qcpGraph = dynamic_cast<QCPGraph *>(component)) {
                     // Clean the graph
                     // NAIVE approch
                     scalarSeries.lockRead();
                     {
                         const auto xData = scalarSeries.xAxisData()->data();
                         const auto valuesData = scalarSeries.valuesData()->data();
                         const auto count = xData.count();
                         qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points in cache"
                                                                << xData.count();
                         auto dataContainer = qcpGraph->data();
                         dataContainer->clear();
                         auto sqpDataContainer = QSharedPointer<SqpDataContainer>::create();
                         qcpGraph->setData(sqpDataContainer);
                         for (auto i = 0; i < count; ++i) {
                             const auto x = xData[i];
                             if (x >= dateTime.m_TStart && x <= dateTime.m_TEnd) {
                                 sqpDataContainer->appendGraphDataUnsorted(QCPGraphData(x, valuesData[i]));
                             }
                         }
                         sqpDataContainer->sort();
                         qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points displayed"
                                                                << sqpDataContainer->size();
                     }
                     scalarSeries.unlock();
                     // Display all data
-                    component->rescaleAxes();
                     component->parentPlot()->replot();
                 }
                 else {
                     /// @todo DEBUG
                 }
             }
             QCPAbstractPlottable *createScalarSeriesComponent(ScalarSeries &scalarSeries, QCustomPlot &plot,
                                                               const SqpDateTime &dateTime)
             {
                 auto component = plot.addGraph();
                 if (component) {
                     //        // Graph data
                     component->setData(scalarSeries.xAxisData()->data(), scalarSeries.valuesData()->data(),
                                        true);
                     updateScalarData(component, scalarSeries, dateTime);
                     // Axes properties
                     /// @todo : for the moment, no control is performed on the axes: the units and the tickers
                     /// are fixed for the default x-axis and y-axis of the plot, and according to the new graph
                     auto setAxisProperties = [](auto axis, const auto &unit) {
                         // label (unit name)
                         axis->setLabel(unit.m_Name);
                         // ticker (depending on the type of unit)
                         axis->setTicker(axisTicker(unit.m_TimeUnit));
                     };
                     setAxisProperties(plot.xAxis, scalarSeries.xAxisUnit());
                     setAxisProperties(plot.yAxis, scalarSeries.valuesUnit());
                     // Display all data
                     component->rescaleAxes();
                     plot.replot();
                 }
                 else {
                     qCDebug(LOG_VisualizationGraphHelper())
                         << QObject::tr("Can't create graph for the scalar series");
                 }
                 return component;
             }
             } // namespace
             QVector<QCPAbstractPlottable *> VisualizationGraphHelper::create(std::shared_ptr<Variable> variable,
                                                                              QCustomPlot &plot) noexcept
             {
                 auto result = QVector<QCPAbstractPlottable *>{};
                 if (variable) {
                     // Gets the data series of the variable to call the creation of the right components
                     // according to its type
                     if (auto scalarSeries = dynamic_cast<ScalarSeries *>(variable->dataSeries())) {
                         result.append(createScalarSeriesComponent(*scalarSeries, plot, variable->dateTime()));
                     }
                     else {
                         qCDebug(LOG_VisualizationGraphHelper())
                             << QObject::tr("Can't create graph plottables : unmanaged data series type");
                     }
                 }
                 else {
                     qCDebug(LOG_VisualizationGraphHelper())
                         << QObject::tr("Can't create graph plottables : the variable is null");
                 }
                 return result;
             }
             void VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *> plotableVect,
                                                       IDataSeries *dataSeries, const SqpDateTime &dateTime)
             {
                 if (auto scalarSeries = dynamic_cast<ScalarSeries *>(dataSeries)) {
                     if (plotableVect.size() == 1) {
                         updateScalarData(plotableVect.at(0), *scalarSeries, dateTime);
                     }
                     else {
                         qCCritical(LOG_VisualizationGraphHelper()) << QObject::tr(
                             "Can't update Data of a scalarSeries because there is not only one component "
                             "associated");
                     }
                 }
                 else {
                     /// @todo DEBUG
                 }
             }

gui/src/Visualization/VisualizationGraphWidget.cpp +159 -43

             #include "Visualization/VisualizationGraphWidget.h"
             #include "Visualization/IVisualizationWidgetVisitor.h"
             #include "Visualization/VisualizationGraphHelper.h"
             #include "ui_VisualizationGraphWidget.h"
             #include <Data/ArrayData.h>
             #include <Data/IDataSeries.h>
             #include <SqpApplication.h>
             #include <Variable/Variable.h>
             #include <Variable/VariableController.h>
             #include <unordered_map>
             Q_LOGGING_CATEGORY(LOG_VisualizationGraphWidget, "VisualizationGraphWidget")
             namespace {
             /// Key pressed to enable zoom on horizontal axis
             const auto HORIZONTAL_ZOOM_MODIFIER = Qt::NoModifier;
             /// Key pressed to enable zoom on vertical axis
             const auto VERTICAL_ZOOM_MODIFIER = Qt::ControlModifier;
             } // namespace
             struct VisualizationGraphWidget::VisualizationGraphWidgetPrivate {
+                explicit VisualizationGraphWidgetPrivate() : m_DoSynchronize{true}, m_IsCalibration{false} {}
+                // Return the operation when range changed
+                VisualizationGraphWidgetZoomType getZoomType(const QCPRange &t1, const QCPRange &t2);
                 // 1 variable -> n qcpplot
                 std::multimap<std::shared_ptr<Variable>, QCPAbstractPlottable *> m_VariableToPlotMultiMap;
+                bool m_DoSynchronize;
+                bool m_IsCalibration;
             };
             VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget *parent)
                     : QWidget{parent},
                       ui{new Ui::VisualizationGraphWidget},
                       impl{spimpl::make_unique_impl<VisualizationGraphWidgetPrivate>()}
             {
                 ui->setupUi(this);
                 ui->graphNameLabel->setText(name);
                 // 'Close' options : widget is deleted when closed
                 setAttribute(Qt::WA_DeleteOnClose);
                 connect(ui->closeButton, &QToolButton::clicked, this, &VisualizationGraphWidget::close);
                 ui->closeButton->setIcon(sqpApp->style()->standardIcon(QStyle::SP_TitleBarCloseButton));
                 // Set qcpplot properties :
                 // - Drag (on x-axis) and zoom are enabled
                 // - Mouse wheel on qcpplot is intercepted to determine the zoom orientation
                 ui->widget->setInteractions(QCP::iRangeDrag | QCP::iRangeZoom);
                 ui->widget->axisRect()->setRangeDrag(Qt::Horizontal);
+                connect(ui->widget, &QCustomPlot::mousePress, this, &VisualizationGraphWidget::onMousePress);
+                connect(ui->widget, &QCustomPlot::mouseRelease, this,
+                        &VisualizationGraphWidget::onMouseRelease);
                 connect(ui->widget, &QCustomPlot::mouseWheel, this, &VisualizationGraphWidget::onMouseWheel);
-                connect(ui->widget->xAxis,
+                connect(ui->widget->xAxis, static_cast<void (QCPAxis::*)(const QCPRange &, const QCPRange &)>(
-                        static_cast<void (QCPAxis::*)(const QCPRange &)>(&QCPAxis::rangeChanged), this,
+                                               &QCPAxis::rangeChanged),
-                        &VisualizationGraphWidget::onRangeChanged);
+                        this, &VisualizationGraphWidget::onRangeChanged, Qt::DirectConnection);
                 // Activates menu when right clicking on the graph
                 ui->widget->setContextMenuPolicy(Qt::CustomContextMenu);
                 connect(ui->widget, &QCustomPlot::customContextMenuRequested, this,
                         &VisualizationGraphWidget::onGraphMenuRequested);
                 connect(this, &VisualizationGraphWidget::requestDataLoading, &sqpApp->variableController(),
                         &VariableController::onRequestDataLoading);
             }
             VisualizationGraphWidget::~VisualizationGraphWidget()
             {
                 delete ui;
             }
+            void VisualizationGraphWidget::enableSynchronize(bool enable)
+            {
+                impl->m_DoSynchronize = enable;
+            }
             void VisualizationGraphWidget::addVariable(std::shared_ptr<Variable> variable)
             {
                 // Uses delegate to create the qcpplot components according to the variable
                 auto createdPlottables = VisualizationGraphHelper::create(variable, *ui->widget);
                 for (auto createdPlottable : qAsConst(createdPlottables)) {
                     impl->m_VariableToPlotMultiMap.insert({variable, createdPlottable});
                 }
                 connect(variable.get(), SIGNAL(updated()), this, SLOT(onDataCacheVariableUpdated()));
             }
             void VisualizationGraphWidget::addVariableUsingGraph(std::shared_ptr<Variable> variable)
             {
                 // when adding a variable, we need to set its time range to the current graph range
                 auto grapheRange = ui->widget->xAxis->range();
                 auto dateTime = SqpDateTime{grapheRange.lower, grapheRange.upper};
                 variable->setDateTime(dateTime);
                 auto variableDateTimeWithTolerance = dateTime;
-                // add 10% tolerance for each side
+                // add 20% tolerance for each side
-                auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
+                auto tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart);
                 variableDateTimeWithTolerance.m_TStart -= tolerance;
                 variableDateTimeWithTolerance.m_TEnd += tolerance;
                 // Uses delegate to create the qcpplot components according to the variable
                 auto createdPlottables = VisualizationGraphHelper::create(variable, *ui->widget);
                 for (auto createdPlottable : qAsConst(createdPlottables)) {
                     impl->m_VariableToPlotMultiMap.insert({variable, createdPlottable});
                 }
                 connect(variable.get(), SIGNAL(updated()), this, SLOT(onDataCacheVariableUpdated()));
                 // CHangement detected, we need to ask controller to request data loading
                 emit requestDataLoading(variable, variableDateTimeWithTolerance);
             }
             void VisualizationGraphWidget::removeVariable(std::shared_ptr<Variable> variable) noexcept
             {
                 // Each component associated to the variable :
                 // - is removed from qcpplot (which deletes it)
                 // - is no longer referenced in the map
                 auto componentsIt = impl->m_VariableToPlotMultiMap.equal_range(variable);
                 for (auto it = componentsIt.first; it != componentsIt.second;) {
                     ui->widget->removePlottable(it->second);
                     it = impl->m_VariableToPlotMultiMap.erase(it);
                 }
                 // Updates graph
                 ui->widget->replot();
             }
+            void VisualizationGraphWidget::setRange(std::shared_ptr<Variable> variable,
+                                                    const SqpDateTime &range)
+            {
+                // Note: in case of different axes that depends on variable, we could start with a code like
+                // that:
+                //    auto componentsIt = impl->m_VariableToPlotMultiMap.equal_range(variable);
+                //    for (auto it = componentsIt.first; it != componentsIt.second;) {
+                //    }
+                ui->widget->xAxis->setRange(range.m_TStart, range.m_TEnd);
+                ui->widget->replot();
+            }
+            SqpDateTime VisualizationGraphWidget::graphRange() const noexcept
+            {
+                auto grapheRange = ui->widget->xAxis->range();
+                return SqpDateTime{grapheRange.lower, grapheRange.upper};
+            }
+            void VisualizationGraphWidget::setGraphRange(const SqpDateTime &range)
+            {
+                qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::setGraphRange START");
+                ui->widget->xAxis->setRange(range.m_TStart, range.m_TEnd);
+                ui->widget->replot();
+                qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::setGraphRange END");
+            }
             void VisualizationGraphWidget::accept(IVisualizationWidgetVisitor *visitor)
             {
                 if (visitor) {
                     visitor->visit(this);
                 }
                 else {
                     qCCritical(LOG_VisualizationGraphWidget())
                         << tr("Can't visit widget : the visitor is null");
                 }
             }
             bool VisualizationGraphWidget::canDrop(const Variable &variable) const
             {
                 /// @todo : for the moment, a graph can always accomodate a variable
                 Q_UNUSED(variable);
                 return true;
             }
             bool VisualizationGraphWidget::contains(const Variable &variable) const
             {
                 // Finds the variable among the keys of the map
                 auto variablePtr = &variable;
                 auto findVariable
                     = [variablePtr](const auto &entry) { return variablePtr == entry.first.get(); };
                 auto end = impl->m_VariableToPlotMultiMap.cend();
                 auto it = std::find_if(impl->m_VariableToPlotMultiMap.cbegin(), end, findVariable);
                 return it != end;
             }
             QString VisualizationGraphWidget::name() const
             {
                 return ui->graphNameLabel->text();
             }
             void VisualizationGraphWidget::onGraphMenuRequested(const QPoint &pos) noexcept
             {
                 QMenu graphMenu{};
                 // Iterates on variables (unique keys)
                 for (auto it = impl->m_VariableToPlotMultiMap.cbegin(),
                           end = impl->m_VariableToPlotMultiMap.cend();
                      it != end; it = impl->m_VariableToPlotMultiMap.upper_bound(it->first)) {
                     // 'Remove variable' action
                     graphMenu.addAction(tr("Remove variable %1").arg(it->first->name()),
                                         [ this, var = it->first ]() { removeVariable(var); });
                 }
                 if (!graphMenu.isEmpty()) {
                     graphMenu.exec(mapToGlobal(pos));
                 }
             }
-            void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1)
+            void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange &t2)
             {
-                qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged")
+                qCInfo(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged")
-                                                        << QThread::currentThread()->objectName();
+                                                       << QThread::currentThread()->objectName();
+                auto dateTimeRange = SqpDateTime{t1.lower, t1.upper};
+                auto zoomType = impl->getZoomType(t1, t2);
                 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
                      it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
                     auto variable = it->first;
-                    auto dateTime = SqpDateTime{t1.lower, t1.upper};
+                    auto currentDateTime = dateTimeRange;
-                    if (!variable->contains(dateTime)) {
+                    auto toleranceFactor = 0.2;
+                    auto tolerance = toleranceFactor * (currentDateTime.m_TEnd - currentDateTime.m_TStart);
-                        auto variableDateTimeWithTolerance = dateTime;
+                    auto variableDateTimeWithTolerance = currentDateTime;
-                        if (!variable->isInside(dateTime)) {
+                    variableDateTimeWithTolerance.m_TStart -= tolerance;
+                    variableDateTimeWithTolerance.m_TEnd += tolerance;
+                    qCDebug(LOG_VisualizationGraphWidget()) << "r" << currentDateTime;
+                    qCDebug(LOG_VisualizationGraphWidget()) << "t" << variableDateTimeWithTolerance;
+                    qCDebug(LOG_VisualizationGraphWidget()) << "v" << variable->dateTime();
+                    // If new range with tol is upper than variable datetime parameters. we need to request new
+                    // data
+                    if (!variable->contains(variableDateTimeWithTolerance)) {
+                        auto variableDateTimeWithTolerance = currentDateTime;
+                        if (!variable->isInside(currentDateTime)) {
                             auto variableDateTime = variable->dateTime();
-                            if (variableDateTime.m_TStart < dateTime.m_TStart) {
+                            if (variable->contains(variableDateTimeWithTolerance)) {
-                                qCDebug(LOG_VisualizationGraphWidget()) << tr("TDetection pan to right:");
+                                qCDebug(LOG_VisualizationGraphWidget())
+                                    << tr("TORM: Detection zoom in that need request:");
+                                // add 10% tolerance for each side
+                                tolerance
+                                    = toleranceFactor * (currentDateTime.m_TEnd - currentDateTime.m_TStart);
+                                variableDateTimeWithTolerance.m_TStart -= tolerance;
+                                variableDateTimeWithTolerance.m_TEnd += tolerance;
+                            }
+                            else if (variableDateTime.m_TStart < currentDateTime.m_TStart) {
+                                qCInfo(LOG_VisualizationGraphWidget()) << tr("TORM: Detection pan to right:");
-                                auto diffEndToKeepDelta = dateTime.m_TEnd - variableDateTime.m_TEnd;
+                                auto diffEndToKeepDelta = currentDateTime.m_TEnd - variableDateTime.m_TEnd;
-                                dateTime.m_TStart = variableDateTime.m_TStart + diffEndToKeepDelta;
+                                currentDateTime.m_TStart = variableDateTime.m_TStart + diffEndToKeepDelta;
                                 // Tolerance have to be added to the right
-                                // add 10% tolerance for right (end) side
+                                // add tolerance for right (end) side
-                                auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
+                                tolerance
+                                    = toleranceFactor * (currentDateTime.m_TEnd - currentDateTime.m_TStart);
                                 variableDateTimeWithTolerance.m_TEnd += tolerance;
                             }
-                            else if (variableDateTime.m_TEnd > dateTime.m_TEnd) {
+                            else if (variableDateTime.m_TEnd > currentDateTime.m_TEnd) {
-                                qCDebug(LOG_VisualizationGraphWidget()) << tr("Detection pan to left: ");
+                                qCDebug(LOG_VisualizationGraphWidget()) << tr("TORM: Detection pan to left: ");
-                                auto diffStartToKeepDelta = variableDateTime.m_TStart - dateTime.m_TStart;
+                                auto diffStartToKeepDelta
-                                dateTime.m_TEnd = variableDateTime.m_TEnd - diffStartToKeepDelta;
+                                    = variableDateTime.m_TStart - currentDateTime.m_TStart;
+                                currentDateTime.m_TEnd = variableDateTime.m_TEnd - diffStartToKeepDelta;
                                 // Tolerance have to be added to the left
-                                // add 10% tolerance for left (start) side
+                                // add tolerance for left (start) side
-                                auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
+                                tolerance
+                                    = toleranceFactor * (currentDateTime.m_TEnd - currentDateTime.m_TStart);
                                 variableDateTimeWithTolerance.m_TStart -= tolerance;
                             }
                             else {
-                                qCWarning(LOG_VisualizationGraphWidget())
+                                qCCritical(LOG_VisualizationGraphWidget())
                                     << tr("Detection anormal zoom detection: ");
                             }
                         }
                         else {
-                            qCDebug(LOG_VisualizationGraphWidget()) << tr("Detection zoom out: ");
+                            qCDebug(LOG_VisualizationGraphWidget()) << tr("TORM: Detection zoom out: ");
                             // add 10% tolerance for each side
-                            auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
+                            tolerance = toleranceFactor * (currentDateTime.m_TEnd - currentDateTime.m_TStart);
                             variableDateTimeWithTolerance.m_TStart -= tolerance;
                             variableDateTimeWithTolerance.m_TEnd += tolerance;
+                            zoomType = VisualizationGraphWidgetZoomType::ZoomOut;
+                        }
+                        if (!variable->contains(dateTimeRange)) {
+                            qCDebug(LOG_VisualizationGraphWidget())
+                                << "TORM: Modif on variable datetime detected" << currentDateTime;
+                            variable->setDateTime(currentDateTime);
                         }
-                        variable->setDateTime(dateTime);
+                        qCDebug(LOG_VisualizationGraphWidget()) << tr("TORM: Request data detection: ");
                         // CHangement detected, we need to ask controller to request data loading
                         emit requestDataLoading(variable, variableDateTimeWithTolerance);
                     }
                     else {
-                        qCDebug(LOG_VisualizationGraphWidget()) << tr("Detection zoom in: ");
+                        qCInfo(LOG_VisualizationGraphWidget())
+                            << tr("TORM: Detection zoom in that doesn't need request: ");
+                        zoomType = VisualizationGraphWidgetZoomType::ZoomIn;
                     }
                 }
+                if (impl->m_DoSynchronize && !impl->m_IsCalibration) {
+                    auto oldDateTime = SqpDateTime{t2.lower, t2.upper};
+                    qCDebug(LOG_VisualizationGraphWidget())
+                        << tr("TORM: VisualizationGraphWidget::Synchronize notify !!")
+                        << QThread::currentThread()->objectName();
+                    emit synchronize(dateTimeRange, oldDateTime, zoomType);
+                }
             }
             void VisualizationGraphWidget::onMouseWheel(QWheelEvent *event) noexcept
             {
                 auto zoomOrientations = QFlags<Qt::Orientation>{};
                 // Lambda that enables a zoom orientation if the key modifier related to this orientation
                 // has
                 // been pressed
                 auto enableOrientation
                     = [&zoomOrientations, event](const auto &orientation, const auto &modifier) {
                           auto orientationEnabled = event->modifiers().testFlag(modifier);
                           zoomOrientations.setFlag(orientation, orientationEnabled);
                       };
                 enableOrientation(Qt::Vertical, VERTICAL_ZOOM_MODIFIER);
                 enableOrientation(Qt::Horizontal, HORIZONTAL_ZOOM_MODIFIER);
                 ui->widget->axisRect()->setRangeZoom(zoomOrientations);
             }
+            void VisualizationGraphWidget::onMousePress(QMouseEvent *event) noexcept
+            {
+                impl->m_IsCalibration = event->modifiers().testFlag(Qt::ControlModifier);
+            }
+            void VisualizationGraphWidget::onMouseRelease(QMouseEvent *event) noexcept
+            {
+                impl->m_IsCalibration = false;
+            }
             void VisualizationGraphWidget::onDataCacheVariableUpdated()
             {
                 // NOTE:
                 //    We don't want to call the method for each component of a variable unitarily, but for
                 //    all
                 //    its components at once (eg its three components in the case of a vector).
                 //    The unordered_multimap does not do this easily, so the question is whether to:
                 //    - use an ordered_multimap and the algos of std to group the values by key
                 //    - use a map (unique keys) and store as values directly the list of components
+                auto grapheRange = ui->widget->xAxis->range();
+                auto dateTime = SqpDateTime{grapheRange.lower, grapheRange.upper};
                 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
                      it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
                     auto variable = it->first;
-                    VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *>{} << it->second,
+                    qCDebug(LOG_VisualizationGraphWidget())
-                                                         variable->dataSeries(), variable->dateTime());
+                        << "TORM: VisualizationGraphWidget::onDataCacheVariableUpdated S"
+                        << variable->dateTime();
+                    qCDebug(LOG_VisualizationGraphWidget())
+                        << "TORM: VisualizationGraphWidget::onDataCacheVariableUpdated E" << dateTime;
+                    if (dateTime.contains(variable->dateTime()) || dateTime.intersect(variable->dateTime())) {
+                        VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *>{} << it->second,
+                                                             variable->dataSeries(), variable->dateTime());
+                    }
                 }
             }
-            void VisualizationGraphWidget::updateDisplay(std::shared_ptr<Variable> variable)
+            VisualizationGraphWidgetZoomType
+            VisualizationGraphWidget::VisualizationGraphWidgetPrivate::getZoomType(const QCPRange &t1,
+                                                                                   const QCPRange &t2)
             {
-                auto abstractPlotableItPair = impl->m_VariableToPlotMultiMap.equal_range(variable);
+                // t1.lower <= t2.lower && t2.upper <= t1.upper
+                auto zoomType = VisualizationGraphWidgetZoomType::Unknown;
-                auto abstractPlotableVect = QVector<QCPAbstractPlottable *>{};
+                if (t1.lower <= t2.lower && t2.upper <= t1.upper) {
+                    zoomType = VisualizationGraphWidgetZoomType::ZoomOut;
-                for (auto it = abstractPlotableItPair.first; it != abstractPlotableItPair.second; ++it) {
-                    abstractPlotableVect.push_back(it->second);
                 }
+                else if (t1.lower > t2.lower && t1.upper > t2.upper) {
-                VisualizationGraphHelper::updateData(abstractPlotableVect, variable->dataSeries(),
+                    zoomType = VisualizationGraphWidgetZoomType::PanRight;
-                                                     variable->dateTime());
+                else if (t1.lower < t2.lower && t1.upper < t2.upper) {
+                    zoomType = VisualizationGraphWidgetZoomType::PanLeft;
+                }
+                else if (t1.lower > t2.lower && t2.upper > t1.upper) {
+                    zoomType = VisualizationGraphWidgetZoomType::ZoomIn;
+                }
+                else {
+                    qCCritical(LOG_VisualizationGraphWidget()) << "getZoomType: Unknown type detected";
+                }
+                return zoomType;
             }

gui/src/Visualization/VisualizationWidget.cpp +9 0

             #include "Visualization/VisualizationWidget.h"
             #include "Visualization/IVisualizationWidgetVisitor.h"
             #include "Visualization/VisualizationGraphWidget.h"
             #include "Visualization/VisualizationTabWidget.h"
             #include "Visualization/VisualizationZoneWidget.h"
             #include "Visualization/operations/GenerateVariableMenuOperation.h"
             #include "Visualization/operations/RemoveVariableOperation.h"
+            #include "Visualization/operations/RescaleAxeOperation.h"
             #include "Visualization/qcustomplot.h"
             #include "ui_VisualizationWidget.h"
             #include <QToolButton>
             Q_LOGGING_CATEGORY(LOG_VisualizationWidget, "VisualizationWidget")
             VisualizationWidget::VisualizationWidget(QWidget *parent)
                     : QWidget{parent}, ui{new Ui::VisualizationWidget}
             {
                 ui->setupUi(this);
                 auto addTabViewButton = new QToolButton{ui->tabWidget};
                 addTabViewButton->setText(tr("Add View"));
                 addTabViewButton->setCursor(Qt::ArrowCursor);
                 ui->tabWidget->setCornerWidget(addTabViewButton, Qt::TopRightCorner);
                 auto enableMinimumCornerWidgetSize = [this](bool enable) {
                     auto tabViewCornerWidget = ui->tabWidget->cornerWidget();
                     auto width = enable ? tabViewCornerWidget->width() : 0;
                     auto height = enable ? tabViewCornerWidget->height() : 0;
                     tabViewCornerWidget->setMinimumHeight(height);
                     tabViewCornerWidget->setMinimumWidth(width);
                     ui->tabWidget->setMinimumHeight(height);
                     ui->tabWidget->setMinimumWidth(width);
                 };
                 auto addTabView = [this, enableMinimumCornerWidgetSize]() {
                     auto widget = new VisualizationTabWidget{QString{"View %1"}.arg(ui->tabWidget->count() + 1),
                                                              ui->tabWidget};
                     auto index = ui->tabWidget->addTab(widget, widget->name());
                     if (ui->tabWidget->count() > 0) {
                         enableMinimumCornerWidgetSize(false);
                     }
                     qCInfo(LOG_VisualizationWidget()) << tr("add the tab of index %1").arg(index);
                 };
                 auto removeTabView = [this, enableMinimumCornerWidgetSize](int index) {
                     if (ui->tabWidget->count() == 1) {
                         enableMinimumCornerWidgetSize(true);
                     }
                     // Removes widget from tab and closes it
                     auto widget = ui->tabWidget->widget(index);
                     ui->tabWidget->removeTab(index);
                     if (widget) {
                         widget->close();
                     }
                     qCInfo(LOG_VisualizationWidget()) << tr("remove the tab of index %1").arg(index);
                 };
                 ui->tabWidget->setTabsClosable(true);
                 connect(addTabViewButton, &QToolButton::clicked, addTabView);
                 connect(ui->tabWidget, &QTabWidget::tabCloseRequested, removeTabView);
                 // Adds default tab
                 addTabView();
             }
             VisualizationWidget::~VisualizationWidget()
             {
                 delete ui;
             }
             void VisualizationWidget::accept(IVisualizationWidgetVisitor *visitor)
             {
                 if (visitor) {
                     visitor->visitEnter(this);
                     // Apply visitor for tab children
                     for (auto i = 0; i < ui->tabWidget->count(); ++i) {
                         // Widgets different from tabs are not visited (no action)
                         if (auto visualizationTabWidget
                             = dynamic_cast<VisualizationTabWidget *>(ui->tabWidget->widget(i))) {
                             visualizationTabWidget->accept(visitor);
                         }
                     }
                     visitor->visitLeave(this);
                 }
                 else {
                     qCCritical(LOG_VisualizationWidget()) << tr("Can't visit widget : the visitor is null");
                 }
             }
             bool VisualizationWidget::canDrop(const Variable &variable) const
             {
                 // The main widget can never accomodate a variable
                 Q_UNUSED(variable);
                 return false;
             }
             bool VisualizationWidget::contains(const Variable &variable) const
             {
                 Q_UNUSED(variable);
                 return false;
             }
             QString VisualizationWidget::name() const
             {
                 return QStringLiteral("MainView");
             }
             void VisualizationWidget::attachVariableMenu(
                 QMenu *menu, const QVector<std::shared_ptr<Variable> > &variables) noexcept
             {
                 // Menu is generated only if there is a single variable
                 if (variables.size() == 1) {
                     if (auto variable = variables.first()) {
                         // Generates the actions that make it possible to visualize the variable
                         auto generateVariableMenuOperation = GenerateVariableMenuOperation{menu, variable};
                         accept(&generateVariableMenuOperation);
                     }
                     else {
                         qCCritical(LOG_VisualizationWidget()) << tr(
                             "Can't generate the menu relative to the visualization: the variable is null");
                     }
                 }
                 else {
                     qCDebug(LOG_VisualizationWidget())
                         << tr("No generation of the menu related to the visualization: several variables are "
                               "selected");
                 }
             }
             void VisualizationWidget::onVariableAboutToBeDeleted(std::shared_ptr<Variable> variable) noexcept
             {
                 // Calls the operation of removing all references to the variable in the visualization
                 auto removeVariableOperation = RemoveVariableOperation{variable};
                 accept(&removeVariableOperation);
             }
+            void VisualizationWidget::onRangeChanged(std::shared_ptr<Variable> variable,
+                                                     const SqpDateTime &range) noexcept
+            {
+                // Calls the operation of rescaling all graph that contrains variable in the visualization
+                auto rescaleVariableOperation = RescaleAxeOperation{variable, range};
+                accept(&rescaleVariableOperation);
+            }

gui/src/Visualization/VisualizationZoneWidget.cpp +90 -1

             #include "Visualization/VisualizationZoneWidget.h"
+            #include "Data/SqpDateTime.h"
             #include "Visualization/IVisualizationWidgetVisitor.h"
+            #include "Visualization/VisualizationGraphWidget.h"
             #include "ui_VisualizationZoneWidget.h"
-            #include "Visualization/VisualizationGraphWidget.h"
             #include <SqpApplication.h>
             Q_LOGGING_CATEGORY(LOG_VisualizationZoneWidget, "VisualizationZoneWidget")
             namespace {
             /// Minimum height for graph added in zones (in pixels)
             const auto GRAPH_MINIMUM_HEIGHT = 300;
             /// Generates a default name for a new graph, according to the number of graphs already displayed in
             /// the zone
             QString defaultGraphName(const QLayout &layout)
             {
                 auto count = 0;
                 for (auto i = 0; i < layout.count(); ++i) {
                     if (dynamic_cast<VisualizationGraphWidget *>(layout.itemAt(i)->widget())) {
                         count++;
                     }
                 }
                 return QObject::tr("Graph %1").arg(count + 1);
             }
             } // namespace
             VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *parent)
                     : QWidget{parent}, ui{new Ui::VisualizationZoneWidget}
             {
                 ui->setupUi(this);
                 ui->zoneNameLabel->setText(name);
                 // 'Close' options : widget is deleted when closed
                 setAttribute(Qt::WA_DeleteOnClose);
                 connect(ui->closeButton, &QToolButton::clicked, this, &VisualizationZoneWidget::close);
                 ui->closeButton->setIcon(sqpApp->style()->standardIcon(QStyle::SP_TitleBarCloseButton));
             }
             VisualizationZoneWidget::~VisualizationZoneWidget()
             {
                 delete ui;
             }
             void VisualizationZoneWidget::addGraph(VisualizationGraphWidget *graphWidget)
             {
                 ui->visualizationZoneFrame->layout()->addWidget(graphWidget);
             }
             VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<Variable> variable)
             {
                 auto graphWidget = new VisualizationGraphWidget{
                     defaultGraphName(*ui->visualizationZoneFrame->layout()), this};
                 // Set graph properties
                 graphWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
                 graphWidget->setMinimumHeight(GRAPH_MINIMUM_HEIGHT);
                 this->addGraph(graphWidget);
                 graphWidget->addVariable(variable);
+                // Lambda to synchronize zone widget
+                auto synchronizeZoneWidget = [this, graphWidget](const SqpDateTime &dateTime,
+                                                                 const SqpDateTime &oldDateTime,
+                                                                 VisualizationGraphWidgetZoomType zoomType) {
+                    auto frameLayout = ui->visualizationZoneFrame->layout();
+                    for (auto i = 0; i < frameLayout->count(); ++i) {
+                        auto graphChild
+                            = dynamic_cast<VisualizationGraphWidget *>(frameLayout->itemAt(i)->widget());
+                        if (graphChild && (graphChild != graphWidget)) {
+                            auto graphChildRange = graphChild->graphRange();
+                            switch (zoomType) {
+                                case VisualizationGraphWidgetZoomType::ZoomIn: {
+                                    auto deltaLeft = dateTime.m_TStart - oldDateTime.m_TStart;
+                                    auto deltaRight = oldDateTime.m_TEnd - dateTime.m_TEnd;
+                                    graphChildRange.m_TStart += deltaLeft;
+                                    graphChildRange.m_TEnd -= deltaRight;
+                                    qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomIn");
+                                    qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft")
+                                                                              << deltaLeft;
+                                    qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight")
+                                                                              << deltaRight;
+                                    qCCritical(LOG_VisualizationZoneWidget())
+                                        << tr("TORM: dt") << dateTime.m_TEnd - dateTime.m_TStart;
+                                    break;
+                                }
+                                case VisualizationGraphWidgetZoomType::ZoomOut: {
+                                    qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomOut");
+                                    auto deltaLeft = oldDateTime.m_TStart - dateTime.m_TStart;
+                                    auto deltaRight = dateTime.m_TEnd - oldDateTime.m_TEnd;
+                                    qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft")
+                                                                              << deltaLeft;
+                                    qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight")
+                                                                              << deltaRight;
+                                    qCCritical(LOG_VisualizationZoneWidget())
+                                        << tr("TORM: dt") << dateTime.m_TEnd - dateTime.m_TStart;
+                                    graphChildRange.m_TStart -= deltaLeft;
+                                    graphChildRange.m_TEnd += deltaRight;
+                                    break;
+                                }
+                                case VisualizationGraphWidgetZoomType::PanRight: {
+                                    qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: PanRight");
+                                    auto deltaRight = dateTime.m_TEnd - oldDateTime.m_TEnd;
+                                    graphChildRange.m_TStart += deltaRight;
+                                    graphChildRange.m_TEnd += deltaRight;
+                                    qCCritical(LOG_VisualizationZoneWidget())
+                                        << tr("TORM: dt") << dateTime.m_TEnd - dateTime.m_TStart;
+                                    break;
+                                }
+                                case VisualizationGraphWidgetZoomType::PanLeft: {
+                                    qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: PanLeft");
+                                    auto deltaLeft = oldDateTime.m_TStart - dateTime.m_TStart;
+                                    graphChildRange.m_TStart -= deltaLeft;
+                                    graphChildRange.m_TEnd -= deltaLeft;
+                                    break;
+                                }
+                                case VisualizationGraphWidgetZoomType::Unknown: {
+                                    qCCritical(LOG_VisualizationZoneWidget())
+                                        << tr("Impossible to synchronize: zoom type unknown");
+                                    break;
+                                }
+                                default:
+                                    qCCritical(LOG_VisualizationZoneWidget())
+                                        << tr("Impossible to synchronize: zoom type not take into account");
+                                    // No action
+                                    break;
+                            }
+                            graphChild->enableSynchronize(false);
+                            qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: Range before: ")
+                                                                      << graphChild->graphRange();
+                            qCCritical(LOG_VisualizationZoneWidget()) << tr("TORM: Range after : ")
+                                                                      << graphChildRange;
+                            qCCritical(LOG_VisualizationZoneWidget())
+                                << tr("TORM: child dt") << graphChildRange.m_TEnd - graphChildRange.m_TStart;
+                            graphChild->setGraphRange(graphChildRange);
+                            graphChild->enableSynchronize(true);
+                        }
+                    }
+                };
+                // connection for synchronization
+                connect(graphWidget, &VisualizationGraphWidget::synchronize, synchronizeZoneWidget);
                 return graphWidget;
             }
             void VisualizationZoneWidget::accept(IVisualizationWidgetVisitor *visitor)
             {
                 if (visitor) {
                     visitor->visitEnter(this);
                     // Apply visitor to graph children
                     auto layout = ui->visualizationZoneFrame->layout();
                     for (auto i = 0; i < layout->count(); ++i) {
                         if (auto item = layout->itemAt(i)) {
                             // Widgets different from graphs are not visited (no action)
                             if (auto visualizationGraphWidget
                                 = dynamic_cast<VisualizationGraphWidget *>(item->widget())) {
                                 visualizationGraphWidget->accept(visitor);
                             }
                         }
                     }
                     visitor->visitLeave(this);
                 }
                 else {
                     qCCritical(LOG_VisualizationZoneWidget()) << tr("Can't visit widget : the visitor is null");
                 }
             }
             bool VisualizationZoneWidget::canDrop(const Variable &variable) const
             {
                 // A tab can always accomodate a variable
                 Q_UNUSED(variable);
                 return true;
             }
             bool VisualizationZoneWidget::contains(const Variable &variable) const
             {
                 Q_UNUSED(variable);
                 return false;
             }
             QString VisualizationZoneWidget::name() const
             {
                 return ui->zoneNameLabel->text();
             }

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

             #ifndef SCIQLOP_AMDAPROVIDER_H
             #define SCIQLOP_AMDAPROVIDER_H
             #include "AmdaGlobal.h"
             #include <Data/IDataProvider.h>
             #include <QLoggingCategory>
             Q_DECLARE_LOGGING_CATEGORY(LOG_AmdaProvider)
             class QNetworkReply;
             /**
              * @brief The AmdaProvider class is an example of how a data provider can generate data
              */
             class SCIQLOP_AMDA_EXPORT AmdaProvider : public IDataProvider {
             public:
                 explicit AmdaProvider();
                 void requestDataLoading(QUuid token, const DataProviderParameters &parameters) override;
+                void requestDataAborting(QUuid identifier) override;
             private:
                 void retrieveData(QUuid token, const SqpDateTime &dateTime, const QVariantHash &data);
             };
             #endif // SCIQLOP_AMDAPROVIDER_H

plugins/amda/src/AmdaProvider.cpp +49 -30

             #include "AmdaProvider.h"
             #include "AmdaDefs.h"
             #include "AmdaResultParser.h"
             #include <Data/DataProviderParameters.h>
             #include <Network/NetworkController.h>
             #include <SqpApplication.h>
             #include <Variable/Variable.h>
             #include <QNetworkAccessManager>
             #include <QNetworkReply>
             #include <QTemporaryFile>
             #include <QThread>
             Q_LOGGING_CATEGORY(LOG_AmdaProvider, "AmdaProvider")
             namespace {
             /// URL format for a request on AMDA server. The parameters are as follows:
             /// - %1: start date
             /// - %2: end date
             /// - %3: parameter id
             const auto AMDA_URL_FORMAT = QStringLiteral(
                 "http://amda.irap.omp.eu/php/rest/"
                 "getParameter.php?startTime=%1&stopTime=%2&parameterID=%3&sampling=60&outputFormat=ASCII&"
                 "timeFormat=ISO8601&gzip=0");
             /// Dates format passed in the URL (e.g 2013-09-23T09:00)
-            const auto AMDA_TIME_FORMAT = QStringLiteral("yyyy-MM-ddThh:ss");
+            const auto AMDA_TIME_FORMAT = QStringLiteral("yyyy-MM-ddThh:mm:ss");
             /// Formats a time to a date that can be passed in URL
             QString dateFormat(double sqpDateTime) noexcept
             {
                 auto dateTime = QDateTime::fromMSecsSinceEpoch(sqpDateTime * 1000.);
                 return dateTime.toString(AMDA_TIME_FORMAT);
             }
             } // namespace
             AmdaProvider::AmdaProvider()
             {
                 qCDebug(LOG_NetworkController()) << tr("AmdaProvider::AmdaProvider")
                                                  << QThread::currentThread();
                 if (auto app = sqpApp) {
                     auto &networkController = app->networkController();
                     connect(this, SIGNAL(requestConstructed(QNetworkRequest, QUuid,
                                                             std::function<void(QNetworkReply *, QUuid)>)),
                             &networkController,
                             SLOT(onProcessRequested(QNetworkRequest, QUuid,
                                                     std::function<void(QNetworkReply *, QUuid)>)));
+                    connect(&sqpApp->networkController(), SIGNAL(replyDownloadProgress(QUuid, double)), this,
+                            SIGNAL(dataProvidedProgress(QUuid, double)));
                 }
             }
             void AmdaProvider::requestDataLoading(QUuid token, const DataProviderParameters &parameters)
             {
                 // NOTE: Try to use multithread if possible
                 const auto times = parameters.m_Times;
                 const auto data = parameters.m_Data;
                 for (const auto &dateTime : qAsConst(times)) {
                     retrieveData(token, dateTime, data);
                 }
             }
+            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
                 auto productId = data.value(AMDA_XML_ID_KEY).toString();
                 if (productId.isNull()) {
                     qCCritical(LOG_AmdaProvider()) << tr("Can't retrieve data: unknown product id");
                     return;
                 }
+                qCInfo(LOG_AmdaProvider()) << tr("AmdaProvider::retrieveData") << dateTime;
                 // /////////// //
                 // Creates URL //
                 // /////////// //
                 auto startDate = dateFormat(dateTime.m_TStart);
                 auto endDate = dateFormat(dateTime.m_TEnd);
                 auto url = QUrl{QString{AMDA_URL_FORMAT}.arg(startDate, endDate, productId)};
+                qCInfo(LOG_AmdaProvider()) << tr("AmdaProvider::retrieveData url:") << url;
                 auto tempFile = std::make_shared<QTemporaryFile>();
                 // LAMBDA
                 auto httpDownloadFinished
                     = [this, dateTime, tempFile, token](QNetworkReply *reply, QUuid dataId) noexcept {
                           Q_UNUSED(dataId);
-                          if (tempFile) {
+                          // Don't do anything if the reply was abort
-                              auto replyReadAll = reply->readAll();
+                          if (reply->error() != QNetworkReply::OperationCanceledError) {
-                              if (!replyReadAll.isEmpty()) {
-                                  tempFile->write(replyReadAll);
+                              if (tempFile) {
+                                  auto replyReadAll = reply->readAll();
-                              tempFile->close();
+                                  if (!replyReadAll.isEmpty()) {
+                                      tempFile->write(replyReadAll);
-                              // Parse results file
-                              if (auto dataSeries = AmdaResultParser::readTxt(tempFile->fileName())) {
+                                  tempFile->close();
-                                  emit dataProvided(token, dataSeries, dateTime);
+                                  // Parse results file
-                              else {
+                                  if (auto dataSeries = AmdaResultParser::readTxt(tempFile->fileName())) {
-                                  /// @todo ALX : debug
+                                      emit dataProvided(token, dataSeries, dateTime);
+                                  }
+                                  else {
+                                      /// @todo ALX : debug
+                                  }
                               }
                           }
-                          // Deletes reply
-                          reply->deleteLater();
-                          reply = nullptr;
                       };
-                auto httpFinishedLambda = [this, httpDownloadFinished, tempFile](QNetworkReply *reply,
+                auto httpFinishedLambda
-                                                                                 QUuid dataId) noexcept {
+                    = [this, httpDownloadFinished, tempFile](QNetworkReply *reply, QUuid dataId) noexcept {
-                    auto downloadFileUrl = QUrl{QString{reply->readAll()}};
+                          // Don't do anything if the reply was abort
-                    // Deletes old reply
+                          if (reply->error() != QNetworkReply::OperationCanceledError) {
-                    reply->deleteLater();
+                              auto downloadFileUrl = QUrl{QString{reply->readAll()}};
-                    // Executes request for downloading file //
-                    // Creates destination file
+                              qCInfo(LOG_AmdaProvider()) << tr("AmdaProvider::retrieveData downloadFileUrl:")
-                    if (tempFile->open()) {
+                                                         << downloadFileUrl;
-                        // Executes request
+                              // Executes request for downloading file //
-                        emit requestConstructed(QNetworkRequest{downloadFileUrl}, dataId, httpDownloadFinished);
+                              // Creates destination file
-                };
+                              if (tempFile->open()) {
+                                  // Executes request
+                                  emit requestConstructed(QNetworkRequest{downloadFileUrl}, dataId,
+                                                          httpDownloadFinished);
+                              }
+                          }
+                      };
                 // //////////////// //
                 // Executes request //
                 // //////////////// //
                 emit requestConstructed(QNetworkRequest{url}, token, httpFinishedLambda);
             }

plugins/amda/src/AmdaResultParser.cpp +13 -2

             #include "AmdaResultParser.h"
             #include <Data/ScalarSeries.h>
             #include <QDateTime>
             #include <QFile>
             #include <QRegularExpression>
             #include <cmath>
             Q_LOGGING_CATEGORY(LOG_AmdaResultParser, "AmdaResultParser")
             namespace {
+            /// Message in result file when the file was not found on server
+            const auto FILE_NOT_FOUND_MESSAGE = QStringLiteral("Not Found");
             /// Format for dates in result files
             const auto DATE_FORMAT = QStringLiteral("yyyy-MM-ddThh:mm:ss.zzz");
             /// Separator between values in a result line
             const auto RESULT_LINE_SEPARATOR = QRegularExpression{QStringLiteral("\\s+")};
             /// Regex to find unit in a line. Examples of valid lines:
             /// ... - Units : nT - ...
             /// ... -Units:nT- ...
             /// ... -Units:   m²- ...
             /// ... - Units : m/s - ...
             const auto UNIT_REGEX = QRegularExpression{QStringLiteral("-\\s*Units\\s*:\\s*(.+?)\\s*-")};
             /// Converts a string date to a double date
             /// @return a double that represents the date in seconds, NaN if the string date can't be converted
             double doubleDate(const QString &stringDate) noexcept
             {
                 auto dateTime = QDateTime::fromString(stringDate, DATE_FORMAT);
                 return dateTime.isValid() ? (dateTime.toMSecsSinceEpoch() / 1000.)
                                           : std::numeric_limits<double>::quiet_NaN();
             }
             /**
              * Reads stream to retrieve x-axis unit
              * @param stream the stream to read
              * @return the unit that has been read in the stream, a default unit (time unit with no label) if an
              * error occured during reading
              */
             Unit readXAxisUnit(QTextStream &stream)
             {
                 QString line{};
                 if (stream.readLineInto(&line)) {
                     auto match = UNIT_REGEX.match(line);
                     if (match.hasMatch()) {
                         return Unit{match.captured(1), true};
                     }
                     else {
                         qCWarning(LOG_AmdaResultParser())
                             << QObject::tr("Can't read unit: invalid line %1").arg(line);
                     }
                 }
                 else {
                     qCWarning(LOG_AmdaResultParser()) << QObject::tr("Can't read unit: end of file");
                 }
                 // Error cases
                 return Unit{{}, true};
             }
             /**
              * Reads stream to retrieve results
              * @param stream the stream to read
              * @return the pair of vectors x-axis data/values data that has been read in the stream
              */
             QPair<QVector<double>, QVector<double> > readResults(QTextStream &stream)
             {
                 auto xData = QVector<double>{};
                 auto valuesData = QVector<double>{};
                 QString line{};
                 while (stream.readLineInto(&line)) {
                     auto lineData = line.split(RESULT_LINE_SEPARATOR, QString::SkipEmptyParts);
                     if (lineData.size() == 2) {
                         // X : the data is converted from date to double (in secs)
                         auto x = doubleDate(lineData.at(0));
                         // Value
                         bool valueOk;
                         auto value = lineData.at(1).toDouble(&valueOk);
                         // Adds result only if x and value are valid
                         if (!std::isnan(x) && !std::isnan(value) && valueOk) {
                             xData.push_back(x);
                             valuesData.push_back(value);
                         }
                         else {
                             qCWarning(LOG_AmdaResultParser())
                                 << QObject::tr(
                                        "Can't retrieve results from line %1: x and/or value are invalid")
                                        .arg(line);
                         }
                     }
                     else {
                         qCWarning(LOG_AmdaResultParser())
                             << QObject::tr("Can't retrieve results from line %1: invalid line").arg(line);
                     }
                 }
                 return qMakePair(std::move(xData), std::move(valuesData));
             }
             } // namespace
             std::shared_ptr<IDataSeries> AmdaResultParser::readTxt(const QString &filePath) noexcept
             {
                 QFile file{filePath};
                 if (!file.open(QFile::ReadOnly | QIODevice::Text)) {
                     qCCritical(LOG_AmdaResultParser())
                         << QObject::tr("Can't retrieve AMDA data from file %1: %2")
                                .arg(filePath, file.errorString());
                     return nullptr;
                 }
                 QTextStream stream{&file};
-                // Ignore first two lines (comments lines)
+                // Checks if the file was found on the server
-                stream.readLine();
+                auto firstLine = stream.readLine();
+                if (firstLine.compare(FILE_NOT_FOUND_MESSAGE) == 0) {
+                    qCCritical(LOG_AmdaResultParser())
+                        << QObject::tr("Can't retrieve AMDA data from file %1: file was not found on server")
+                               .arg(filePath);
+                    return nullptr;
+                }
+                // Ignore comments lines
                 stream.readLine();
                 // Reads x-axis unit
                 auto xAxisUnit = readXAxisUnit(stream);
                 // Reads results
                 auto results = readResults(stream);
                 return std::make_shared<ScalarSeries>(std::move(results.first), std::move(results.second),
                                                       xAxisUnit, Unit{});
             }

plugins/amda/tests/TestAmdaResultParser.cpp +4 -1

             #include "AmdaResultParser.h"
             #include <Data/ScalarSeries.h>
             #include <QObject>
             #include <QtTest>
             namespace {
             /// Path for the tests
             const auto TESTS_RESOURCES_PATH
                 = QFileInfo{QString{AMDA_TESTS_RESOURCES_DIR}, "TestAmdaResultParser"}.absoluteFilePath();
             QString inputFilePath(const QString &inputFileName)
             {
                 return QFileInfo{TESTS_RESOURCES_PATH, inputFileName}.absoluteFilePath();
             }
             struct ExpectedResults {
                 explicit ExpectedResults() = default;
                 /// Ctor with QVector<QDateTime> as x-axis data. Datetimes are converted to doubles
                 explicit ExpectedResults(Unit xAxisUnit, Unit valuesUnit, const QVector<QDateTime> &xAxisData,
                                          QVector<double> valuesData)
                         : m_ParsingOK{true},
                           m_XAxisUnit{xAxisUnit},
                           m_ValuesUnit{valuesUnit},
                           m_XAxisData{},
                           m_ValuesData{std::move(valuesData)}
                 {
                     // Converts QVector<QDateTime> to QVector<double>
                     std::transform(xAxisData.cbegin(), xAxisData.cend(), std::back_inserter(m_XAxisData),
                                    [](const auto &dateTime) { return dateTime.toMSecsSinceEpoch() / 1000.; });
                 }
                 /**
                  * Validates a DataSeries compared to the expected results
                  * @param results the DataSeries to validate
                  */
                 void validate(std::shared_ptr<IDataSeries> results)
                 {
                     if (m_ParsingOK) {
                         auto scalarSeries = dynamic_cast<ScalarSeries *>(results.get());
                         QVERIFY(scalarSeries != nullptr);
                         // Checks units
                         QVERIFY(scalarSeries->xAxisUnit() == m_XAxisUnit);
                         QVERIFY(scalarSeries->valuesUnit() == m_ValuesUnit);
                         // Checks values
                         QVERIFY(scalarSeries->xAxisData()->data() == m_XAxisData);
                         QVERIFY(scalarSeries->valuesData()->data() == m_ValuesData);
                     }
                     else {
                         QVERIFY(results == nullptr);
                     }
                 }
                 // Parsing was successfully completed
                 bool m_ParsingOK{false};
                 // Expected x-axis unit
                 Unit m_XAxisUnit{};
                 // Expected values unit
                 Unit m_ValuesUnit{};
                 // Expected x-axis data
                 QVector<double> m_XAxisData{};
                 // Expected values data
                 QVector<double> m_ValuesData{};
             };
             } // namespace
             Q_DECLARE_METATYPE(ExpectedResults)
             class TestAmdaResultParser : public QObject {
                 Q_OBJECT
             private slots:
                 /// Input test data
                 /// @sa testTxtJson()
                 void testReadTxt_data();
                 /// Tests parsing of a TXT file
                 void testReadTxt();
             };
             void TestAmdaResultParser::testReadTxt_data()
             {
                 // ////////////// //
                 // Test structure //
                 // ////////////// //
                 // Name of TXT file to read
                 QTest::addColumn<QString>("inputFileName");
                 // Expected results
                 QTest::addColumn<ExpectedResults>("expectedResults");
                 // ////////// //
                 // Test cases //
                 // ////////// //
                 auto dateTime = [](int year, int month, int day, int hours, int minutes, int seconds) {
                     return QDateTime{{year, month, day}, {hours, minutes, seconds}};
                 };
                 // Valid file
                 QTest::newRow("Valid file")
                     << QStringLiteral("ValidScalar1.txt")
                     << ExpectedResults{
                            Unit{QStringLiteral("nT"), true}, Unit{},
                            QVector<QDateTime>{dateTime(2013, 9, 23, 9, 0, 30), dateTime(2013, 9, 23, 9, 1, 30),
                                               dateTime(2013, 9, 23, 9, 2, 30), dateTime(2013, 9, 23, 9, 3, 30),
                                               dateTime(2013, 9, 23, 9, 4, 30), dateTime(2013, 9, 23, 9, 5, 30),
                                               dateTime(2013, 9, 23, 9, 6, 30), dateTime(2013, 9, 23, 9, 7, 30),
                                               dateTime(2013, 9, 23, 9, 8, 30), dateTime(2013, 9, 23, 9, 9, 30)},
                            QVector<double>{-2.83950, -2.71850, -2.52150, -2.57633, -2.58050, -2.48325, -2.63025,
                                            -2.55800, -2.43250, -2.42200}};
                 // Valid files but with some invalid lines (wrong unit, wrong values, etc.)
                 QTest::newRow("No unit file") << QStringLiteral("NoUnit.txt")
                                               << ExpectedResults{Unit{QStringLiteral(""), true}, Unit{},
                                                                  QVector<QDateTime>{}, QVector<double>{}};
                 QTest::newRow("Wrong unit file")
                     << QStringLiteral("WrongUnit.txt")
                     << ExpectedResults{Unit{QStringLiteral(""), true}, Unit{},
                                        QVector<QDateTime>{dateTime(2013, 9, 23, 9, 0, 30),
                                                           dateTime(2013, 9, 23, 9, 1, 30),
                                                           dateTime(2013, 9, 23, 9, 2, 30)},
                                        QVector<double>{-2.83950, -2.71850, -2.52150}};
                 QTest::newRow("Wrong results file (date of first line is invalid")
                     << QStringLiteral("WrongDate.txt")
                     << ExpectedResults{
                            Unit{QStringLiteral("nT"), true}, Unit{},
                            QVector<QDateTime>{dateTime(2013, 9, 23, 9, 1, 30), dateTime(2013, 9, 23, 9, 2, 30)},
                            QVector<double>{-2.71850, -2.52150}};
                 QTest::newRow("Wrong results file (too many values for first line")
                     << QStringLiteral("TooManyValues.txt")
                     << ExpectedResults{
                            Unit{QStringLiteral("nT"), true}, Unit{},
                            QVector<QDateTime>{dateTime(2013, 9, 23, 9, 1, 30), dateTime(2013, 9, 23, 9, 2, 30)},
                            QVector<double>{-2.71850, -2.52150}};
                 QTest::newRow("Wrong results file (value of first line is invalid")
                     << QStringLiteral("WrongValue.txt")
                     << ExpectedResults{
                            Unit{QStringLiteral("nT"), true}, Unit{},
                            QVector<QDateTime>{dateTime(2013, 9, 23, 9, 1, 30), dateTime(2013, 9, 23, 9, 2, 30)},
                            QVector<double>{-2.71850, -2.52150}};
                 QTest::newRow("Wrong results file (value of first line is NaN")
                     << QStringLiteral("NaNValue.txt")
                     << ExpectedResults{
                            Unit{QStringLiteral("nT"), true}, Unit{},
                            QVector<QDateTime>{dateTime(2013, 9, 23, 9, 1, 30), dateTime(2013, 9, 23, 9, 2, 30)},
                            QVector<double>{-2.71850, -2.52150}};
-                // Invalid file
+                // Invalid files
                 QTest::newRow("Invalid file (unexisting file)") << QStringLiteral("UnexistingFile.txt")
                                                                 << ExpectedResults{};
+                QTest::newRow("Invalid file (file not found on server)") << QStringLiteral("FileNotFound.txt")
+                                                                         << ExpectedResults{};
             }
             void TestAmdaResultParser::testReadTxt()
             {
                 QFETCH(QString, inputFileName);
                 QFETCH(ExpectedResults, expectedResults);
                 // Parses file
                 auto filePath = inputFilePath(inputFileName);
                 auto results = AmdaResultParser::readTxt(filePath);
                 // ///////////////// //
                 // Validates results //
                 // ///////////////// //
                 expectedResults.validate(results);
             }
             QTEST_MAIN(TestAmdaResultParser)
             #include "TestAmdaResultParser.moc"

plugins/mockplugin/include/CosinusProvider.h +10 -2

             #ifndef SCIQLOP_COSINUSPROVIDER_H
             #define SCIQLOP_COSINUSPROVIDER_H
             #include "MockPluginGlobal.h"
             #include <Data/IDataProvider.h>
             #include <QLoggingCategory>
+            #include <QUuid>
+            #include <QHash>
             Q_DECLARE_LOGGING_CATEGORY(LOG_CosinusProvider)
             /**
              * @brief The CosinusProvider class is an example of how a data provider can generate data
              */
             class SCIQLOP_MOCKPLUGIN_EXPORT CosinusProvider : public IDataProvider {
             public:
+                /// @sa IDataProvider::requestDataLoading(). The current impl isn't thread safe.
                 void requestDataLoading(QUuid token, const DataProviderParameters &parameters) override;
+                /// @sa IDataProvider::requestDataAborting(). The current impl isn't thread safe.
+                void requestDataAborting(QUuid identifier) override;
             private:
-                /// @sa IDataProvider::retrieveData()
+                std::shared_ptr<IDataSeries> retrieveData(QUuid token, const SqpDateTime &dateTime);
-                std::shared_ptr<IDataSeries> retrieveData(const SqpDateTime &dateTime) const;
+                QHash<QUuid, bool> m_VariableToEnableProvider;
             };
             #endif // SCIQLOP_COSINUSPROVIDER_H

plugins/mockplugin/src/CosinusProvider.cpp +52 -5

             #include "CosinusProvider.h"
             #include <Data/DataProviderParameters.h>
             #include <Data/ScalarSeries.h>
             #include <cmath>
             #include <QDateTime>
+            #include <QFuture>
             #include <QThread>
+            #include <QtConcurrent/QtConcurrent>
             Q_LOGGING_CATEGORY(LOG_CosinusProvider, "CosinusProvider")
-            std::shared_ptr<IDataSeries> CosinusProvider::retrieveData(const SqpDateTime &dateTime) const
+            std::shared_ptr<IDataSeries> CosinusProvider::retrieveData(QUuid token, const SqpDateTime &dateTime)
             {
+                // TODO: Add Mutex
                 auto dataIndex = 0;
                 // Gets the timerange from the parameters
                 double freq = 100.0;
                 double start = dateTime.m_TStart * freq; // 100 htz
                 double end = dateTime.m_TEnd * freq;     // 100 htz
                 // We assure that timerange is valid
                 if (end < start) {
                     std::swap(start, end);
                 }
                 // Generates scalar series containing cosinus values (one value per second)
                 auto scalarSeries
                     = std::make_shared<ScalarSeries>(end - start, Unit{QStringLiteral("t"), true}, Unit{});
+                int progress = 0;
+                auto progressEnd = end - start;
                 for (auto time = start; time < end; ++time, ++dataIndex) {
-                    const auto timeOnFreq = time / freq;
+                    auto it = m_VariableToEnableProvider.find(token);
-                    scalarSeries->setData(dataIndex, timeOnFreq, std::cos(timeOnFreq));
+                    if (it != m_VariableToEnableProvider.end() && it.value()) {
+                        const auto timeOnFreq = time / freq;
+                        scalarSeries->setData(dataIndex, timeOnFreq, std::cos(timeOnFreq));
+                        // progression
+                        int currentProgress = (time - start) * 100.0 / progressEnd;
+                        if (currentProgress != progress) {
+                            progress = currentProgress;
+                            emit dataProvidedProgress(token, progress);
+                        }
+                    }
+                    else {
+                        if (!it.value()) {
+                            qCDebug(LOG_CosinusProvider())
+                                << "CosinusProvider::retrieveData: ARRET De l'acquisition detecté"
+                                << end - time;
+                        }
+                    }
                 }
+                emit dataProvidedProgress(token, 0.0);
                 return scalarSeries;
             }
             void CosinusProvider::requestDataLoading(QUuid token, const DataProviderParameters &parameters)
             {
+                // TODO: Add Mutex
+                m_VariableToEnableProvider[token] = true;
                 qCDebug(LOG_CosinusProvider()) << "CosinusProvider::requestDataLoading"
                                                << QThread::currentThread()->objectName();
                 // NOTE: Try to use multithread if possible
                 const auto times = parameters.m_Times;
                 for (const auto &dateTime : qAsConst(times)) {
-                    auto scalarSeries = this->retrieveData(dateTime);
+                    if (m_VariableToEnableProvider[token]) {
-                    emit dataProvided(token, scalarSeries, dateTime);
+                        auto scalarSeries = this->retrieveData(token, dateTime);
+                        emit dataProvided(token, scalarSeries, dateTime);
+                    }
+                }
+            }
+            void CosinusProvider::requestDataAborting(QUuid identifier)
+            {
+                // TODO: Add Mutex
+                qCDebug(LOG_CosinusProvider()) << "CosinusProvider::requestDataAborting" << identifier
+                                               << QThread::currentThread()->objectName();
+                auto it = m_VariableToEnableProvider.find(identifier);
+                if (it != m_VariableToEnableProvider.end()) {
+                    it.value() = false;
+                }
+                else {
+                    qCWarning(LOG_CosinusProvider())
+                        << tr("Aborting progression of inexistant identifier detected !!!");
                 }
             }

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