UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-26 17:20:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/graph/values_controller] Define numberOfColumnsForRecord

Browse Source
This commit is contained in:
Ruben Dashyan
2019-08-23 17:58:46 +02:00
parent b0d7344d6b
commit 580f0f79f5
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/graph/values/values_controller.cpp
View File

@@ -69,23 +69,21 @@ Ion::Storage::Record ValuesController::recordAtColumn(int i, bool * isDerivative
int index = 1;
for (int k = 0; k < functionStore()->numberOfActiveFunctions(); k++) {
Ion::Storage::Record record = functionStore()->activeRecordAtIndex(k);
ExpiringPointer<CartesianFunction> f = functionStore()->modelForRecord(record);
if (i == index) {
if (index <= i && i < index + numberOfColumnsForRecord(record)) {
*isDerivative = i != index;
return record;
}
index++;
if (f->displayDerivative()) {
if (i == index) {
*isDerivative = true;
return record;
}
index++;
}
index += numberOfColumnsForRecord(record);
}
assert(false);
return nullptr;
}
int ValuesController::numberOfColumnsForRecord(Ion::Storage::Record record) const {
ExpiringPointer<CartesianFunction> f = functionStore()->modelForRecord(record);
return 1 + f->displayDerivative();
}
int ValuesController::maxNumberOfCells() {
return k_maxNumberOfCells;
}
@@ -130,8 +128,8 @@ double ValuesController::evaluationOfAbscissaAtColumn(double abscissa, int colum
void ValuesController::updateNumberOfColumns() {
int result = 1;
for (int i = 0; i < functionStore()->numberOfActiveFunctions(); i++) {
ExpiringPointer<CartesianFunction> f = functionStore()->modelForRecord(functionStore()->activeRecordAtIndex(i));
result += 1 + f->displayDerivative();
Ion::Storage::Record record = functionStore()->activeRecordAtIndex(i);
result += numberOfColumnsForRecord(record);
}
m_numberOfColumns = result;
}