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/calculation] Calculation::DisplayOutput can be Exact/Approx/Both

Browse Source
This commit is contained in:
Léa Saviot
2019-04-08 15:25:58 +02:00
committed by Émilie Feral
parent 7b426adf5b
commit 6f7fe5089a
4 changed files with 77 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/calculation/calculation.cpp
View File

@@ -64,13 +64,15 @@ KDCoordinate Calculation::height(Context * context) {
KDCoordinate inputHeight = inputLayout.layoutSize().height();
Layout approximateLayout = createApproximateOutputLayout(context);
Layout exactLayout = createExactOutputLayout();
if (shouldOnlyDisplayExactOutput()) {
DisplayOutput display = displayOutput(context);
if (display == DisplayOutput::ExactOnly) {
KDCoordinate exactOutputHeight = exactLayout.layoutSize().height();
m_height = inputHeight+exactOutputHeight;
} else if (shouldOnlyDisplayApproximateOutput(context)) {
} else if (display == DisplayOutput::ApproximateOnly) {
KDCoordinate approximateOutputHeight = approximateLayout.layoutSize().height();
m_height = inputHeight+approximateOutputHeight;
} else {
assert(display == DisplayOutput::ExactAndApproximate);
KDCoordinate approximateOutputHeight = approximateLayout.layoutSize().height();
KDCoordinate exactOutputHeight = exactLayout.layoutSize().height();
KDCoordinate outputHeight = maxCoordinate(exactLayout.baseline(), approximateLayout.baseline()) + maxCoordinate(exactOutputHeight-exactLayout.baseline(), approximateOutputHeight-approximateLayout.baseline());
@@ -152,21 +154,23 @@ Layout Calculation::createApproximateOutputLayout(Context * context) {
return PoincareHelpers::CreateLayout(approximateOutput(context));
}
bool Calculation::shouldOnlyDisplayApproximateOutput(Context * context) {
Calculation::DisplayOutput Calculation::displayOutput(Context * context) {
if (shouldOnlyDisplayExactOutput()) {
return false;
return DisplayOutput::ExactOnly;
}
bool approximateOnly = false;
if (strcmp(m_exactOutputText, m_approximateOutputText) == 0) {
/* If the exact and approximate results' texts are equal and their layouts
* too, do not display the exact result. If the two layouts are not equal
* because of the number of significant digits, we display both. */
return exactAndApproximateDisplayedOutputsAreEqual(context) == Calculation::EqualSign::Equal;
}
if (strcmp(m_exactOutputText, Undefined::Name()) == 0 || strcmp(m_approximateOutputText, Unreal::Name()) == 0) {
approximateOnly = exactAndApproximateDisplayedOutputsAreEqual(context) == Calculation::EqualSign::Equal;
} else if (strcmp(m_exactOutputText, Undefined::Name()) == 0 || strcmp(m_approximateOutputText, Unreal::Name()) == 0) {
// If the approximate result is 'unreal' or the exact result is 'undef'
return true;
approximateOnly = true;
} else {
approximateOnly = input().isApproximate(*context) || exactOutput().isApproximate(*context);
}
return input().isApproximate(*context) || exactOutput().isApproximate(*context);
return approximateOnly ? DisplayOutput::ApproximateOnly : DisplayOutput::ExactAndApproximate;
}
bool Calculation::shouldOnlyDisplayExactOutput() {