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/probability] Forbid impossible value in parameters and calculation

Browse Source 
parameters

Change-Id: I47aae775dc031d5b78d6995ca63f49d537848cb1
This commit is contained in:
Émilie Feral
2017-03-03 10:25:10 +01:00
committed by Romain Goyet
parent f636974c0f
commit 9b2bc019e4
9 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/probability/calculation_controller.cpp
View File

@@ -203,6 +203,14 @@ bool CalculationController::textFieldDidFinishEditing(TextField * textField, con
App * probaApp = (App *)app();
Context * globalContext = probaApp->container()->globalContext();
float floatBody = Expression::parse(text)->approximate(*globalContext);
if (m_calculation->type() != Calculation::Type::FiniteIntegral && m_highlightedSubviewIndex == 2) {
if (floatBody < 0.0f) {
floatBody = 0.0f;
}
if (floatBody > 1.0f) {
floatBody = 1.0f;
}
}
m_calculation->setParameterAtIndex(floatBody, m_highlightedSubviewIndex-1);
for (int k = 0; k < m_calculation->numberOfParameters(); k++) {
m_contentView.willDisplayEditableCellAtIndex(k);