##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SciQLop-fork
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Merge pull request 292 from SCIQLOP-Initialisation develop...
leroux -
r765:a6dacc853f4a merge
parent child
Show More
Show file before | Show file after | Hide comments
@@ -22,7 +22,11 public:
22 22
23 23 virtual ~SqpIterator() noexcept = default;
24 24 SqpIterator(const SqpIterator &) = default;
25 SqpIterator &operator=(SqpIterator other) { swap(m_CurrentValue, other.m_CurrentValue); }
25 SqpIterator &operator=(SqpIterator other)
26 {
27 swap(m_CurrentValue, other.m_CurrentValue);
28 return *this;
29 }
26 30
27 31 SqpIterator &operator++()
28 32 {
Show file before | Show file after | Hide comments
@@ -19,7 +19,6 DataSeriesIteratorValue &DataSeriesIteratorValue::operator=(DataSeriesIteratorVa
19 19
20 20 int DataSeriesIteratorValue::distance(const DataSeriesIteratorValue &other) const
21 21 {
22 auto dist = m_Impl->distance(*other.m_Impl);
23 22 return m_Impl->distance(*other.m_Impl);
24 23 }
25 24
Show file before | Show file after | Hide comments
@@ -574,8 +574,13 void VariableController::VariableControllerPrivate::processRequest(std::shared_p
574 574
575 575 auto varStrategyRangesRequested
576 576 = m_VariableCacheStrategy->computeStrategyRanges(var->range(), rangeRequested);
577 auto notInCacheRangeList = var->provideNotInCacheRangeList(varStrategyRangesRequested.second);
578 auto inCacheRangeList = var->provideInCacheRangeList(varStrategyRangesRequested.second);
577
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 585 if (!notInCacheRangeList.empty()) {
581 586 varRequest.m_RangeRequested = varStrategyRangesRequested.first;
Show file before | Show file after | Hide comments
@@ -94,18 +94,22 public:
94 94 auto variableModel = sqpApp->variableController().variableModel();
95 95 variableModel->abortProgress(index);
96 96 }
97 return true;
97 98 }
98 99 else {
99 QStyledItemDelegate::editorEvent(event, model, option, index);
100 return QStyledItemDelegate::editorEvent(event, model, option, index);
100 101 }
101 102 }
102 103 else {
103 QStyledItemDelegate::editorEvent(event, model, option, index);
104 return QStyledItemDelegate::editorEvent(event, model, option, index);
104 105 }
105 106 }
106 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