HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/SciQLOPCore Commit - r23:c5573c66db57

Added missing headers...

jeandet -

r23:c5573c66db57

parent child

Context file:

r23:c5573c66db57

CMakeLists.txt +2 -2

             cmake_minimum_required(VERSION 3.6)
             project(SciQLOPCore CXX)
             OPTION (CPPCHECK "Analyzes the source code with cppcheck" OFF)
             OPTION (CLANG_TIDY "Analyzes the source code with Clang Tidy" OFF)
             OPTION (IWYU "Analyzes the source code with Include What You Use" OFF)
             OPTION (Catalog "builds catalog API" ON)
             set(CMAKE_CXX_STANDARD 17)
             set(CMAKE_AUTOMOC ON)
             #https://gitlab.kitware.com/cmake/cmake/issues/15227
             #set(CMAKE_AUTOUIC ON)
             if(POLICY CMP0071)
                 cmake_policy(SET CMP0071 OLD)
             endif()
             set(CMAKE_AUTORCC ON)
             set(CMAKE_INCLUDE_CURRENT_DIR ON)
             find_package(Qt5 COMPONENTS Core Widgets Network PrintSupport Svg Test REQUIRED)
             find_package(pybind11 CONFIG QUIET)
             if (NOT pybind11_FOUND)
                 execute_process(COMMAND git submodule init external/pybind11 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
                 execute_process(COMMAND git submodule update external/pybind11 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
                 add_subdirectory(external/pybind11)
             endif()
-            find_package(catalogs CONFIG QUIET)
+            find_package(libcatalogs CONFIG QUIET)
-            if (NOT CatalogueAPI_FOUND)
+            if (NOT libcatalogs_FOUND)
                 execute_process(COMMAND git submodule init external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
                 execute_process(COMMAND git submodule update external/libcatalogs WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
                 add_subdirectory(external/libcatalogs)
             endif()
             macro(declare_test testname testexe sources libraries)
                 add_executable(${testexe} ${sources})
                 target_link_libraries(${testexe} ${libraries})
                 add_test(NAME ${testname} COMMAND ${testexe})
             endmacro(declare_test)
             enable_testing()
             FILE (GLOB_RECURSE core_SRCS
                 ./include/DataSource/DataSourceItemMergeHelper.h
                 ./include/DataSource/DataSourceItemAction.h
                 ./include/DataSource/DataSourceItem.h
                 ./include/DataSource/DataSourceController.h
                 ./include/Common/SortUtils.h
                 ./include/Common/spimpl.h
                 ./include/Common/MimeTypesDef.h
                 ./include/Common/MetaTypes.h
                 ./include/Common/StringUtils.h
                 ./include/Common/SignalWaiter.h
                 ./include/Common/DateUtils.h
                 ./include/Common/Numeric.h
                 ./include/Common/deprecate.h
                 ./include/Common/containers.h
                 ./include/Common/debug.h
                 ./include/Plugin/IPlugin.h
                 ./include/Data/ArrayDataIterator.h
                 ./include/Data/VariableRequest.h
                 ./include/Data/VectorSeries.h
                 ./include/Data/DateTimeRange.h
                 ./include/Data/DateTimeRangeHelper.h
                 ./include/Data/ScalarSeries.h
                 ./include/Data/DataSeriesMergeHelper.h
                 ./include/Data/DataSeries.h
                 ./include/Data/AcquisitionDataPacket.h
                 ./include/Data/DataSeriesType.h
                 ./include/Data/AcquisitionRequest.h
                 ./include/Data/SqpIterator.h
                 ./include/Data/ArrayData.h
                 ./include/Data/DataSeriesIterator.h
                 ./include/Data/DataSeriesUtils.h
                 ./include/Data/SpectrogramSeries.h
                 ./include/Data/Unit.h
                 ./include/Data/DataProviderParameters.h
                 ./include/Data/OptionalAxis.h
                 ./include/Data/IDataProvider.h
                 ./include/Data/IDataSeries.h
                 ./include/Network/NetworkController.h
                 ./include/Network/Downloader.h
                 ./include/Version.h
                 ./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
                 ./include/Settings/ISqpSettingsBindable.h
                 ./include/Settings/SqpSettingsDefs.h
                 ./src/DataSource/DataSourceItem.cpp
                 ./src/DataSource/DataSourceItemAction.cpp
                 ./src/DataSource/DataSourceItemMergeHelper.cpp
                 ./src/DataSource/DataSourceController.cpp
                 ./src/Common/DateUtils.cpp
                 ./src/Common/MimeTypesDef.cpp
                 ./src/Common/StringUtils.cpp
                 ./src/Common/SignalWaiter.cpp
                 ./src/Data/ScalarSeries.cpp
                 ./src/Data/DataSeriesIterator.cpp
                 ./src/Data/OptionalAxis.cpp
                 ./src/Data/ArrayDataIterator.cpp
                 ./src/Data/SpectrogramSeries.cpp
                 ./src/Data/DataSeriesUtils.cpp
                 ./src/Data/VectorSeries.cpp
                 ./src/Network/NetworkController.cpp
                 ./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
                     )
             IF(Catalog)
                 FILE (GLOB_RECURSE core_catalog_SRCS
                     ./src/Catalogue/CatalogueController.cpp
                     ./include/Catalogue/CatalogueController.h
                     )
             ELSE()
             FILE (GLOB_RECURSE core_catalog_SRCS
                 )
             ENDIF(Catalog)
             add_definitions(-DCORE_STATIC)
             #add_definitions(-DHIDE_DEPRECATED)
             add_definitions(-DSCIQLOP_CRASH_ON_ERROR)
             add_library(sciqlopcore ${core_SRCS} ${core_catalog_SRCS})
             SET_TARGET_PROPERTIES(sciqlopcore PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
             target_include_directories(sciqlopcore PUBLIC
                 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
                 $<INSTALL_INTERFACE:include/SciQLOP>
             )
             target_link_libraries(sciqlopcore PUBLIC
               Qt5::Core
               Qt5::Network
             )
             if(Catalog)
                 target_link_libraries(sciqlopcore PUBLIC
                   catalogs
                 )
             endif()
             pybind11_add_module(sciqlopqt src/pybind11_wrappers/QtWrappers.cpp)
             target_link_libraries(sciqlopqt PUBLIC Qt5::Core)
             pybind11_add_module(pysciqlopcore src/pybind11_wrappers/CoreWrappers.cpp)
             target_link_libraries(pysciqlopcore PUBLIC sciqlopcore)
             add_library(pysciqlop src/pybind11_wrappers/pywrappers_common.h)
             target_link_libraries(pysciqlop PUBLIC Qt5::Core)
             target_include_directories(pysciqlop PUBLIC
                 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/pybind11_wrappers/>
                 $<INSTALL_INTERFACE:include/SciQLOP/py_wrappers>
             )
             SET_PROPERTY(GLOBAL PROPERTY CORE_PYTHON_PATH  ${CMAKE_CURRENT_BINARY_DIR})
             install(TARGETS sciqlopcore EXPORT SciQLOPCoreConfig
                 ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}
                 LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}
                 RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR})
             install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SciQLOP)
             install(EXPORT SciQLOPCoreConfig DESTINATION share/SciQLOPCore/cmake)
             export(TARGETS sciqlopcore FILE SciQLOPCoreConfig.cmake)
             add_subdirectory(tests)

include/Data/DateTimeRangeHelper.h +2 0

             #ifndef SCIQLOP_DATETIMERANGEHELPER_H
             #define SCIQLOP_DATETIMERANGEHELPER_H
+            #include <optional>
             #include <cmath>
             #include <variant>
             #include <QObject>
             #include <QDebug>
             #include <opaque/numeric_typedef.hpp>
             #include <Common/DateUtils.h>
             #include <Common/MetaTypes.h>
             #include <Common/Numeric.h>
             #include <Data/DateTimeRange.h>
             namespace DateTimeRangeHelper {
                 inline bool isnan(const DateTimeRange& range)
                 {
                     return std::isnan(range.m_TStart) && std::isnan(range.m_TEnd);
                 }
                 inline bool hasnan(const DateTimeRange& range)
                 {
                     return std::isnan(range.m_TStart) || std::isnan(range.m_TEnd);
                 }
                 inline bool isPureShift(const DateTimeRange& range1, const DateTimeRange& range2)
                 {
                     return SciQLop::numeric::almost_equal<double>(range1.delta(), range2.delta(), 1)
                             && !SciQLop::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)&&
                             SciQLop::numeric::almost_equal<double>(range1.center(), range2.center(),1);
                 }
                 /**
                  * @brief computeTransformation such as range2 = zoom*range1 + shift
                  * @param range1
                  * @param range2
                  * @return trnaformation applied to range1 to get range2 or an object of type
                  * InvalidDateTimeRangeTransformation if the transformation has NaN or forbiden values
                  */
                 inline std::optional<DateTimeRangeTransformation>
                 computeTransformation(const DateTimeRange& range1, const DateTimeRange& range2)
                 {
                     std::optional<DateTimeRangeTransformation> transformation;
                     double zoom = range2.delta()/range1.delta();
                     Seconds<double> shift = range2.center() - (range1*zoom).center();
                     bool zoomValid = zoom!=0. && !std::isnan(zoom) && !std::isinf(zoom);
                     bool shiftValid = !std::isnan(shift.value) && !std::isinf(shift.value);
                     if(zoomValid && shiftValid)
                         transformation = DateTimeRangeTransformation{zoom, shift};
                     return transformation;
                 }
             }
             #endif // SCIQLOP_DATETIMERANGEHELPER_H

include/Variable/Variable.h +2 0

             #ifndef SCIQLOP_VARIABLE_H
             #define SCIQLOP_VARIABLE_H
+            #include <optional>
             #include <QLoggingCategory>
             #include <QObject>
             #include <QUuid>
             #include <QReadWriteLock>
             #include "CoreGlobal.h"
             #include <Data/DataSeriesIterator.h>
             #include <Data/DataSeriesType.h>
             #include <Data/DateTimeRange.h>
             #include <Common/deprecate.h>
             #include <Common/MetaTypes.h>
             #include <Common/spimpl.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_Variable)
             class IDataSeries;
             class QString;
             /**
              * @brief The Variable class represents a variable in SciQlop.
              */
             class SCIQLOP_CORE_EXPORT Variable : public QObject {
                 Q_OBJECT
             public:
                 explicit Variable(const QString &name, const QVariantHash &metadata = {});
                 /// Copy ctor
                 explicit Variable(const Variable &other);
                 std::shared_ptr<Variable> clone() const;
                 QString name() const noexcept;
                 void setName(const QString &name) noexcept;
                 DateTimeRange range() const noexcept;
                 void setRange(const DateTimeRange &range, bool notify=false) noexcept;
                 DateTimeRange cacheRange() const noexcept;
                 void setCacheRange(const DateTimeRange &cacheRange) noexcept;
                 /// @return the number of points hold by the variable. The number of points is updated each time
                 /// the data series changes
                 unsigned int nbPoints() const noexcept;
                 /// Returns the real range of the variable, i.e. the min and max x-axis values of the data
                 /// series between the range of the variable. The real range is updated each time the variable
                 /// range or the data series changed
                 /// @return the real range, invalid range if the data series is null or empty
                 /// @sa setDataSeries()
                 /// @sa setRange()
                 std::optional<DateTimeRange> realRange() const noexcept;
                 /// @return the data of the variable, nullptr if there is no data
                 std::shared_ptr<IDataSeries> dataSeries() const noexcept;
                 /// @return the type of data that the variable holds
                 DataSeriesType type() const noexcept;
                 QVariantHash metadata() const noexcept;
                 void updateData(const std::vector<IDataSeries*>& dataSeries,
                                 const DateTimeRange& newRange, const DateTimeRange& newCacheRange,
                                 bool notify=true);
             DEPRECATE(
                 bool contains(const DateTimeRange &range) const noexcept;
                 bool intersect(const DateTimeRange &range) const noexcept;
                 bool isInside(const DateTimeRange &range) const noexcept;
                 bool cacheContains(const DateTimeRange &range) const noexcept;
                 bool cacheIntersect(const DateTimeRange &range) const noexcept;
                 bool cacheIsInside(const DateTimeRange &range) const noexcept;
                 QVector<DateTimeRange> provideNotInCacheRangeList(const DateTimeRange &range) const noexcept;
                 QVector<DateTimeRange> provideInCacheRangeList(const DateTimeRange &range) const noexcept;
                 void mergeDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept;
                 static QVector<DateTimeRange> provideNotInCacheRangeList(const DateTimeRange &oldRange,
                                                                          const DateTimeRange &nextRange);
                 static QVector<DateTimeRange> provideInCacheRangeList(const DateTimeRange &oldRange,
                                                                       const DateTimeRange &nextRange);
                 )
                 operator QUuid() {return _uuid;}
                 QUuid ID(){return _uuid;}
             signals:
                 void updated();
                 DEPRECATE(
                         /// Signal emitted when when the data series of the variable is loaded for the first time
                         void dataInitialized();
                 )
                 private:
                     class VariablePrivate;
                 spimpl::unique_impl_ptr<VariablePrivate> impl;
                 QUuid _uuid;
                 QReadWriteLock m_lock;
             };
             // Required for using shared_ptr in signals/slots
             SCIQLOP_REGISTER_META_TYPE(VARIABLE_PTR_REGISTRY, std::shared_ptr<Variable>)
             SCIQLOP_REGISTER_META_TYPE(VARIABLE_PTR_VECTOR_REGISTRY, QVector<std::shared_ptr<Variable> >)
             #endif // SCIQLOP_VARIABLE_H

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