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

[calculation] Do not memoize the expression layouts but the expressions

Browse Source 
final height to avoid overflowing the heap. The expression layouts are
kept in the cell which are fewer then the number of calculations
This commit is contained in:
Émilie Feral
2018-05-16 17:26:40 +02:00
committed by EmilieNumworks
parent a67f422ab7
commit 1108ef21db
5 changed files with 80 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/calculation/history_controller.cpp
View File

@@ -158,17 +158,8 @@ KDCoordinate HistoryController::rowHeight(int j) {
return 0;
}
Calculation * calculation = m_calculationStore->calculationAtIndex(j);
KDCoordinate inputHeight = calculation->inputLayout()->size().height();
App * calculationApp = (App *)app();
Poincare::ExpressionLayout * approximateLayout = calculation->approximateOutputLayout(calculationApp->localContext());
KDCoordinate approximateOutputHeight = approximateLayout->size().height();
if (calculation->shouldOnlyDisplayApproximateOutput(calculationApp->localContext())) {
return inputHeight + approximateOutputHeight + 3*HistoryViewCell::k_digitVerticalMargin;
}
Poincare::ExpressionLayout * exactLayout = calculation->exactOutputLayout(calculationApp->localContext());
KDCoordinate exactOutputHeight = exactLayout->size().height();
KDCoordinate outputHeight = max(exactLayout->baseline(), approximateLayout->baseline()) + max(exactOutputHeight-exactLayout->baseline(), approximateOutputHeight-approximateLayout->baseline());
return inputHeight + outputHeight + 3*HistoryViewCell::k_digitVerticalMargin;
return calculation->height(calculationApp->localContext()) + 3*HistoryViewCell::k_digitVerticalMargin;
}
KDCoordinate HistoryController::cumulatedHeightFromIndex(int j) {