UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/calculation][poincare] AdditionalInformationType is determined

Browse Source 
from both input and output expressions of a Calculation
This commit is contained in:
Émilie Feral
2020-01-16 09:50:07 +01:00
committed by Léa Saviot
parent be6f11208f
commit 398b529811
9 changed files with 87 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/calculation/history_controller.cpp
View File

@@ -72,19 +72,21 @@ bool HistoryController::handleEvent(Ion::Events::Event event) {
} else {
ScrollableExactApproximateExpressionsView::SubviewPosition outputSubviewPosition = selectedCell->outputView()->selectedSubviewPosition();
if (outputSubviewPosition == ScrollableExactApproximateExpressionsView::SubviewPosition::Left) {
Expression::AdditionalInformationType additionalInfoType = selectedCell->additionalInformationType();
Calculation::AdditionalInformationType additionalInfoType = selectedCell->additionalInformationType();
ListController * vc = nullptr;
if (additionalInfoType == Expression::AdditionalInformationType::Complex) {
Expression e = calculationAtIndex(focusRow)->exactOutput();
if (additionalInfoType == Calculation::AdditionalInformationType::Complex) {
vc = &m_complexController;
} else if (additionalInfoType == Expression::AdditionalInformationType::Trigonometry) {
} else if (additionalInfoType == Calculation::AdditionalInformationType::Trigonometry) {
vc = &m_trigonometryController;
} else if (additionalInfoType == Expression::AdditionalInformationType::Integer) {
e = calculationAtIndex(focusRow)->input();
} else if (additionalInfoType == Calculation::AdditionalInformationType::Integer) {
vc = &m_integerController;
} else if (additionalInfoType == Expression::AdditionalInformationType::Rational) {
} else if (additionalInfoType == Calculation::AdditionalInformationType::Rational) {
vc = &m_rationalController;
}
if (vc) {
vc->setExpression(calculationAtIndex(focusRow)->input());
vc->setExpression(e);
Container::activeApp()->displayModalViewController(vc, 0.f, 0.f, Metric::CommonTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
}
} else {