##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » SciQLOPCore
RSS
Bump TimeSeries and few minor modifications...
jeandet -
r91:c4e273750e74
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,1 +1,1
1 Subproject commit 16093a64038da071e4dac879fc3fd2ec9fc21c5d
1 Subproject commit 1429ee8c3a60f059d192904cd4e857e8196c8347
Show file before | Show file after | Hide comments
@@ -30,8 +30,8 class SCIQLOP_CORE_EXPORT IDataProvider : public QObject
30 {
30 {
31 Q_OBJECT
31 Q_OBJECT
32 public:
32 public:
33 virtual ~IDataProvider() noexcept = default;
33 virtual ~IDataProvider() noexcept = default;
34 virtual std::shared_ptr<IDataProvider> clone() const = 0;
34 // virtual std::shared_ptr<IDataProvider> clone() const = 0;
35
35
36 // Synchronous call -> asyncGetData may be written for asynchronous get
36 // Synchronous call -> asyncGetData may be written for asynchronous get
37 virtual TimeSeries::ITimeSerie*
37 virtual TimeSeries::ITimeSerie*
Show file before | Show file after | Hide comments
@@ -46,8 +46,7 core_moc_headers = [
46 './include/Variable/VariableController2.h',
46 './include/Variable/VariableController2.h',
47 './include/Variable/Variable2.h',
47 './include/Variable/Variable2.h',
48 './include/Variable/VariableSynchronizationGroup2.h',
48 './include/Variable/VariableSynchronizationGroup2.h',
49 './include/Variable/private/VCTransaction.h',
49 './include/Variable/private/VCTransaction.h']
50 './include/Visualization/VisualizationController.h']
51
50
52
51
53
52
@@ -74,8 +73,7 core_sources = ['./src/Common/MimeTypesDef.cpp',
74 './src/Variable/VariableSynchronizationGroup2.cpp',
73 './src/Variable/VariableSynchronizationGroup2.cpp',
75 './src/Variable/Variable2.cpp',
74 './src/Variable/Variable2.cpp',
76 './src/Variable/VariableController2.cpp',
75 './src/Variable/VariableController2.cpp',
77 './src/Variable/VariableModel2.cpp',
76 './src/Variable/VariableModel2.cpp']
78 './src/Visualization/VisualizationController.cpp']
79
77
80
78
81 core_inc = include_directories(['include', 'include/Plugin'])
79 core_inc = include_directories(['include', 'include/Plugin'])
Show file before | Show file after | Hide comments
@@ -20,10 +20,10 public:
20 SimpleRange() = default;
20 SimpleRange() = default;
21
21
22 int callCounter = 0;
22 int callCounter = 0;
23 std::shared_ptr<IDataProvider> clone() const override
23 // std::shared_ptr<IDataProvider> clone() const override
24 {
24 // {
25 return std::make_shared<SimpleRange>();
25 // return std::make_shared<SimpleRange>();
26 }
26 // }
27
27
28 TimeSeries::ITimeSerie*
28 TimeSeries::ITimeSerie*
29 getData(const DataProviderParameters& parameters) override
29 getData(const DataProviderParameters& parameters) override
General Comments 0
You need to be logged in to leave comments. Login now