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] WIP: display IntegerListController when clicking on a

Browse Source 
burger view of an integer input
This commit is contained in:
Émilie Feral
2019-12-23 17:30:24 +01:00
committed by Léa Saviot
parent 51d5fc0473
commit 714e5f12d9
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/calculation/history_controller.cpp
View File

@@ -70,16 +70,21 @@ bool HistoryController::handleEvent(Ion::Events::Event event) {
ScrollableExactApproximateExpressionsView::SubviewPosition outputSubviewPosition = selectedCell->outputView()->selectedSubviewPosition();
if (outputSubviewPosition == ScrollableExactApproximateExpressionsView::SubviewPosition::Left) {
Expression::AdditionalInformationType additionalInfoType = selectedCell->additionalInformationType();
ViewController * vc = nullptr;
/* TODO
* Controller * c = additionalInformationType ? graphController : listController?
* m_controller->setType(additionalInformationType)
* m_controller->setCalculation()...*/
* Faire un parent commun à tous les controllers qui sait faire setExpression */
if (additionalInfoType == Expression::AdditionalInformationType::Complex) {
m_complexController.setExpression(calculation->input());
Container::activeApp()->displayModalViewController(&m_complexController, 0.f, 0.f, Metric::CommonTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
vc = &m_complexController;
} else if (additionalInfoType == Expression::AdditionalInformationType::Trigonometry) {
m_trigonometryController.setExpression(calculation->input());
Container::activeApp()->displayModalViewController(&m_trigonometryController, 0.f, 0.f, Metric::CommonTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
vc = &m_trigonometryController;
} else if (additionalInfoType == Expression::AdditionalInformationType::Integer) {
m_integerController.setExpression(calculation->input());
vc = &m_integerController;
}
if (vc) {
Container::activeApp()->displayModalViewController(vc, 0.f, 0.f, Metric::CommonTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
}
} else {
m_selectableTableView.deselectTable();