HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/SciQLOPCore Commit - r26:de55e7be9096

CMakeLists.txt 0 -10

                 ./include/CoreGlobal.h
                 ./include/Visualization/VisualizationController.h
                 ./include/PluginManager/PluginManager.h
-                ./include/Variable/VariableModel.h
                 ./include/Variable/VariableModel2.h
-                ./include/Variable/VariableAcquisitionWorker.h
                 ./include/Variable/VariableCacheStrategy.h
-                ./include/Variable/VariableSynchronizationGroup.h
                 ./include/Variable/VariableSynchronizationGroup2.h
                 ./include/Variable/ProportionalCacheStrategy.h
                 ./include/Variable/SingleThresholdCacheStrategy.h
                 ./include/Variable/VariableCacheStrategyFactory.h
                 ./include/Variable/Variable.h
-                ./include/Variable/VariableCacheController.h
-                ./include/Variable/VariableController.h
                 ./include/Variable/VariableController2.h
                 ./include/Variable/private/VCTransaction.h
                 ./include/Time/TimeController.h
                 ./src/Network/Downloader.cpp
                 ./src/Visualization/VisualizationController.cpp
                 ./src/PluginManager/PluginManager.cpp
-                ./src/Variable/VariableController.cpp
                 ./src/Variable/VariableController2.cpp
-                ./src/Variable/VariableModel.cpp
                 ./src/Variable/VariableModel2.cpp
-                ./src/Variable/VariableCacheController.cpp
-                ./src/Variable/VariableSynchronizationGroup.cpp
                 ./src/Variable/VariableSynchronizationGroup2.cpp
                 ./src/Variable/Variable.cpp
-                ./src/Variable/VariableAcquisitionWorker.cpp
                 ./src/Version.cpp
                 ./src/Time/TimeController.cpp
                 ./src/Settings/SqpSettingsDefs.cpp

include/Variable/VariableController2.h +4 -2

+            #ifndef VARIABLECONTROLLER2_H
+            #define VARIABLECONTROLLER2_H
             #include <memory>
             #include <vector>
             #include <set>
             #include <QItemSelectionModel>
             #include <Common/spimpl.h>
             #include <Variable/Variable.h>
-            //#include <Variable/VariableSynchronizationGroup.h>
-            #include <Variable/VariableModel.h>
             #include <Data/IDataProvider.h>
             #include "Data/DateTimeRange.h"
                 void variableDeleted(const std::shared_ptr<Variable>&);
             };
+            #endif //VARIABLECONTROLLER2_H

include/Variable/VariableModel2.h +2 -1

             class Variable;
             class VariableController2;
+            enum VariableRoles { ProgressRole = Qt::UserRole };
             /**
              * @brief The VariableModel class aims to hold the variables that have been created in SciQlop
              */
             class SCIQLOP_CORE_EXPORT VariableModel2 : public QAbstractTableModel {
-                enum VariableRoles { ProgressRole = Qt::UserRole };
                 Q_OBJECT
                 std::shared_ptr<VariableController2> _variableController;
             public:

src/Variable/VariableModel2.cpp 0 -4

                                    ? 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{};

src/pybind11_wrappers/CoreWrappers.cpp +1 -1

             #include <Data/Unit.h>
             #include <Data/IDataProvider.h>
-            #include <Variable/VariableController.h>
+            #include <Variable/VariableController2.h>
             #include <Time/TimeController.h>

tests/CMakeLists.txt 0 -4

                 "sciqlopcore;Qt5::Test")
             declare_test(TestVariable TestVariable Variable/TestVariable.cpp "sciqlopcore;Qt5::Test")
-            declare_test(TestVariableCacheController TestVariableCacheController Variable/TestVariableCacheController.cpp "sciqlopcore;Qt5::Test")
-            declare_test(TestVariableController TestVariableController Variable/TestVariableController.cpp "sciqlopcore;Qt5::Test")
-            declare_test(TestVariableSync TestVariableSync Variable/TestVariableSync.cpp "sciqlopcore;Qt5::Test")
             declare_test(TestDownloader TestDownloader Network/TestDownloader.cpp "sciqlopcore;Qt5::Test")

include/Variable/VariableAcquisitionWorker.h removed 0 -66

NO CONTENT: file was removed

include/Variable/VariableCacheController.h removed 0 -45

NO CONTENT: file was removed

include/Variable/VariableController.h removed 0 -147

NO CONTENT: file was removed

include/Variable/VariableModel.h removed 0 -111

NO CONTENT: file was removed

include/Variable/VariableSynchronizationGroup.h removed 0 -39

NO CONTENT: file was removed

src/Variable/VariableAcquisitionWorker.cpp removed 0 -416

NO CONTENT: file was removed

src/Variable/VariableCacheController.cpp removed 0 -225

NO CONTENT: file was removed

src/Variable/VariableController.cpp removed 0 -1103

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (1103 lines changed) Show them Hide them

src/Variable/VariableModel.cpp removed 0 -391

NO CONTENT: file was removed

src/Variable/VariableSynchronizationGroup.cpp removed 0 -38

NO CONTENT: file was removed

tests/Variable/TestVariableCacheController.cpp removed 0 -335

NO CONTENT: file was removed

tests/Variable/TestVariableController.cpp removed 0 -76

NO CONTENT: file was removed

tests/Variable/TestVariableSync.cpp removed 0 -508

	1	NO CONTENT: file was removed			NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (508 lines changed) Show them Hide them

	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