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

[poincare] Change names: LayoutReference-->Layout

Browse Source
This commit is contained in:
Émilie Feral
2018-09-18 16:28:39 +02:00
parent f5298650a7
commit 365b145cf3
277 changed files with 1654 additions and 1671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/calculation/calculation.cpp
View File

@@ -42,14 +42,14 @@ void Calculation::setContent(const char * c, Context * context, Expression ansEx
KDCoordinate Calculation::height(Context * context) {
if (m_height < 0) {
LayoutReference inputLayout = createInputLayout();
Layout inputLayout = createInputLayout();
KDCoordinate inputHeight = inputLayout.layoutSize().height();
LayoutReference approximateLayout = createApproximateOutputLayout(context);
Layout approximateLayout = createApproximateOutputLayout(context);
KDCoordinate approximateOutputHeight = approximateLayout.layoutSize().height();
if (shouldOnlyDisplayApproximateOutput(context)) {
m_height = inputHeight+approximateOutputHeight;
} else {
LayoutReference exactLayout = createExactOutputLayout(context);
Layout exactLayout = createExactOutputLayout(context);
KDCoordinate exactOutputHeight = exactLayout.layoutSize().height();
KDCoordinate outputHeight = max(exactLayout.baseline(), approximateLayout.baseline()) + max(exactOutputHeight-exactLayout.baseline(), approximateOutputHeight-approximateLayout.baseline());
m_height = inputHeight + outputHeight;
@@ -77,7 +77,7 @@ Expression Calculation::input() {
return m_input;
}
LayoutReference Calculation::createInputLayout() {
Layout Calculation::createInputLayout() {
return input().createLayout(Preferences::PrintFloatMode::Decimal, PrintFloat::k_numberOfStoredSignificantDigits);
}
@@ -118,7 +118,7 @@ Expression Calculation::exactOutput(Context * context) {
return m_exactOutput;
}
LayoutReference Calculation::createExactOutputLayout(Context * context) {
Layout Calculation::createExactOutputLayout(Context * context) {
return PoincareHelpers::CreateLayout(exactOutput(context));
}
@@ -132,7 +132,7 @@ Expression Calculation::approximateOutput(Context * context) {
return m_approximateOutput;
}
LayoutReference Calculation::createApproximateOutputLayout(Context * context) {
Layout Calculation::createApproximateOutputLayout(Context * context) {
return PoincareHelpers::CreateLayout(approximateOutput(context));
}