HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1422:a323cf6b7201

app/src/MainWindow.cpp 0 -1

             #include <SqpApplication.h>
             #include <Time/TimeController.h>
             #include <TimeWidget/TimeWidget.h>
-            #include <Variable/Variable.h>
             #include <Visualization/VisualizationController.h>
             #include <QAction>

core +1 -1

	@@ -1,1 +1,1
	1	Subproject commit ae48b17833443bc2730a7511f964569dc7cdb1df		1	Subproject commit cc26524fb5d10feca3820e6921c9cd3cfb1a3591

gui/src/DragAndDrop/DragDropGuiController.cpp +1 -2

             #include "Visualization/operations/FindVariableOperation.h"
             #include "DataSource/DataSourceController.h"
-            #include "Variable/Variable.h"
             #include "Variable/VariableController2.h"
             #include "Common/MimeTypesDef.h"
                 if (mimeData->hasFormat(MIME_TYPE_VARIABLE_LIST))
                 {
                     auto variables = sqpApp->variableController().variables(
-                        Variable::variablesIDs(mimeData->data(MIME_TYPE_VARIABLE_LIST)));
+                        Variable2::IDs(mimeData->data(MIME_TYPE_VARIABLE_LIST)));
                     if (variables.size() == 1)
                     {

gui/src/SqpApplication.cpp 0 -1

             #include <Network/NetworkController.h>
             #include <QThread>
             #include <Time/TimeController.h>
-            #include <Variable/Variable.h>
             #include <Variable/VariableController2.h>
             #include <Variable/VariableModel2.h>
             #include <Visualization/VisualizationController.h>

gui/src/Variable/VariableInspectorWidget.cpp 0 -1

             #include <DataSource/DataSourceController.h>
             #include <Variable/RenameVariableDialog.h>
-            #include <Variable/Variable.h>
             #include <Variable/VariableController2.h>
             #include <Variable/VariableInspectorWidget.h>
             #include <Variable/VariableMenuHeaderWidget.h>

gui/src/Visualization/PlottablesRenderingUtils.cpp +1 -5

             #include <Common/ColorUtils.h>
-            #include <Data/ScalarSeries.h>
-            #include <Data/SpectrogramSeries.h>
-            #include <Data/VectorSeries.h>
             #include <Variable/Variable2.h>
             #include <Visualization/qcustomplot.h>
                         break;
                 }
-                return std::make_unique<PlottablesHelper<IDataSeries>>();
+                return std::make_unique<PlottablesHelper<TimeSeries::ITimeSerie>>();
             }

gui/src/Visualization/SqpColorScale.cpp +20 -17

             #include "Visualization/SqpColorScale.h"
-            #include <Data/DataSeriesUtils.h>
             #include <Visualization/QCPColorMapIterator.h>
             Q_LOGGING_CATEGORY(LOG_SqpColorScale, "SqpColorScale")
-            namespace {
+            namespace
+            {
             const auto DEFAULT_GRADIENT_PRESET = QCPColorGradient::gpJet;
-            const auto DEFAULT_RANGE = QCPRange{1.0e3, 1.7e7};
+            const auto DEFAULT_RANGE = QCPRange { 1.0e3, 1.7e7 };
             } // namespace
-            std::pair<double, double> SqpColorScale::computeThresholds(const SqpColorScale &scale)
+            std::pair<double, double> SqpColorScale::computeThresholds(const SqpColorScale& scale)
             {
                 auto qcpScale = scale.m_Scale;
                 auto colorMaps = qcpScale->colorMaps();
-                if (colorMaps.size() != 1) {
+                if (colorMaps.size() != 1)
-                    return {std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN()};
+                    return { std::numeric_limits<double>::quiet_NaN(),
+                        std::numeric_limits<double>::quiet_NaN() };
                 }
                 // Computes thresholds
                 auto isLogarithmicScale = qcpScale->dataScaleType() == QCPAxis::stLogarithmic;
                 auto colorMapData = colorMaps.first()->data();
-                QCPColorMapIterator begin{colorMapData, true};
+                QCPColorMapIterator begin { colorMapData, true };
-                QCPColorMapIterator end{colorMapData, false};
+                QCPColorMapIterator end { colorMapData, false };
-                return DataSeriesUtils::thresholds(begin, end, isLogarithmicScale);
+                return {}; // DataSeriesUtils::thresholds(begin, end, isLogarithmicScale);
             }
-            SqpColorScale::SqpColorScale(QCustomPlot &plot)
+            SqpColorScale::SqpColorScale(QCustomPlot& plot)
-                    : m_Scale{new QCPColorScale{&plot}},
+                    : m_Scale { new QCPColorScale { &plot } }
-                      m_AutomaticThreshold{false},
+                    , m_AutomaticThreshold { false }
-                      m_GradientPreset{DEFAULT_GRADIENT_PRESET}
+                    , m_GradientPreset { DEFAULT_GRADIENT_PRESET }
             {
                 m_Scale->setGradient(m_GradientPreset);
                 m_Scale->setDataRange(DEFAULT_RANGE);
             void SqpColorScale::updateDataRange() noexcept
             {
                 // Updates data range only if mode is automatic
-                if (!m_AutomaticThreshold) {
+                if (!m_AutomaticThreshold)
+                {
                     return;
                 }
                 double minThreshold, maxThreshold;
                 std::tie(minThreshold, maxThreshold) = computeThresholds(*this);
-                if (std::isnan(minThreshold) || std::isnan(maxThreshold)) {
+                if (std::isnan(minThreshold) || std::isnan(maxThreshold))
+                {
                     qCCritical(LOG_SqpColorScale())
                         << "Can't update data range of color scale: thresholds computed are invalid";
                     return;
                 }
                 // Updates thresholds
-                m_Scale->setDataRange({minThreshold, maxThreshold});
+                m_Scale->setDataRange({ minThreshold, maxThreshold });
             }

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

             #include "Visualization/VisualizationGraphHelper.h"
             #include "Visualization/qcustomplot.h"
-            #include <Data/DataSeriesUtils.h>
             #include <Data/ScalarTimeSerie.h>
             #include <Data/SpectrogramTimeSerie.h>
             #include <Data/VectorTimeSerie.h>

gui/src/Visualization/VisualizationGraphRenderingDelegate.cpp 0 -3

             #include <Common/DateUtils.h>
-            #include <Data/IDataSeries.h>
-            #include <Variable/Variable.h>
             #include <SqpApplication.h>
             namespace

gui/src/Visualization/VisualizationGraphWidget.cpp 0 -3

             #include <Actions/FilteringAction.h>
             #include <Common/MimeTypesDef.h>
             #include <Common/containers.h>
-            #include <Data/ArrayData.h>
             #include <Data/DateTimeRangeHelper.h>
-            #include <Data/IDataSeries.h>
-            #include <Data/SpectrogramSeries.h>
             #include <DragAndDrop/DragDropGuiController.h>
             #include <Settings/SqpSettingsDefs.h>
             #include <SqpApplication.h>

gui/tests/GUITestUtils/GUITestUtils.h 0 -1

             #include <QtTest>
             #include <SqpApplication.h>
-            #include <Variable/Variable.h>
             #include <Variable/VariableController2.h>
             #include <qcustomplot.h>

	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