| @@ -22,7 +22,11 public: | |||||
| 22 |
|
22 | |||
| 23 | virtual ~SqpIterator() noexcept = default; |
|
23 | virtual ~SqpIterator() noexcept = default; | |
| 24 | SqpIterator(const SqpIterator &) = default; |
|
24 | SqpIterator(const SqpIterator &) = default; | |
| 25 |
SqpIterator &operator=(SqpIterator other) |
|
25 | SqpIterator &operator=(SqpIterator other) | |
|
|
26 | { | |||
|
|
27 | swap(m_CurrentValue, other.m_CurrentValue); | |||
|
|
28 | return *this; | |||
|
|
29 | } | |||
| 26 |
|
30 | |||
| 27 | SqpIterator &operator++() |
|
31 | SqpIterator &operator++() | |
| 28 | { |
|
32 | { | |
| @@ -19,7 +19,6 DataSeriesIteratorValue &DataSeriesIteratorValue::operator=(DataSeriesIteratorVa | |||||
| 19 |
|
19 | |||
| 20 | int DataSeriesIteratorValue::distance(const DataSeriesIteratorValue &other) const |
|
20 | int DataSeriesIteratorValue::distance(const DataSeriesIteratorValue &other) const | |
| 21 | { |
|
21 | { | |
| 22 | auto dist = m_Impl->distance(*other.m_Impl); |
|
|||
| 23 | return m_Impl->distance(*other.m_Impl); |
|
22 | return m_Impl->distance(*other.m_Impl); | |
| 24 | } |
|
23 | } | |
| 25 |
|
24 | |||
| @@ -574,8 +574,13 void VariableController::VariableControllerPrivate::processRequest(std::shared_p | |||||
| 574 |
|
574 | |||
| 575 | auto varStrategyRangesRequested |
|
575 | auto varStrategyRangesRequested | |
| 576 | = m_VariableCacheStrategy->computeStrategyRanges(var->range(), rangeRequested); |
|
576 | = m_VariableCacheStrategy->computeStrategyRanges(var->range(), rangeRequested); | |
| 577 | auto notInCacheRangeList = var->provideNotInCacheRangeList(varStrategyRangesRequested.second); |
|
577 | ||
| 578 |
auto |
|
578 | auto notInCacheRangeList = QVector<SqpRange>{varStrategyRangesRequested.second}; | |
|
|
579 | auto inCacheRangeList = QVector<SqpRange>{}; | |||
|
|
580 | if (m_VarIdToVarRequestIdQueueMap.find(varId) == m_VarIdToVarRequestIdQueueMap.cend()) { | |||
|
|
581 | notInCacheRangeList = var->provideNotInCacheRangeList(varStrategyRangesRequested.second); | |||
|
|
582 | inCacheRangeList = var->provideInCacheRangeList(varStrategyRangesRequested.second); | |||
|
|
583 | } | |||
| 579 |
|
584 | |||
| 580 | if (!notInCacheRangeList.empty()) { |
|
585 | if (!notInCacheRangeList.empty()) { | |
| 581 | varRequest.m_RangeRequested = varStrategyRangesRequested.first; |
|
586 | varRequest.m_RangeRequested = varStrategyRangesRequested.first; | |
| @@ -94,18 +94,22 public: | |||||
| 94 | auto variableModel = sqpApp->variableController().variableModel(); |
|
94 | auto variableModel = sqpApp->variableController().variableModel(); | |
| 95 | variableModel->abortProgress(index); |
|
95 | variableModel->abortProgress(index); | |
| 96 | } |
|
96 | } | |
|
|
97 | return true; | |||
| 97 | } |
|
98 | } | |
| 98 | else { |
|
99 | else { | |
| 99 | QStyledItemDelegate::editorEvent(event, model, option, index); |
|
100 | return QStyledItemDelegate::editorEvent(event, model, option, index); | |
| 100 | } |
|
101 | } | |
| 101 | } |
|
102 | } | |
| 102 | else { |
|
103 | else { | |
| 103 | QStyledItemDelegate::editorEvent(event, model, option, index); |
|
104 | return QStyledItemDelegate::editorEvent(event, model, option, index); | |
| 104 | } |
|
105 | } | |
| 105 | } |
|
106 | } | |
| 106 | else { |
|
107 | else { | |
| 107 | QStyledItemDelegate::editorEvent(event, model, option, index); |
|
108 | return QStyledItemDelegate::editorEvent(event, model, option, index); | |
| 108 | } |
|
109 | } | |
|
|
110 | ||||
|
|
111 | ||||
|
|
112 | return QStyledItemDelegate::editorEvent(event, model, option, index); | |||
| 109 | } |
|
113 | } | |
| 110 | }; |
|
114 | }; | |
| 111 |
|
115 | |||
General Comments 0
You need to be logged in to leave comments.
Login now