UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/graph/values_controller] Factor with plotTypeAtColumn

Browse Source
This commit is contained in:
Ruben Dashyan
2019-09-04 10:08:45 +02:00
parent 157edcd18c
commit a8b469cc65
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,10 +65,7 @@ void ValuesController::willDisplayCellAtLocation(HighlightCell * cell, int i, in
}
int ValuesController::typeAtLocation(int i, int j) {
int plotTypeIndex = 0;
while (plotTypeIndex < CartesianFunction::k_numberOfPlotTypes && i >= m_numberOfColumnsForType[plotTypeIndex]) {
i -= m_numberOfColumnsForType[plotTypeIndex++];
}
plotTypeAtColumn(&i);
return Shared::ValuesController::typeAtLocation(i, j);
}
@@ -86,11 +83,7 @@ Ion::Storage::Record ValuesController::recordAtColumn(int i) {
Ion::Storage::Record ValuesController::recordAtColumn(int i, bool * isDerivative) {
assert(typeAtLocation(i, 0) == k_functionTitleCellType);
int plotTypeIndex = 0;
while (plotTypeIndex < CartesianFunction::k_numberOfPlotTypes && i >= m_numberOfColumnsForType[plotTypeIndex]) {
i -= m_numberOfColumnsForType[plotTypeIndex++];
}
CartesianFunction::PlotType plotType = static_cast<CartesianFunction::PlotType>(plotTypeIndex);
CartesianFunction::PlotType plotType = plotTypeAtColumn(&i);
int index = 1;
for (int k = 0; k < functionStore()->numberOfActiveFunctionsOfType(plotType); k++) {
Ion::Storage::Record record = functionStore()->activeRecordOfTypeAtIndex(plotType, k);
@@ -118,6 +111,15 @@ Shared::Interval * ValuesController::intervalAtColumn(int columnIndex) {
return App::app()->interval();
}
CartesianFunction::PlotType ValuesController::plotTypeAtColumn(int * i) const {
int plotTypeIndex = 0;
while (plotTypeIndex < CartesianFunction::k_numberOfPlotTypes && *i >= m_numberOfColumnsForType[plotTypeIndex]) {
*i -= m_numberOfColumnsForType[plotTypeIndex++];
}
assert(plotTypeIndex < CartesianFunction::k_numberOfPlotTypes);
return static_cast<CartesianFunction::PlotType>(plotTypeIndex);
}
int ValuesController::maxNumberOfCells() {
return k_maxNumberOfCells;
}