HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/SciQLOPCore Commit - r94:29637e951955

0

include/Data/DateTimeRange.h +5 -5

             #include <Common/DateUtils.h>
             #include <Common/MetaTypes.h>
-            #include <Common/Numeric.h>
+            #include <Numeric.h>
             #include <QDebug>
             #include <QObject>
             #include <cmath>
               Seconds<double> shift;
               bool operator==(const DateTimeRangeTransformation& other) const
               {
-                return SciQLop::numeric::almost_equal(zoom, other.zoom, 1) &&
+                return cpp_utils::numeric::almost_equal(zoom, other.zoom, 1) &&
-                       SciQLop::numeric::almost_equal<double>(shift, other.shift, 1);
+                       cpp_utils::numeric::almost_equal<double>(shift, other.shift, 1);
               }
               DateTimeRangeTransformation
               merge(const DateTimeRangeTransformation& other) const
               bool operator==(const DateTimeRange& other) const
               {
-                return SciQLop::numeric::almost_equal(m_TStart, other.m_TStart, 1) &&
+                return cpp_utils::numeric::almost_equal(m_TStart, other.m_TStart, 1) &&
-                       SciQLop::numeric::almost_equal(m_TEnd, other.m_TEnd, 1);
+                       cpp_utils::numeric::almost_equal(m_TEnd, other.m_TEnd, 1);
               }
               bool operator!=(const DateTimeRange& other) const

0

include/Data/DateTimeRangeHelper.h +6 -6

             #include <opaque/numeric_typedef.hpp>
             #include <Common/DateUtils.h>
             #include <Common/MetaTypes.h>
-            #include <Common/Numeric.h>
+            #include <Numeric.h>
             #include <Data/DateTimeRange.h>
             enum class TransformationType { ZoomOut, ZoomIn, PanRight, PanLeft, Unknown };
                 inline bool isPureShift(const DateTimeRange& range1, const DateTimeRange& range2)
                 {
-                    return SciQLop::numeric::almost_equal<double>(range1.delta(), range2.delta(), 1)
+                    return cpp_utils::numeric::almost_equal<double>(range1.delta(), range2.delta(), 1)
-                            && !SciQLop::numeric::almost_equal(range1.m_TStart, range2.m_TStart, 1);
+                            && !cpp_utils::numeric::almost_equal(range1.m_TStart, range2.m_TStart, 1);
                 }
                 inline bool isPureZoom(const DateTimeRange& range1, const DateTimeRange& range2)
                 {
-                    return !SciQLop::numeric::almost_equal<double>(range1.delta(),range2.delta(),1)&&
+                    return !cpp_utils::numeric::almost_equal<double>(range1.delta(),range2.delta(),1)&&
-                            SciQLop::numeric::almost_equal<double>(range1.center(), range2.center(),1);
+                            cpp_utils::numeric::almost_equal<double>(range1.center(), range2.center(),1);
                 }
                     auto transformation = computeTransformation (range1,range2);
                     if(transformation.has_value ())
                     {
-                        if(SciQLop::numeric::almost_equal(transformation->zoom,1.))
+                        if(cpp_utils::numeric::almost_equal(transformation->zoom,1.))
                         {
                             if(transformation->shift > 0.)
                                 return TransformationType::PanRight;

0

include/Data/IDataProvider.h +1 -1

             #include "CoreGlobal.h"
             #include <Common/MetaTypes.h>
-            #include <Common/deprecate.h>
+            #include <deprecate.h>
             #include <Data/DateTimeRange.h>
             #include <QObject>
             #include <QUuid>

0

include/DataSource/DataSourceItem.h +1 -1

             #include "CoreGlobal.h"
             #include <Common/spimpl.h>
-            #include <Common/trees.h>
+            #include <trees/algorithms.hpp>
             #include <QVariant>
             #include <QVector>
             #include <iostream>

0

include/Variable/Variable2.h +1 -1

             #include "CoreGlobal.h"
             #include <Common/MetaTypes.h>
-            #include <Common/deprecate.h>
+            #include <deprecate.h>
             #include <Common/spimpl.h>
             #include <Data/DataSeriesType.h>
             #include <Data/DateTimeRange.h>

0

include/Variable/VariableSynchronizationGroup2.h +2 -2

             #include "CoreGlobal.h"
             #include <Common/spimpl.h>
-            #include <Common/containers.h>
+            #include <containers/algorithms.hpp>
             /**
              * @brief The VariableSynchronizationGroup2 class holds a list of Variables uuid which are synchronized
                  */
                 bool contains(QUuid variable) const noexcept
                 {
-                    return SciQLop::containers::contains(this->_variables,variable);
+                    return cpp_utils::containers::contains(this->_variables,variable);
                 }
                 /**

0

include/Variable/private/VCTransaction.h +1 -1

             #pragma once
             #include "Variable/VariableSynchronizationGroup2.h"
-            #include <Common/containers.h>
+            #include <containers/algorithms.hpp>
             #include <Common/debug.h>
             #include <Data/DataProviderParameters.h>
             #include <Data/DateTimeRange.h>

0

meson.build +3 -8

             catalogicpp_dep = dependency('catalogicpp', required : true, fallback:['catalogicpp','catalogicpp_dep'])
             pybind11_dep = dependency('pybind11', required : true, fallback:['pybind11','pybind11_dep'])
             timeseries_dep = dependency('TimeSeries', required : true, fallback:['TimeSeries','time_series_dep'])
+            cpp_utils_dep = dependency('cpp_utils', fallback:['cpp_utils','cpp_utils_dep'])
             core_moc_headers = [
-             './include/Common/containers.h',
-             './include/Common/StringUtils.h',
-             './include/Common/Numeric.h',
              './include/Common/spimpl.h',
              './include/Common/DateUtils.h',
              './include/Common/MimeTypesDef.h',
              './include/Common/SignalWaiter.h',
-             './include/Common/deprecate.h',
              './include/Common/debug.h',
              './include/Common/MetaTypes.h',
-             './include/Common/cpp_utils.h',
              './include/Common/SortUtils.h',
              './include/Data/DateTimeRangeHelper.h',
              './include/Data/ScalarTimeSerie.h',
             core_sources = ['./src/Common/MimeTypesDef.cpp',
              './src/Common/SignalWaiter.cpp',
              './src/Common/DateUtils.cpp',
-             './src/Common/StringUtils.cpp',
              './src/Network/Downloader.cpp',
              './src/Network/NetworkController.cpp',
              './src/Settings/SqpSettingsDefs.cpp',
                                    core_moc_files,
                                    cpp_args : '-DCORE_LIB',
                                    include_directories : core_inc,
-                                   dependencies : [qt5core, qt5network, catalogicpp_dep, pybind11_dep, timeseries_dep],
+                                   dependencies : [qt5core, qt5network, catalogicpp_dep, pybind11_dep, timeseries_dep, cpp_utils_dep],
                                    install : true
                                    )
             sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
                                             include_directories : core_inc,
-                                            dependencies : [qt5core, qt5network, catalogicpp_dep, pybind11_dep, timeseries_dep])
+                                            dependencies : [qt5core, qt5network, catalogicpp_dep, pybind11_dep, timeseries_dep, cpp_utils_dep])
             pymod = import('python')
             python3 = pymod.find_installation('python3')

0

src/Catalogue/CatalogueController.cpp +2 -2

             #include <Catalogue/CatalogueController.h>
             #include <CatalogueIO.hpp>
-            #include <Common/containers.h>
+            #include <containers/algorithms.hpp>
             #include <Common/debug.h>
             #include <QDataStream>
             #include <QDir>
             #include <QStandardPaths>
             #include <QThread>
-            using namespace SciQLop::containers;
+            using namespace cpp_utils::containers;
             // class CatalogueController::CatalogueControllerPrivate
             //{

0

src/DataSource/DataSourceController.cpp +1 -1

             #include "DataSource/DataSourceItem.h"
             #include "DataSource/DataSourceItemAction.h"
-            #include <Common/containers.h>
+            #include <containers/algorithms.hpp>
             #include <Data/IDataProvider.h>
             #include <QDataStream>
             #include <QDir>

0

src/Variable/VariableController2.cpp +2 -2

             #include "Variable/VariableSynchronizationGroup2.h"
-            #include <Common/containers.h>
+            #include <containers/algorithms.hpp>
             #include <Common/debug.h>
             #include <Data/DataProviderParameters.h>
             #include <Data/DateTimeRange.h>
             #if __cplusplus > 201703L
                   [[unlikely]]
             #endif
-                  if(!_variables.size() > index)
+                  if(!(_variables.size() > static_cast<unsigned int>(index)))
                       SCIQLOP_ERROR(threadSafeVaraiblesMaps, "Index is out of bounds");
                   auto it = _variables.cbegin();
                   while(index != 0)

0

src/Variable/VariableModel2.cpp +5 -4

             #include <Common/DateUtils.h>
             #include <Common/MimeTypesDef.h>
-            #include <Common/StringUtils.h>
+            #include <cpp_utils_qt/cpp_utils_qt.hpp>
-            #include <Common/containers.h>
+            #include <strings/algorithms.hpp>
+            #include <containers/algorithms.hpp>
             #include <DataSource/DataSourceController.h>
             #include <QMimeData>
             #include <QSize>
                 auto forbiddenNames = std::vector<QString>(variables.size());
                 std::transform(variables.cbegin(), variables.cend(), forbiddenNames.begin(),
                                [](const auto& variable) { return variable->name(); });
-                auto uniqueName = StringUtils::uniqueName(defaultName, forbiddenNames);
+                auto uniqueName = cpp_utils::strings::make_unique_name(defaultName, forbiddenNames);
                 Q_ASSERT(!uniqueName.isEmpty());
                 return uniqueName;
             void VariableModel2::variableAdded(const std::shared_ptr<Variable2>& variable)
             {
-              if(!SciQLop::containers::contains(_variables, variable))
+              if(!cpp_utils::containers::contains(_variables, variable))
               {
                 beginInsertRows(QModelIndex(), this->_variables.size(),
                                 this->_variables.size());

0

tests/Data/TestDateTimeRange.cpp +1 -1

-            #include <Common/Numeric.h>
+            #include <Numeric.h>
             #include <Data/DateTimeRange.h>
             #include <Data/DateTimeRangeHelper.h>
             #include <QObject>

0

tests/Variable/TestVariableController2.cpp +4 -4

-            #include <Common/containers.h>
+            #include <containers/algorithms.hpp>
             #include <Data/DataProviderParameters.h>
             #include <Data/DateTimeRange.h>
             #include <Data/IDataProvider.h>
                         });
                 QVERIFY(!callbackCalled);
                 auto var1 = vc.createVariable("var1", {}, provider, range);
-                QVERIFY(SciQLop::containers::contains(vc.variables(), var1));
+                QVERIFY(cpp_utils::containers::contains(vc.variables(), var1));
                 QVERIFY(callbackCalled);
               }
                 auto var1 = vc.createVariable("var1", {}, provider, range);
                 while(!vc.isReady(var1))
                   QCoreApplication::processEvents();
-                QVERIFY(SciQLop::containers::contains(vc.variables(), var1));
+                QVERIFY(cpp_utils::containers::contains(vc.variables(), var1));
                 QVERIFY(!callbackCalled);
                 vc.deleteVariable(var1);
-                QVERIFY(!SciQLop::containers::contains(vc.variables(), var1));
+                QVERIFY(!cpp_utils::containers::contains(vc.variables(), var1));
                 QVERIFY(callbackCalled);
               }

0

tests/Variable/TestVariableController2Async.cpp +1 -1

-            #include <Common/containers.h>
+            #include <containers/algorithms.hpp>
             #include <Data/DataProviderParameters.h>
             #include <Data/DateTimeRange.h>
             #include <Data/IDataProvider.h>

0

tests/Variable/TestVariableController2WithSync.cpp +4 -4

-            #include <Common/containers.h>
+            #include <containers/algorithms.hpp>
             #include <Data/DataProviderParameters.h>
             #include <Data/DateTimeRange.h>
             #include <Data/IDataProvider.h>
                         });
                 QVERIFY(!callbackCalled);
                 auto var1 = vc.createVariable("var1", {}, provider, range);
-                QVERIFY(SciQLop::containers::contains(vc.variables(), var1));
+                QVERIFY(cpp_utils::containers::contains(vc.variables(), var1));
                 QVERIFY(callbackCalled);
               }
                           callbackCalled = true;
                         });
                 auto var1 = vc.createVariable("var1", {}, provider, range);
-                QVERIFY(SciQLop::containers::contains(vc.variables(), var1));
+                QVERIFY(cpp_utils::containers::contains(vc.variables(), var1));
                 QVERIFY(!callbackCalled);
                 while(!vc.isReady(var1))
                 {
                   qApp->processEvents();
                 }
                 vc.deleteVariable(var1);
-                QVERIFY(!SciQLop::containers::contains(vc.variables(), var1));
+                QVERIFY(!cpp_utils::containers::contains(vc.variables(), var1));
                 QVERIFY(callbackCalled);
               }

0

tests/meson.build 0 -10

@@ -10,16 +10,6 TestUtils_dep = declare_dependency(link_with : TestUtils,
10		10
11	tests = [	11	tests = [
12	{	12	{
13	'name':'TestStringUtils',
14	'sources': ['Common/TestStringUtils.cpp'],
15	'deps': [sciqlop_core, qt5test]
16	},
17	{
18	'name':'TestContainers',
19	'sources': ['Common/TestContainers.cpp'],
20	'deps': [sciqlop_core, qt5test]
21	},
22	{
23	'name':'TestSyncGroup',	13	'name':'TestSyncGroup',
24	'sources': ['Variable/TestSyncGroup.cpp'],	14	'sources': ['Variable/TestSyncGroup.cpp'],
25	'deps': [sciqlop_core, qt5test]	15	'deps': [sciqlop_core, qt5test]

0

include/Common/Numeric.h removed 0 -26

1

NO CONTENT: file was removed

0

include/Common/StringUtils.h removed 0 -90

1

NO CONTENT: file was removed

0

include/Common/containers.h removed 0 -49

1

NO CONTENT: file was removed

0

include/Common/cpp_utils.h removed 0 -66

1

NO CONTENT: file was removed

0

include/Common/deprecate.h removed 0 -10

1

NO CONTENT: file was removed

0

include/Common/trees.h removed 0 -57

1

NO CONTENT: file was removed

0

include/Common/types_detectors.h removed 0 -40

1

NO CONTENT: file was removed

0

src/Common/StringUtils.cpp removed 0 -5

1

NO CONTENT: file was removed

0

tests/Common/TestContainers.cpp removed 0 -36

1

NO CONTENT: file was removed

0

tests/Common/TestStringUtils.cpp removed 0 -50

1

NO CONTENT: file was removed

	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