@@ -1,65 +1,66 | |||||
1 | #ifndef SCIQLOP_VARIABLE_H |
|
1 | #ifndef SCIQLOP_VARIABLE_H | |
2 | #define SCIQLOP_VARIABLE_H |
|
2 | #define SCIQLOP_VARIABLE_H | |
3 |
|
3 | |||
4 | #include "CoreGlobal.h" |
|
4 | #include "CoreGlobal.h" | |
5 |
|
5 | |||
6 | #include <Data/SqpRange.h> |
|
6 | #include <Data/SqpRange.h> | |
7 |
|
7 | |||
8 | #include <QLoggingCategory> |
|
8 | #include <QLoggingCategory> | |
9 | #include <QObject> |
|
9 | #include <QObject> | |
10 |
|
10 | |||
11 | #include <Common/MetaTypes.h> |
|
11 | #include <Common/MetaTypes.h> | |
12 | #include <Common/spimpl.h> |
|
12 | #include <Common/spimpl.h> | |
13 |
|
13 | |||
14 | Q_DECLARE_LOGGING_CATEGORY(LOG_Variable) |
|
14 | Q_DECLARE_LOGGING_CATEGORY(LOG_Variable) | |
15 |
|
15 | |||
16 | class IDataSeries; |
|
16 | class IDataSeries; | |
17 | class QString; |
|
17 | class QString; | |
18 |
|
18 | |||
19 | /** |
|
19 | /** | |
20 | * @brief The Variable class represents a variable in SciQlop. |
|
20 | * @brief The Variable class represents a variable in SciQlop. | |
21 | */ |
|
21 | */ | |
22 | class SCIQLOP_CORE_EXPORT Variable : public QObject { |
|
22 | class SCIQLOP_CORE_EXPORT Variable : public QObject { | |
23 |
|
23 | |||
24 | Q_OBJECT |
|
24 | Q_OBJECT | |
25 |
|
25 | |||
26 | public: |
|
26 | public: | |
27 | explicit Variable(const QString &name, const SqpRange &dateTime, |
|
27 | explicit Variable(const QString &name, const SqpRange &dateTime, | |
28 | const QVariantHash &metadata = {}); |
|
28 | const QVariantHash &metadata = {}); | |
29 |
|
29 | |||
30 | QString name() const noexcept; |
|
30 | QString name() const noexcept; | |
31 | SqpRange range() const noexcept; |
|
31 | SqpRange range() const noexcept; | |
32 | void setRange(const SqpRange &range) noexcept; |
|
32 | void setRange(const SqpRange &range) noexcept; | |
33 | SqpRange cacheRange() const noexcept; |
|
33 | SqpRange cacheRange() const noexcept; | |
34 | void setCacheRange(const SqpRange &cacheRange) noexcept; |
|
34 | void setCacheRange(const SqpRange &cacheRange) noexcept; | |
35 |
|
35 | |||
36 | /// @return the data of the variable, nullptr if there is no data |
|
36 | /// @return the data of the variable, nullptr if there is no data | |
37 | std::shared_ptr<IDataSeries> dataSeries() const noexcept; |
|
37 | std::shared_ptr<IDataSeries> dataSeries() const noexcept; | |
38 |
|
38 | |||
39 | QVariantHash metadata() const noexcept; |
|
39 | QVariantHash metadata() const noexcept; | |
40 |
|
40 | |||
41 | bool contains(const SqpRange &range) const noexcept; |
|
41 | bool contains(const SqpRange &range) const noexcept; | |
42 | bool intersect(const SqpRange &range) const noexcept; |
|
42 | bool intersect(const SqpRange &range) const noexcept; | |
43 | bool isInside(const SqpRange &range) const noexcept; |
|
43 | bool isInside(const SqpRange &range) const noexcept; | |
44 |
|
44 | |||
45 | bool cacheContains(const SqpRange &range) const noexcept; |
|
45 | bool cacheContains(const SqpRange &range) const noexcept; | |
46 | bool cacheIntersect(const SqpRange &range) const noexcept; |
|
46 | bool cacheIntersect(const SqpRange &range) const noexcept; | |
47 | bool cacheIsInside(const SqpRange &range) const noexcept; |
|
47 | bool cacheIsInside(const SqpRange &range) const noexcept; | |
48 |
|
48 | |||
49 | QVector<SqpRange> provideNotInCacheRangeList(const SqpRange &range) const noexcept; |
|
49 | QVector<SqpRange> provideNotInCacheRangeList(const SqpRange &range) const noexcept; | |
|
50 | QVector<SqpRange> provideInCacheRangeList(const SqpRange &range) const noexcept; | |||
50 | void setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept; |
|
51 | void setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept; | |
51 | void mergeDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept; |
|
52 | void mergeDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept; | |
52 |
|
53 | |||
53 | signals: |
|
54 | signals: | |
54 | void updated(); |
|
55 | void updated(); | |
55 |
|
56 | |||
56 | private: |
|
57 | private: | |
57 | class VariablePrivate; |
|
58 | class VariablePrivate; | |
58 | spimpl::unique_impl_ptr<VariablePrivate> impl; |
|
59 | spimpl::unique_impl_ptr<VariablePrivate> impl; | |
59 | }; |
|
60 | }; | |
60 |
|
61 | |||
61 | // Required for using shared_ptr in signals/slots |
|
62 | // Required for using shared_ptr in signals/slots | |
62 | SCIQLOP_REGISTER_META_TYPE(VARIABLE_PTR_REGISTRY, std::shared_ptr<Variable>) |
|
63 | SCIQLOP_REGISTER_META_TYPE(VARIABLE_PTR_REGISTRY, std::shared_ptr<Variable>) | |
63 | SCIQLOP_REGISTER_META_TYPE(VARIABLE_PTR_VECTOR_REGISTRY, QVector<std::shared_ptr<Variable> >) |
|
64 | SCIQLOP_REGISTER_META_TYPE(VARIABLE_PTR_VECTOR_REGISTRY, QVector<std::shared_ptr<Variable> >) | |
64 |
|
65 | |||
65 | #endif // SCIQLOP_VARIABLE_H |
|
66 | #endif // SCIQLOP_VARIABLE_H |
@@ -1,211 +1,243 | |||||
1 | #include "Variable/Variable.h" |
|
1 | #include "Variable/Variable.h" | |
2 |
|
2 | |||
3 | #include <Data/IDataSeries.h> |
|
3 | #include <Data/IDataSeries.h> | |
4 | #include <Data/SqpRange.h> |
|
4 | #include <Data/SqpRange.h> | |
5 |
|
5 | |||
6 | #include <QMutex> |
|
6 | #include <QMutex> | |
7 | #include <QReadWriteLock> |
|
7 | #include <QReadWriteLock> | |
8 | #include <QThread> |
|
8 | #include <QThread> | |
9 |
|
9 | |||
10 | Q_LOGGING_CATEGORY(LOG_Variable, "Variable") |
|
10 | Q_LOGGING_CATEGORY(LOG_Variable, "Variable") | |
11 |
|
11 | |||
12 | struct Variable::VariablePrivate { |
|
12 | struct Variable::VariablePrivate { | |
13 | explicit VariablePrivate(const QString &name, const SqpRange &dateTime, |
|
13 | explicit VariablePrivate(const QString &name, const SqpRange &dateTime, | |
14 | const QVariantHash &metadata) |
|
14 | const QVariantHash &metadata) | |
15 | : m_Name{name}, m_Range{dateTime}, m_Metadata{metadata}, m_DataSeries{nullptr} |
|
15 | : m_Name{name}, m_Range{dateTime}, m_Metadata{metadata}, m_DataSeries{nullptr} | |
16 | { |
|
16 | { | |
17 | } |
|
17 | } | |
18 |
|
18 | |||
19 | void lockRead() { m_Lock.lockForRead(); } |
|
19 | void lockRead() { m_Lock.lockForRead(); } | |
20 | void lockWrite() { m_Lock.lockForWrite(); } |
|
20 | void lockWrite() { m_Lock.lockForWrite(); } | |
21 | void unlock() { m_Lock.unlock(); } |
|
21 | void unlock() { m_Lock.unlock(); } | |
22 |
|
22 | |||
23 | QString m_Name; |
|
23 | QString m_Name; | |
24 |
|
24 | |||
25 | SqpRange m_Range; |
|
25 | SqpRange m_Range; | |
26 | SqpRange m_CacheRange; |
|
26 | SqpRange m_CacheRange; | |
27 | QVariantHash m_Metadata; |
|
27 | QVariantHash m_Metadata; | |
28 | std::shared_ptr<IDataSeries> m_DataSeries; |
|
28 | std::shared_ptr<IDataSeries> m_DataSeries; | |
29 |
|
29 | |||
30 | QReadWriteLock m_Lock; |
|
30 | QReadWriteLock m_Lock; | |
31 | }; |
|
31 | }; | |
32 |
|
32 | |||
33 | Variable::Variable(const QString &name, const SqpRange &dateTime, const QVariantHash &metadata) |
|
33 | Variable::Variable(const QString &name, const SqpRange &dateTime, const QVariantHash &metadata) | |
34 | : impl{spimpl::make_unique_impl<VariablePrivate>(name, dateTime, metadata)} |
|
34 | : impl{spimpl::make_unique_impl<VariablePrivate>(name, dateTime, metadata)} | |
35 | { |
|
35 | { | |
36 | } |
|
36 | } | |
37 |
|
37 | |||
38 | QString Variable::name() const noexcept |
|
38 | QString Variable::name() const noexcept | |
39 | { |
|
39 | { | |
40 | impl->lockRead(); |
|
40 | impl->lockRead(); | |
41 | auto name = impl->m_Name; |
|
41 | auto name = impl->m_Name; | |
42 | impl->unlock(); |
|
42 | impl->unlock(); | |
43 | return name; |
|
43 | return name; | |
44 | } |
|
44 | } | |
45 |
|
45 | |||
46 | SqpRange Variable::range() const noexcept |
|
46 | SqpRange Variable::range() const noexcept | |
47 | { |
|
47 | { | |
48 | impl->lockRead(); |
|
48 | impl->lockRead(); | |
49 | auto range = impl->m_Range; |
|
49 | auto range = impl->m_Range; | |
50 | impl->unlock(); |
|
50 | impl->unlock(); | |
51 | return range; |
|
51 | return range; | |
52 | } |
|
52 | } | |
53 |
|
53 | |||
54 | void Variable::setRange(const SqpRange &range) noexcept |
|
54 | void Variable::setRange(const SqpRange &range) noexcept | |
55 | { |
|
55 | { | |
56 | impl->lockWrite(); |
|
56 | impl->lockWrite(); | |
57 | impl->m_Range = range; |
|
57 | impl->m_Range = range; | |
58 | impl->unlock(); |
|
58 | impl->unlock(); | |
59 | } |
|
59 | } | |
60 |
|
60 | |||
61 | SqpRange Variable::cacheRange() const noexcept |
|
61 | SqpRange Variable::cacheRange() const noexcept | |
62 | { |
|
62 | { | |
63 | impl->lockRead(); |
|
63 | impl->lockRead(); | |
64 | auto cacheRange = impl->m_CacheRange; |
|
64 | auto cacheRange = impl->m_CacheRange; | |
65 | impl->unlock(); |
|
65 | impl->unlock(); | |
66 | return cacheRange; |
|
66 | return cacheRange; | |
67 | } |
|
67 | } | |
68 |
|
68 | |||
69 | void Variable::setCacheRange(const SqpRange &cacheRange) noexcept |
|
69 | void Variable::setCacheRange(const SqpRange &cacheRange) noexcept | |
70 | { |
|
70 | { | |
71 | impl->lockWrite(); |
|
71 | impl->lockWrite(); | |
72 | impl->m_CacheRange = cacheRange; |
|
72 | impl->m_CacheRange = cacheRange; | |
73 | impl->unlock(); |
|
73 | impl->unlock(); | |
74 | } |
|
74 | } | |
75 |
|
75 | |||
76 | void Variable::setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept |
|
76 | void Variable::setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept | |
77 | { |
|
77 | { | |
78 | qCDebug(LOG_Variable()) << "TORM Variable::setDataSeries" |
|
78 | qCDebug(LOG_Variable()) << "TORM Variable::setDataSeries" | |
79 | << QThread::currentThread()->objectName(); |
|
79 | << QThread::currentThread()->objectName(); | |
80 | if (!dataSeries) { |
|
80 | if (!dataSeries) { | |
81 | /// @todo ALX : log |
|
81 | /// @todo ALX : log | |
82 | return; |
|
82 | return; | |
83 | } |
|
83 | } | |
84 | impl->lockWrite(); |
|
84 | impl->lockWrite(); | |
85 | impl->m_DataSeries = dataSeries->clone(); |
|
85 | impl->m_DataSeries = dataSeries->clone(); | |
86 | impl->unlock(); |
|
86 | impl->unlock(); | |
87 | } |
|
87 | } | |
88 |
|
88 | |||
89 | void Variable::mergeDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept |
|
89 | void Variable::mergeDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept | |
90 | { |
|
90 | { | |
91 | qCDebug(LOG_Variable()) << "TORM Variable::mergeDataSeries" |
|
91 | qCDebug(LOG_Variable()) << "TORM Variable::mergeDataSeries" | |
92 | << QThread::currentThread()->objectName(); |
|
92 | << QThread::currentThread()->objectName(); | |
93 | if (!dataSeries) { |
|
93 | if (!dataSeries) { | |
94 | /// @todo ALX : log |
|
94 | /// @todo ALX : log | |
95 | return; |
|
95 | return; | |
96 | } |
|
96 | } | |
97 |
|
97 | |||
98 | // Add or merge the data |
|
98 | // Add or merge the data | |
99 | // Inits the data series of the variable |
|
99 | // Inits the data series of the variable | |
100 | impl->lockWrite(); |
|
100 | impl->lockWrite(); | |
101 | if (!impl->m_DataSeries) { |
|
101 | if (!impl->m_DataSeries) { | |
102 | impl->m_DataSeries = dataSeries->clone(); |
|
102 | impl->m_DataSeries = dataSeries->clone(); | |
103 | } |
|
103 | } | |
104 | else { |
|
104 | else { | |
105 | impl->m_DataSeries->merge(dataSeries.get()); |
|
105 | impl->m_DataSeries->merge(dataSeries.get()); | |
106 | } |
|
106 | } | |
107 | impl->unlock(); |
|
107 | impl->unlock(); | |
108 |
|
108 | |||
109 | // sub the data |
|
109 | // sub the data | |
110 | auto subData = this->dataSeries()->subDataSeries(this->cacheRange()); |
|
110 | auto subData = this->dataSeries()->subDataSeries(this->cacheRange()); | |
111 | qCDebug(LOG_Variable()) << "TORM: Variable::mergeDataSeries sub" << subData->range(); |
|
111 | qCDebug(LOG_Variable()) << "TORM: Variable::mergeDataSeries sub" << subData->range(); | |
112 | this->setDataSeries(subData); |
|
112 | this->setDataSeries(subData); | |
113 | qCDebug(LOG_Variable()) << "TORM: Variable::mergeDataSeries set" << this->dataSeries()->range(); |
|
113 | qCDebug(LOG_Variable()) << "TORM: Variable::mergeDataSeries set" << this->dataSeries()->range(); | |
114 | } |
|
114 | } | |
115 |
|
115 | |||
116 | std::shared_ptr<IDataSeries> Variable::dataSeries() const noexcept |
|
116 | std::shared_ptr<IDataSeries> Variable::dataSeries() const noexcept | |
117 | { |
|
117 | { | |
118 | impl->lockRead(); |
|
118 | impl->lockRead(); | |
119 | auto dataSeries = impl->m_DataSeries; |
|
119 | auto dataSeries = impl->m_DataSeries; | |
120 | impl->unlock(); |
|
120 | impl->unlock(); | |
121 |
|
121 | |||
122 | return dataSeries; |
|
122 | return dataSeries; | |
123 | } |
|
123 | } | |
124 |
|
124 | |||
125 | QVariantHash Variable::metadata() const noexcept |
|
125 | QVariantHash Variable::metadata() const noexcept | |
126 | { |
|
126 | { | |
127 | impl->lockRead(); |
|
127 | impl->lockRead(); | |
128 | auto metadata = impl->m_Metadata; |
|
128 | auto metadata = impl->m_Metadata; | |
129 | impl->unlock(); |
|
129 | impl->unlock(); | |
130 | return metadata; |
|
130 | return metadata; | |
131 | } |
|
131 | } | |
132 |
|
132 | |||
133 | bool Variable::contains(const SqpRange &range) const noexcept |
|
133 | bool Variable::contains(const SqpRange &range) const noexcept | |
134 | { |
|
134 | { | |
135 | impl->lockRead(); |
|
135 | impl->lockRead(); | |
136 | auto res = impl->m_Range.contains(range); |
|
136 | auto res = impl->m_Range.contains(range); | |
137 | impl->unlock(); |
|
137 | impl->unlock(); | |
138 | return res; |
|
138 | return res; | |
139 | } |
|
139 | } | |
140 |
|
140 | |||
141 | bool Variable::intersect(const SqpRange &range) const noexcept |
|
141 | bool Variable::intersect(const SqpRange &range) const noexcept | |
142 | { |
|
142 | { | |
143 |
|
143 | |||
144 | impl->lockRead(); |
|
144 | impl->lockRead(); | |
145 | auto res = impl->m_Range.intersect(range); |
|
145 | auto res = impl->m_Range.intersect(range); | |
146 | impl->unlock(); |
|
146 | impl->unlock(); | |
147 | return res; |
|
147 | return res; | |
148 | } |
|
148 | } | |
149 |
|
149 | |||
150 | bool Variable::isInside(const SqpRange &range) const noexcept |
|
150 | bool Variable::isInside(const SqpRange &range) const noexcept | |
151 | { |
|
151 | { | |
152 | impl->lockRead(); |
|
152 | impl->lockRead(); | |
153 | auto res = range.contains(SqpRange{impl->m_Range.m_TStart, impl->m_Range.m_TEnd}); |
|
153 | auto res = range.contains(SqpRange{impl->m_Range.m_TStart, impl->m_Range.m_TEnd}); | |
154 | impl->unlock(); |
|
154 | impl->unlock(); | |
155 | return res; |
|
155 | return res; | |
156 | } |
|
156 | } | |
157 |
|
157 | |||
158 | bool Variable::cacheContains(const SqpRange &range) const noexcept |
|
158 | bool Variable::cacheContains(const SqpRange &range) const noexcept | |
159 | { |
|
159 | { | |
160 | impl->lockRead(); |
|
160 | impl->lockRead(); | |
161 | auto res = impl->m_CacheRange.contains(range); |
|
161 | auto res = impl->m_CacheRange.contains(range); | |
162 | impl->unlock(); |
|
162 | impl->unlock(); | |
163 | return res; |
|
163 | return res; | |
164 | } |
|
164 | } | |
165 |
|
165 | |||
166 | bool Variable::cacheIntersect(const SqpRange &range) const noexcept |
|
166 | bool Variable::cacheIntersect(const SqpRange &range) const noexcept | |
167 | { |
|
167 | { | |
168 | impl->lockRead(); |
|
168 | impl->lockRead(); | |
169 | auto res = impl->m_CacheRange.intersect(range); |
|
169 | auto res = impl->m_CacheRange.intersect(range); | |
170 | impl->unlock(); |
|
170 | impl->unlock(); | |
171 | return res; |
|
171 | return res; | |
172 | } |
|
172 | } | |
173 |
|
173 | |||
174 | bool Variable::cacheIsInside(const SqpRange &range) const noexcept |
|
174 | bool Variable::cacheIsInside(const SqpRange &range) const noexcept | |
175 | { |
|
175 | { | |
176 | impl->lockRead(); |
|
176 | impl->lockRead(); | |
177 | auto res = range.contains(SqpRange{impl->m_CacheRange.m_TStart, impl->m_CacheRange.m_TEnd}); |
|
177 | auto res = range.contains(SqpRange{impl->m_CacheRange.m_TStart, impl->m_CacheRange.m_TEnd}); | |
178 | impl->unlock(); |
|
178 | impl->unlock(); | |
179 | return res; |
|
179 | return res; | |
180 | } |
|
180 | } | |
181 |
|
181 | |||
182 |
|
182 | |||
183 | QVector<SqpRange> Variable::provideNotInCacheRangeList(const SqpRange &range) const noexcept |
|
183 | QVector<SqpRange> Variable::provideNotInCacheRangeList(const SqpRange &range) const noexcept | |
184 | { |
|
184 | { | |
|
185 | // This code assume that cach in contigue. Can return 0, 1 or 2 SqpRange | |||
|
186 | ||||
185 | auto notInCache = QVector<SqpRange>{}; |
|
187 | auto notInCache = QVector<SqpRange>{}; | |
186 |
|
188 | |||
187 | if (!this->cacheContains(range)) { |
|
189 | if (!this->cacheContains(range)) { | |
188 | if (range.m_TEnd <= impl->m_CacheRange.m_TStart |
|
190 | if (range.m_TEnd <= impl->m_CacheRange.m_TStart | |
189 | || range.m_TStart >= impl->m_CacheRange.m_TEnd) { |
|
191 | || range.m_TStart >= impl->m_CacheRange.m_TEnd) { | |
190 | notInCache << range; |
|
192 | notInCache << range; | |
191 | } |
|
193 | } | |
192 | else if (range.m_TStart < impl->m_CacheRange.m_TStart |
|
194 | else if (range.m_TStart < impl->m_CacheRange.m_TStart | |
193 | && range.m_TEnd <= impl->m_CacheRange.m_TEnd) { |
|
195 | && range.m_TEnd <= impl->m_CacheRange.m_TEnd) { | |
194 | notInCache << SqpRange{range.m_TStart, impl->m_CacheRange.m_TStart}; |
|
196 | notInCache << SqpRange{range.m_TStart, impl->m_CacheRange.m_TStart}; | |
195 | } |
|
197 | } | |
196 | else if (range.m_TStart < impl->m_CacheRange.m_TStart |
|
198 | else if (range.m_TStart < impl->m_CacheRange.m_TStart | |
197 | && range.m_TEnd > impl->m_CacheRange.m_TEnd) { |
|
199 | && range.m_TEnd > impl->m_CacheRange.m_TEnd) { | |
198 | notInCache << SqpRange{range.m_TStart, impl->m_CacheRange.m_TStart} |
|
200 | notInCache << SqpRange{range.m_TStart, impl->m_CacheRange.m_TStart} | |
199 | << SqpRange{impl->m_CacheRange.m_TEnd, range.m_TEnd}; |
|
201 | << SqpRange{impl->m_CacheRange.m_TEnd, range.m_TEnd}; | |
200 | } |
|
202 | } | |
201 | else if (range.m_TStart < impl->m_CacheRange.m_TEnd) { |
|
203 | else if (range.m_TStart < impl->m_CacheRange.m_TEnd) { | |
202 | notInCache << SqpRange{impl->m_CacheRange.m_TEnd, range.m_TEnd}; |
|
204 | notInCache << SqpRange{impl->m_CacheRange.m_TEnd, range.m_TEnd}; | |
203 | } |
|
205 | } | |
204 | else { |
|
206 | else { | |
205 | qCCritical(LOG_Variable()) << tr("Detection of unknown case.") |
|
207 | qCCritical(LOG_Variable()) << tr("Detection of unknown case.") | |
206 | << QThread::currentThread(); |
|
208 | << QThread::currentThread(); | |
207 | } |
|
209 | } | |
208 | } |
|
210 | } | |
209 |
|
211 | |||
210 | return notInCache; |
|
212 | return notInCache; | |
211 | } |
|
213 | } | |
|
214 | ||||
|
215 | QVector<SqpRange> Variable::provideInCacheRangeList(const SqpRange &range) const noexcept | |||
|
216 | { | |||
|
217 | // This code assume that cach in contigue. Can return 0 or 1 SqpRange | |||
|
218 | ||||
|
219 | auto inCache = QVector<SqpRange>{}; | |||
|
220 | ||||
|
221 | ||||
|
222 | if (this->cacheContains(range)) { | |||
|
223 | if (range.m_TStart <= impl->m_CacheRange.m_TEnd | |||
|
224 | && range.m_TEnd >= impl->m_CacheRange.m_TEnd) { | |||
|
225 | inCache << SqpRange{range.m_TStart, impl->m_CacheRange.m_TEnd}; | |||
|
226 | } | |||
|
227 | ||||
|
228 | else if (range.m_TStart >= impl->m_CacheRange.m_TStart | |||
|
229 | && range.m_TEnd < impl->m_CacheRange.m_TEnd) { | |||
|
230 | inCache << range; | |||
|
231 | } | |||
|
232 | else if (range.m_TStart < impl->m_CacheRange.m_TStart | |||
|
233 | && range.m_TEnd >= impl->m_CacheRange.m_TStart) { | |||
|
234 | inCache << SqpRange{impl->m_CacheRange.m_TStart, range.m_TEnd}; | |||
|
235 | } | |||
|
236 | else { | |||
|
237 | qCCritical(LOG_Variable()) << tr("Detection of unknown case.") | |||
|
238 | << QThread::currentThread(); | |||
|
239 | } | |||
|
240 | } | |||
|
241 | ||||
|
242 | return inCache; | |||
|
243 | } |
General Comments 0
You need to be logged in to leave comments.
Login now