From 9eb803f3f9ab41582e4b9b83a4b71affe7d7a430 2017-07-28 08:53:33
From: perrinel <mperrinel@itlink.fr>
Date: 2017-07-28 08:53:33
Subject: [PATCH] Merge pull request #193 from SCIQLOP-Initialisation develop

 Develop

---

diff --git a/app/src/Main.cpp b/app/src/Main.cpp
index 9c2f426..9cde88d 100644
--- a/app/src/Main.cpp
+++ b/app/src/Main.cpp
@@ -28,6 +28,10 @@
 #include <Plugin/PluginManager.h>
 #include <QDir>
 
+#include <QLoggingCategory>
+
+Q_LOGGING_CATEGORY(LOG_Main, "Main")
+
 namespace {
 
 /// Name of the directory containing the plugins
@@ -66,8 +70,7 @@ int main(int argc, char *argv[])
     }
 #endif
 #endif
-    qCDebug(LOG_PluginManager())
-        << QObject::tr("Plugin directory: %1").arg(pluginDir.absolutePath());
+    qCDebug(LOG_Main()) << QObject::tr("Plugin directory: %1").arg(pluginDir.absolutePath());
 
     PluginManager pluginManager{};
     pluginManager.loadPlugins(pluginDir);
diff --git a/app/src/MainWindow.cpp b/app/src/MainWindow.cpp
index 9b306a3..b38845e 100644
--- a/app/src/MainWindow.cpp
+++ b/app/src/MainWindow.cpp
@@ -24,6 +24,8 @@
 
 #include <DataSource/DataSourceController.h>
 #include <DataSource/DataSourceWidget.h>
+#include <Settings/SqpSettingsDialog.h>
+#include <Settings/SqpSettingsGeneralWidget.h>
 #include <SidePane/SqpSidePane.h>
 #include <SqpApplication.h>
 #include <Time/TimeController.h>
@@ -41,18 +43,6 @@
 #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")
@@ -67,14 +57,26 @@ const auto RIGHTMAININSPECTORWIDGETSPLITTERINDEX = 4;
 
 class MainWindow::MainWindowPrivate {
 public:
+    explicit MainWindowPrivate(MainWindow *mainWindow)
+            : m_LastOpenLeftInspectorSize{},
+              m_LastOpenRightInspectorSize{},
+              m_GeneralSettingsWidget{new SqpSettingsGeneralWidget{mainWindow}},
+              m_SettingsDialog{new SqpSettingsDialog{mainWindow}}
+    {
+    }
+
     QSize m_LastOpenLeftInspectorSize;
     QSize m_LastOpenRightInspectorSize;
+    /// General settings widget. MainWindow has the ownership
+    SqpSettingsGeneralWidget *m_GeneralSettingsWidget;
+    /// Settings dialog. MainWindow has the ownership
+    SqpSettingsDialog *m_SettingsDialog;
 };
 
 MainWindow::MainWindow(QWidget *parent)
         : QMainWindow{parent},
           m_Ui{new Ui::MainWindow},
-          impl{spimpl::make_unique_impl<MainWindowPrivate>()}
+          impl{spimpl::make_unique_impl<MainWindowPrivate>(this)}
 {
     m_Ui->setupUi(this);
 
@@ -167,12 +169,39 @@ MainWindow::MainWindow(QWidget *parent)
                 openInspector(checked, true, openRightInspectorAction);
             });
 
+    // //// //
+    // Menu //
+    // //// //
     this->menuBar()->addAction(tr("File"));
+    auto toolsMenu = this->menuBar()->addMenu(tr("Tools"));
+    toolsMenu->addAction(tr("Settings..."), [this]() {
+        // Loads settings
+        impl->m_SettingsDialog->loadSettings();
+
+        // Open settings dialog and save settings if the dialog is accepted
+        if (impl->m_SettingsDialog->exec() == QDialog::Accepted) {
+            impl->m_SettingsDialog->saveSettings();
+        }
+
+    });
+
     auto mainToolBar = this->addToolBar(QStringLiteral("MainToolBar"));
 
     auto timeWidget = new TimeWidget{};
     mainToolBar->addWidget(timeWidget);
 
+    // //////// //
+    // Settings //
+    // //////// //
+
+    // Registers "general settings" widget to the settings dialog
+    impl->m_SettingsDialog->registerWidget(QStringLiteral("General"),
+                                           impl->m_GeneralSettingsWidget);
+
+    // /////////// //
+    // Connections //
+    // /////////// //
+
     // Controllers / controllers connections
     connect(&sqpApp->timeController(), SIGNAL(timeUpdated(SqpDateTime)),
             &sqpApp->variableController(), SLOT(onDateTimeOnSelection(SqpDateTime)));
@@ -207,55 +236,12 @@ MainWindow::MainWindow(QWidget *parent)
         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);
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index c96774f..78a4781 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -29,6 +29,9 @@ SCIQLOP_FIND_QT(Core Network)
 #
 # Compile the library library
 #
+
+ADD_DEFINITIONS(-DCORE_LIB)
+
 FILE (GLOB_RECURSE MODULE_SOURCES
         ${INCLUDES_DIR}/*.h
         ${SOURCES_DIR}/*.c
diff --git a/core/include/CoreGlobal.h b/core/include/CoreGlobal.h
new file mode 100644
index 0000000..34581fc
--- /dev/null
+++ b/core/include/CoreGlobal.h
@@ -0,0 +1,12 @@
+#ifndef SCIQLOP_COREGLOBAL_H
+#define SCIQLOP_COREGLOBAL_H
+
+#include <QtCore/QtGlobal>
+
+#ifdef CORE_LIB
+#define SCIQLOP_CORE_EXPORT Q_DECL_EXPORT
+#else
+#define SCIQLOP_CORE_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // SCIQLOP_COREGLOBAL_H
diff --git a/core/include/Data/IDataProvider.h b/core/include/Data/IDataProvider.h
index 4af05f0..0648402 100644
--- a/core/include/Data/IDataProvider.h
+++ b/core/include/Data/IDataProvider.h
@@ -1,6 +1,8 @@
 #ifndef SCIQLOP_IDATAPROVIDER_H
 #define SCIQLOP_IDATAPROVIDER_H
 
+#include "CoreGlobal.h"
+
 #include <memory>
 
 #include <QObject>
@@ -25,7 +27,7 @@ class QNetworkRequest;
  *
  * @sa IDataSeries
  */
-class IDataProvider : public QObject {
+class SCIQLOP_CORE_EXPORT IDataProvider : public QObject {
 
     Q_OBJECT
 public:
diff --git a/core/include/Data/ScalarSeries.h b/core/include/Data/ScalarSeries.h
index 6be68df..ce301f4 100644
--- a/core/include/Data/ScalarSeries.h
+++ b/core/include/Data/ScalarSeries.h
@@ -1,12 +1,14 @@
 #ifndef SCIQLOP_SCALARSERIES_H
 #define SCIQLOP_SCALARSERIES_H
 
+#include "CoreGlobal.h"
+
 #include <Data/DataSeries.h>
 
 /**
  * @brief The ScalarSeries class is the implementation for a data series representing a scalar.
  */
-class ScalarSeries : public DataSeries<1> {
+class SCIQLOP_CORE_EXPORT ScalarSeries : public DataSeries<1> {
 public:
     /**
      * Ctor with two vectors. The vectors must have the same size, otherwise a ScalarSeries with no
diff --git a/core/include/DataSource/DataSourceController.h b/core/include/DataSource/DataSourceController.h
index ce458d8..568f5a9 100644
--- a/core/include/DataSource/DataSourceController.h
+++ b/core/include/DataSource/DataSourceController.h
@@ -1,6 +1,8 @@
 #ifndef SCIQLOP_DATASOURCECONTROLLER_H
 #define SCIQLOP_DATASOURCECONTROLLER_H
 
+#include "CoreGlobal.h"
+
 #include <QLoggingCategory>
 #include <QObject>
 #include <QUuid>
@@ -19,7 +21,7 @@ class IDataProvider;
  * 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 DataSourceController : public QObject {
+class SCIQLOP_CORE_EXPORT DataSourceController : public QObject {
     Q_OBJECT
 public:
     explicit DataSourceController(QObject *parent = 0);
diff --git a/core/include/DataSource/DataSourceItem.h b/core/include/DataSource/DataSourceItem.h
index 684da09..0a8194e 100644
--- a/core/include/DataSource/DataSourceItem.h
+++ b/core/include/DataSource/DataSourceItem.h
@@ -1,6 +1,8 @@
 #ifndef SCIQLOP_DATASOURCEITEM_H
 #define SCIQLOP_DATASOURCEITEM_H
 
+#include "CoreGlobal.h"
+
 #include <Common/spimpl.h>
 
 #include <QVariant>
@@ -19,7 +21,7 @@ enum class DataSourceItemType { NODE, PRODUCT, COMPONENT };
  * containing other DataSourceItem objects (children).
  * For each DataSourceItem can be associated a set of data representing it.
  */
-class DataSourceItem {
+class SCIQLOP_CORE_EXPORT DataSourceItem {
 public:
     /// Key associated with the name of the item
     static const QString NAME_DATA_KEY;
diff --git a/core/include/DataSource/DataSourceItemAction.h b/core/include/DataSource/DataSourceItemAction.h
index 1dff4be..72f2a88 100644
--- a/core/include/DataSource/DataSourceItemAction.h
+++ b/core/include/DataSource/DataSourceItemAction.h
@@ -1,6 +1,8 @@
 #ifndef SCIQLOP_DATASOURCEITEMACTION_H
 #define SCIQLOP_DATASOURCEITEMACTION_H
 
+#include "CoreGlobal.h"
+
 #include <Common/spimpl.h>
 
 #include <QLoggingCategory>
@@ -17,7 +19,7 @@ class DataSourceItem;
  *
  * An action is a function that will be executed when the slot execute() is called.
  */
-class DataSourceItemAction : public QObject {
+class SCIQLOP_CORE_EXPORT DataSourceItemAction : public QObject {
 
     Q_OBJECT
 
diff --git a/core/include/Network/NetworkController.h b/core/include/Network/NetworkController.h
index 2778624..ca19b89 100644
--- a/core/include/Network/NetworkController.h
+++ b/core/include/Network/NetworkController.h
@@ -1,6 +1,8 @@
 #ifndef SCIQLOP_NETWORKCONTROLLER_H
 #define SCIQLOP_NETWORKCONTROLLER_H
 
+#include "CoreGlobal.h"
+
 #include <QLoggingCategory>
 #include <QObject>
 #include <QUuid>
@@ -16,7 +18,7 @@ class QNetworkRequest;
 /**
  * @brief The NetworkController class aims to handle all network connection of SciQlop.
  */
-class NetworkController : public QObject {
+class SCIQLOP_CORE_EXPORT NetworkController : public QObject {
     Q_OBJECT
 public:
     explicit NetworkController(QObject *parent = 0);
diff --git a/core/include/Plugin/PluginManager.h b/core/include/Plugin/PluginManager.h
index b54c733..dd76163 100644
--- a/core/include/Plugin/PluginManager.h
+++ b/core/include/Plugin/PluginManager.h
@@ -1,6 +1,8 @@
 #ifndef SCIQLOP_PLUGINMANAGER_H
 #define SCIQLOP_PLUGINMANAGER_H
 
+#include "CoreGlobal.h"
+
 #include <Common/spimpl.h>
 
 #include <QLoggingCategory>
@@ -12,7 +14,7 @@ Q_DECLARE_LOGGING_CATEGORY(LOG_PluginManager)
 /**
  * @brief The PluginManager class aims to handle the plugins loaded dynamically into SciQLop.
  */
-class PluginManager {
+class SCIQLOP_CORE_EXPORT PluginManager {
 public:
     explicit PluginManager();
 
diff --git a/core/include/Settings/ISqpSettingsBindable.h b/core/include/Settings/ISqpSettingsBindable.h
new file mode 100644
index 0000000..b69600b
--- /dev/null
+++ b/core/include/Settings/ISqpSettingsBindable.h
@@ -0,0 +1,21 @@
+#ifndef SCIQLOP_ISQPSETTINGSBINDABLE_H
+#define SCIQLOP_ISQPSETTINGSBINDABLE_H
+
+#include <QSettings>
+
+/**
+ * @brief The ISqpSettingsBindable interface represents an object that can bind a variable
+ */
+class ISqpSettingsBindable {
+
+public:
+    virtual ~ISqpSettingsBindable() = default;
+
+    /// Loads settings into the object
+    virtual void loadSettings() = 0;
+
+    /// Saves settings from the object
+    virtual void saveSettings() const = 0;
+};
+
+#endif // SCIQLOP_ISQPSETTINGSBINDABLE_H
diff --git a/core/include/Settings/SqpSettingsDefs.h b/core/include/Settings/SqpSettingsDefs.h
new file mode 100644
index 0000000..5d110fe
--- /dev/null
+++ b/core/include/Settings/SqpSettingsDefs.h
@@ -0,0 +1,18 @@
+#ifndef SCIQLOP_SQPSETTINGSDEFS_H
+#define SCIQLOP_SQPSETTINGSDEFS_H
+
+#include "CoreGlobal.h"
+
+#include <QString>
+
+// //////////////// //
+// General settings //
+// //////////////// //
+
+extern SCIQLOP_CORE_EXPORT const QString GENERAL_TOLERANCE_AT_INIT_KEY;
+extern SCIQLOP_CORE_EXPORT const double GENERAL_TOLERANCE_AT_INIT_DEFAULT_VALUE;
+
+extern SCIQLOP_CORE_EXPORT const QString GENERAL_TOLERANCE_AT_UPDATE_KEY;
+extern SCIQLOP_CORE_EXPORT const double GENERAL_TOLERANCE_AT_UPDATE_DEFAULT_VALUE;
+
+#endif // SCIQLOP_SQPSETTINGSDEFS_H
diff --git a/core/include/Time/TimeController.h b/core/include/Time/TimeController.h
index fe94644..9c6d7b0 100644
--- a/core/include/Time/TimeController.h
+++ b/core/include/Time/TimeController.h
@@ -1,6 +1,8 @@
 #ifndef SCIQLOP_TIMECONTROLLER_H
 #define SCIQLOP_TIMECONTROLLER_H
 
+#include "CoreGlobal.h"
+
 #include <Data/SqpDateTime.h>
 
 #include <QLoggingCategory>
@@ -14,7 +16,7 @@ Q_DECLARE_LOGGING_CATEGORY(LOG_TimeController)
 /**
  * @brief The TimeController class aims to handle the Time parameters notification in SciQlop.
  */
-class TimeController : public QObject {
+class SCIQLOP_CORE_EXPORT TimeController : public QObject {
     Q_OBJECT
 public:
     explicit TimeController(QObject *parent = 0);
diff --git a/core/include/Variable/Variable.h b/core/include/Variable/Variable.h
index ed1d3d7..cbdb30f 100644
--- a/core/include/Variable/Variable.h
+++ b/core/include/Variable/Variable.h
@@ -1,6 +1,8 @@
 #ifndef SCIQLOP_VARIABLE_H
 #define SCIQLOP_VARIABLE_H
 
+#include "CoreGlobal.h"
+
 #include <Data/SqpDateTime.h>
 
 #include <QLoggingCategory>
@@ -17,7 +19,7 @@ class QString;
 /**
  * @brief The Variable class represents a variable in SciQlop.
  */
-class Variable : public QObject {
+class SCIQLOP_CORE_EXPORT Variable : public QObject {
 
     Q_OBJECT
 
diff --git a/core/include/Variable/VariableCacheController.h b/core/include/Variable/VariableCacheController.h
index 7830d0a..56da394 100644
--- a/core/include/Variable/VariableCacheController.h
+++ b/core/include/Variable/VariableCacheController.h
@@ -1,6 +1,8 @@
 #ifndef SCIQLOP_VARIABLECACHECONTROLLER_H
 #define SCIQLOP_VARIABLECACHECONTROLLER_H
 
+#include "CoreGlobal.h"
+
 #include <QLoggingCategory>
 #include <QObject>
 
@@ -14,11 +16,8 @@ Q_DECLARE_LOGGING_CATEGORY(LOG_VariableCacheController)
 
 class Variable;
 
-Q_DECLARE_LOGGING_CATEGORY(LOG_VariableCacheController)
-
-
 /// This class aims to store in the cache all of the dateTime already requested to the variable.
-class VariableCacheController : public QObject {
+class SCIQLOP_CORE_EXPORT VariableCacheController : public QObject {
     Q_OBJECT
 public:
     explicit VariableCacheController(QObject *parent = 0);
diff --git a/core/include/Variable/VariableController.h b/core/include/Variable/VariableController.h
index c896d44..d353ad7 100644
--- a/core/include/Variable/VariableController.h
+++ b/core/include/Variable/VariableController.h
@@ -1,6 +1,8 @@
 #ifndef SCIQLOP_VARIABLECONTROLLER_H
 #define SCIQLOP_VARIABLECONTROLLER_H
 
+#include "CoreGlobal.h"
+
 #include <Data/SqpDateTime.h>
 
 #include <QLoggingCategory>
@@ -19,7 +21,7 @@ Q_DECLARE_LOGGING_CATEGORY(LOG_VariableController)
 /**
  * @brief The VariableController class aims to handle the variables in SciQlop.
  */
-class VariableController : public QObject {
+class SCIQLOP_CORE_EXPORT VariableController : public QObject {
     Q_OBJECT
 public:
     explicit VariableController(QObject *parent = 0);
diff --git a/core/include/Variable/VariableModel.h b/core/include/Variable/VariableModel.h
index 21e4edc..44fa7b7 100644
--- a/core/include/Variable/VariableModel.h
+++ b/core/include/Variable/VariableModel.h
@@ -1,6 +1,7 @@
 #ifndef SCIQLOP_VARIABLEMODEL_H
 #define SCIQLOP_VARIABLEMODEL_H
 
+#include "CoreGlobal.h"
 
 #include <Data/SqpDateTime.h>
 
@@ -21,7 +22,7 @@ class Variable;
 /**
  * @brief The VariableModel class aims to hold the variables that have been created in SciQlop
  */
-class VariableModel : public QAbstractTableModel {
+class SCIQLOP_CORE_EXPORT VariableModel : public QAbstractTableModel {
     Q_OBJECT
 public:
     explicit VariableModel(QObject *parent = nullptr);
diff --git a/core/include/Visualization/VisualizationController.h b/core/include/Visualization/VisualizationController.h
index 74ff980..1993e01 100644
--- a/core/include/Visualization/VisualizationController.h
+++ b/core/include/Visualization/VisualizationController.h
@@ -1,6 +1,8 @@
 #ifndef SCIQLOP_VISUALIZATIONCONTROLLER_H
 #define SCIQLOP_VISUALIZATIONCONTROLLER_H
 
+#include "CoreGlobal.h"
+
 #include <Data/SqpDateTime.h>
 
 #include <QLoggingCategory>
@@ -21,7 +23,7 @@ class Variable;
  * 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 {
+class SCIQLOP_CORE_EXPORT VisualizationController : public QObject {
     Q_OBJECT
 public:
     explicit VisualizationController(QObject *parent = 0);
diff --git a/core/src/Settings/SqpSettingsDefs.cpp b/core/src/Settings/SqpSettingsDefs.cpp
new file mode 100644
index 0000000..f0f6b44
--- /dev/null
+++ b/core/src/Settings/SqpSettingsDefs.cpp
@@ -0,0 +1,7 @@
+#include "Settings/SqpSettingsDefs.h"
+
+const QString GENERAL_TOLERANCE_AT_INIT_KEY = QStringLiteral("toleranceInit");
+const double GENERAL_TOLERANCE_AT_INIT_DEFAULT_VALUE = 0.2;
+
+const QString GENERAL_TOLERANCE_AT_UPDATE_KEY = QStringLiteral("toleranceUpdate");
+const double GENERAL_TOLERANCE_AT_UPDATE_DEFAULT_VALUE = 0.2;
diff --git a/gui/include/Settings/SqpSettingsDialog.h b/gui/include/Settings/SqpSettingsDialog.h
new file mode 100644
index 0000000..a08b477
--- /dev/null
+++ b/gui/include/Settings/SqpSettingsDialog.h
@@ -0,0 +1,40 @@
+#ifndef SCIQLOP_SQPSETTINGSDIALOG_H
+#define SCIQLOP_SQPSETTINGSDIALOG_H
+
+#include "Settings/ISqpSettingsBindable.h"
+
+#include <QDialog>
+
+namespace Ui {
+class SqpSettingsDialog;
+} // Ui
+
+/**
+ * @brief The SqpSettingsDialog class represents the dialog in which the parameters of SciQlop are
+ * set
+ */
+class SqpSettingsDialog : public QDialog, public ISqpSettingsBindable {
+    Q_OBJECT
+
+public:
+    explicit SqpSettingsDialog(QWidget *parent = 0);
+    virtual ~SqpSettingsDialog() noexcept;
+
+    /// @sa ISqpSettingsBindable::loadSettings()
+    void loadSettings() override final;
+
+    /// @sa ISqpSettingsBindable::saveSettings()
+    void saveSettings() const override final;
+
+    /**
+     * Registers a widget into the dialog
+     * @param name the name under which the widget will appear in the dialog
+     * @param widget the widget to register
+     */
+    void registerWidget(const QString &name, QWidget *widget) noexcept;
+
+private:
+    Ui::SqpSettingsDialog *ui;
+};
+
+#endif // SCIQLOP_SQPSETTINGSDIALOG_H
diff --git a/gui/include/Settings/SqpSettingsGeneralWidget.h b/gui/include/Settings/SqpSettingsGeneralWidget.h
new file mode 100644
index 0000000..02f3f96
--- /dev/null
+++ b/gui/include/Settings/SqpSettingsGeneralWidget.h
@@ -0,0 +1,32 @@
+#ifndef SCIQLOP_SQPSETTINGSGENERALWIDGET_H
+#define SCIQLOP_SQPSETTINGSGENERALWIDGET_H
+
+#include "Settings/ISqpSettingsBindable.h"
+
+#include <QWidget>
+
+namespace Ui {
+class SqpSettingsGeneralWidget;
+} // Ui
+
+/**
+ * @brief The SqpSettingsGeneralWidget class represents the general settings of SciQlop
+ */
+class SqpSettingsGeneralWidget : public QWidget, public ISqpSettingsBindable {
+    Q_OBJECT
+
+public:
+    explicit SqpSettingsGeneralWidget(QWidget *parent = 0);
+    virtual ~SqpSettingsGeneralWidget() noexcept;
+
+    /// @sa ISqpSettingsBindable::loadSettings()
+    void loadSettings() override final;
+
+    /// @sa ISqpSettingsBindable::saveSettings()
+    void saveSettings() const override final;
+
+private:
+    Ui::SqpSettingsGeneralWidget *ui;
+};
+
+#endif // SCIQLOP_SQPSETTINGSGENERALWIDGET_H
diff --git a/gui/src/Settings/SqpSettingsDialog.cpp b/gui/src/Settings/SqpSettingsDialog.cpp
new file mode 100644
index 0000000..95c236a
--- /dev/null
+++ b/gui/src/Settings/SqpSettingsDialog.cpp
@@ -0,0 +1,66 @@
+#include "Settings/SqpSettingsDialog.h"
+#include "ui_SqpSettingsDialog.h"
+
+namespace {
+
+/**
+ * Performs a bind operation on widgets that can be binded to SciQlop settings
+ * @param widgets
+ * @param bind the bind operation
+ * @sa ISqpSettingsBindable
+ */
+template <typename BindMethod>
+void processBind(const QStackedWidget &widgets, BindMethod bind)
+{
+    auto count = widgets.count();
+    for (auto i = 0; i < count; ++i) {
+        // Performs operation if widget is an ISqpSettingsBindable
+        if (auto sqpSettingsWidget = dynamic_cast<ISqpSettingsBindable *>(widgets.widget(i))) {
+            bind(*sqpSettingsWidget);
+        }
+    }
+}
+
+} // namespace
+
+SqpSettingsDialog::SqpSettingsDialog(QWidget *parent)
+        : QDialog{parent}, ui{new Ui::SqpSettingsDialog}
+{
+    ui->setupUi(this);
+
+    // Connection to change the current page to the selection of an entry in the list
+    connect(ui->listWidget, &QListWidget::currentRowChanged, ui->stackedWidget,
+            &QStackedWidget::setCurrentIndex);
+}
+
+SqpSettingsDialog::~SqpSettingsDialog() noexcept
+{
+    delete ui;
+}
+
+void SqpSettingsDialog::loadSettings()
+{
+    // Performs load on all widgets that can be binded to SciQlop settings
+    processBind(*ui->stackedWidget,
+                [](ISqpSettingsBindable &bindable) { bindable.loadSettings(); });
+}
+
+void SqpSettingsDialog::saveSettings() const
+{
+    // Performs save on all widgets that can be binded to SciQlop settings
+    processBind(*ui->stackedWidget,
+                [](ISqpSettingsBindable &bindable) { bindable.saveSettings(); });
+}
+
+void SqpSettingsDialog::registerWidget(const QString &name, QWidget *widget) noexcept
+{
+    auto newItem = new QListWidgetItem{ui->listWidget};
+    newItem->setText(name);
+
+    ui->stackedWidget->addWidget(widget);
+
+    // Selects widget if it's the first in the dialog
+    if (ui->listWidget->count() == 1) {
+        ui->listWidget->setCurrentItem(newItem);
+    }
+}
diff --git a/gui/src/Settings/SqpSettingsGeneralWidget.cpp b/gui/src/Settings/SqpSettingsGeneralWidget.cpp
new file mode 100644
index 0000000..f4f7bcf
--- /dev/null
+++ b/gui/src/Settings/SqpSettingsGeneralWidget.cpp
@@ -0,0 +1,45 @@
+#include "Settings/SqpSettingsGeneralWidget.h"
+
+#include "Settings/SqpSettingsDefs.h"
+
+#include "ui_SqpSettingsGeneralWidget.h"
+
+SqpSettingsGeneralWidget::SqpSettingsGeneralWidget(QWidget *parent)
+        : QWidget{parent}, ui{new Ui::SqpSettingsGeneralWidget}
+{
+    ui->setupUi(this);
+}
+
+SqpSettingsGeneralWidget::~SqpSettingsGeneralWidget() noexcept
+{
+    delete ui;
+}
+
+void SqpSettingsGeneralWidget::loadSettings()
+{
+    QSettings settings{};
+
+    auto loadTolerance = [&settings](const QString &key, double defaultValue) {
+        // Tolerance is converted to percent
+        auto toleranceValue = settings.value(key, defaultValue).toDouble();
+        return toleranceValue * 100.;
+    };
+
+    ui->toleranceInitSpinBox->setValue(
+        loadTolerance(GENERAL_TOLERANCE_AT_INIT_KEY, GENERAL_TOLERANCE_AT_INIT_DEFAULT_VALUE));
+    ui->toleranceUpdateSpinBox->setValue(
+        loadTolerance(GENERAL_TOLERANCE_AT_UPDATE_KEY, GENERAL_TOLERANCE_AT_UPDATE_DEFAULT_VALUE));
+}
+
+void SqpSettingsGeneralWidget::saveSettings() const
+{
+    QSettings settings{};
+
+    auto saveTolerance = [&settings](const QString &key, double value) {
+        // Tolerance is converted from percent
+        settings.setValue(key, value * 0.01);
+    };
+
+    saveTolerance(GENERAL_TOLERANCE_AT_INIT_KEY, ui->toleranceInitSpinBox->value());
+    saveTolerance(GENERAL_TOLERANCE_AT_UPDATE_KEY, ui->toleranceUpdateSpinBox->value());
+}
diff --git a/gui/src/Visualization/VisualizationGraphHelper.cpp b/gui/src/Visualization/VisualizationGraphHelper.cpp
index 68725bf..34bcae6 100644
--- a/gui/src/Visualization/VisualizationGraphHelper.cpp
+++ b/gui/src/Visualization/VisualizationGraphHelper.cpp
@@ -48,8 +48,8 @@ void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSerie
             auto xDataBegin = xData.cbegin();
             auto xDataEnd = xData.cend();
 
-            qCInfo(LOG_VisualizationGraphHelper())
-                << "TORM: Current points in cache" << xData.count();
+            qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points in cache"
+                                                   << xData.count();
 
             auto sqpDataContainer = QSharedPointer<SqpDataContainer>::create();
             qcpGraph->setData(sqpDataContainer);
@@ -64,8 +64,8 @@ void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSerie
                 sqpDataContainer->appendGraphData(QCPGraphData(*xAxisDataIt, *valuesDataIt));
             }
 
-            qCInfo(LOG_VisualizationGraphHelper())
-                << "TORM: Current points displayed" << sqpDataContainer->size();
+            qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points displayed"
+                                                   << sqpDataContainer->size();
         }
         scalarSeries.unlock();
 
diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp
index bf903ae..275a284 100644
--- a/gui/src/Visualization/VisualizationGraphWidget.cpp
+++ b/gui/src/Visualization/VisualizationGraphWidget.cpp
@@ -5,6 +5,7 @@
 
 #include <Data/ArrayData.h>
 #include <Data/IDataSeries.h>
+#include <Settings/SqpSettingsDefs.h>
 #include <SqpApplication.h>
 #include <Variable/Variable.h>
 #include <Variable/VariableController.h>
@@ -21,6 +22,13 @@ const auto HORIZONTAL_ZOOM_MODIFIER = Qt::NoModifier;
 /// Key pressed to enable zoom on vertical axis
 const auto VERTICAL_ZOOM_MODIFIER = Qt::ControlModifier;
 
+/// Gets a tolerance value from application settings. If the setting can't be found, the default
+/// value passed in parameter is returned
+double toleranceValue(const QString &key, double defaultValue) noexcept
+{
+    return QSettings{}.value(key, defaultValue).toDouble();
+}
+
 } // namespace
 
 struct VisualizationGraphWidget::VisualizationGraphWidgetPrivate {
@@ -106,8 +114,10 @@ void VisualizationGraphWidget::addVariableUsingGraph(std::shared_ptr<Variable> v
 
     auto variableDateTimeWithTolerance = dateTime;
 
-    // add 20% tolerance for each side
-    auto tolerance = 0.2 * (dateTime.m_TEnd - dateTime.m_TStart);
+    // add tolerance for each side
+    auto toleranceFactor
+        = toleranceValue(GENERAL_TOLERANCE_AT_INIT_KEY, GENERAL_TOLERANCE_AT_INIT_DEFAULT_VALUE);
+    auto tolerance = toleranceFactor * (dateTime.m_TEnd - dateTime.m_TStart);
     variableDateTimeWithTolerance.m_TStart -= tolerance;
     variableDateTimeWithTolerance.m_TEnd += tolerance;
 
@@ -232,7 +242,8 @@ void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange
         auto variable = it->first;
         auto currentDateTime = dateTimeRange;
 
-        auto toleranceFactor = 0.2;
+        auto toleranceFactor = toleranceValue(GENERAL_TOLERANCE_AT_UPDATE_KEY,
+                                              GENERAL_TOLERANCE_AT_UPDATE_DEFAULT_VALUE);
         auto tolerance = toleranceFactor * (currentDateTime.m_TEnd - currentDateTime.m_TStart);
         auto variableDateTimeWithTolerance = currentDateTime;
         variableDateTimeWithTolerance.m_TStart -= tolerance;
@@ -251,7 +262,7 @@ void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange
                 if (variable->contains(variableDateTimeWithTolerance)) {
                     qCDebug(LOG_VisualizationGraphWidget())
                         << tr("TORM: Detection zoom in that need request:");
-                    // add 10% tolerance for each side
+                    // add tolerance for each side
                     tolerance
                         = toleranceFactor * (currentDateTime.m_TEnd - currentDateTime.m_TStart);
                     variableDateTimeWithTolerance.m_TStart -= tolerance;
@@ -286,7 +297,7 @@ void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange
             }
             else {
                 qCDebug(LOG_VisualizationGraphWidget()) << tr("TORM: Detection zoom out: ");
-                // add 10% tolerance for each side
+                // add tolerance for each side
                 tolerance = toleranceFactor * (currentDateTime.m_TEnd - currentDateTime.m_TStart);
                 variableDateTimeWithTolerance.m_TStart -= tolerance;
                 variableDateTimeWithTolerance.m_TEnd += tolerance;
diff --git a/gui/ui/Settings/SqpSettingsDialog.ui b/gui/ui/Settings/SqpSettingsDialog.ui
new file mode 100644
index 0000000..e75b37c
--- /dev/null
+++ b/gui/ui/Settings/SqpSettingsDialog.ui
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SqpSettingsDialog</class>
+ <widget class="QDialog" name="SqpSettingsDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>572</width>
+    <height>394</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>SciQlop Settings</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QListWidget" name="listWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QStackedWidget" name="stackedWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>SqpSettingsDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>SqpSettingsDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/gui/ui/Settings/SqpSettingsGeneralWidget.ui b/gui/ui/Settings/SqpSettingsGeneralWidget.ui
new file mode 100644
index 0000000..6b2a797
--- /dev/null
+++ b/gui/ui/Settings/SqpSettingsGeneralWidget.ui
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SqpSettingsGeneralWidget</class>
+ <widget class="QWidget" name="SqpSettingsGeneralWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>343</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="toleranceInitLabel">
+     <property name="text">
+      <string>Tolerance on first acquisition:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QDoubleSpinBox" name="toleranceInitSpinBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="suffix">
+      <string> %</string>
+     </property>
+     <property name="minimum">
+      <double>0.000000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>500.000000000000000</double>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="toleranceUpdateLabel">
+     <property name="text">
+      <string>Tolerance when updating acquisition:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QDoubleSpinBox" name="toleranceUpdateSpinBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="suffix">
+      <string> %</string>
+     </property>
+     <property name="minimum">
+      <double>0.000000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>500.000000000000000</double>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/plugins/amda/src/AmdaProvider.cpp b/plugins/amda/src/AmdaProvider.cpp
index 6191106..bfc0f46 100644
--- a/plugins/amda/src/AmdaProvider.cpp
+++ b/plugins/amda/src/AmdaProvider.cpp
@@ -22,7 +22,7 @@ namespace {
 /// - %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&"
+    "getParameter.php?startTime=%1&stopTime=%2&parameterID=%3&outputFormat=ASCII&"
     "timeFormat=ISO8601&gzip=0");
 
 /// Dates format passed in the URL (e.g 2013-09-23T09:00)
@@ -39,8 +39,7 @@ QString dateFormat(double sqpDateTime) noexcept
 
 AmdaProvider::AmdaProvider()
 {
-    qCDebug(LOG_NetworkController()) << tr("AmdaProvider::AmdaProvider")
-                                     << QThread::currentThread();
+    qCDebug(LOG_AmdaProvider()) << tr("AmdaProvider::AmdaProvider") << QThread::currentThread();
     if (auto app = sqpApp) {
         auto &networkController = app->networkController();
         connect(this, SIGNAL(requestConstructed(QNetworkRequest, QUuid,