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/shared] Templatize FloatParameterController to handle float/double

Browse Source 
parameters.

Fix bug: when entering "e^234" as a parameter of a model keeping floats,
the FloatParameterController would accept the number (because e^234 is
defined in double) and store an undefined value in the model (because
e^234 is undefined in float).
This commit is contained in:
Émilie Feral
2019-09-02 11:48:43 +02:00
parent 77304040ad
commit 6de497c2ed
18 changed files with 71 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
apps/shared/float_parameter_controller.cpp
View File

@@ -8,7 +8,8 @@ using namespace Poincare;
namespace Shared {
FloatParameterController::FloatParameterController(Responder * parentResponder) :
template<typename T>
FloatParameterController<T>::FloatParameterController(Responder * parentResponder) :
ViewController(parentResponder),
m_selectableTableView(this, this, this),
m_okButton(&m_selectableTableView, I18n::Message::Ok, Invocation([](void * context, void * sender) {
@@ -19,7 +20,8 @@ FloatParameterController::FloatParameterController(Responder * parentResponder)
{
}
void FloatParameterController::didBecomeFirstResponder() {
template<typename T>
void FloatParameterController<T>::didBecomeFirstResponder() {
if (selectedRow() >= 0) {
int selRow = selectedRow();
selRow = selRow >= numberOfRows() ? numberOfRows()-1 : selRow;
@@ -30,7 +32,8 @@ void FloatParameterController::didBecomeFirstResponder() {
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
void FloatParameterController::viewWillAppear() {
template<typename T>
void FloatParameterController<T>::viewWillAppear() {
if (selectedRow() == -1 || selectedRow() == numberOfRows()-1) {
selectCellAtLocation(0, 0);
} else {
@@ -43,14 +46,16 @@ void FloatParameterController::viewWillAppear() {
m_selectableTableView.reloadData();
}
void FloatParameterController::willExitResponderChain(Responder * nextFirstResponder) {
template<typename T>
void FloatParameterController<T>::willExitResponderChain(Responder * nextFirstResponder) {
if (parentResponder() == nullptr) {
m_selectableTableView.deselectTable();
m_selectableTableView.scrollToCell(0,0);
}
}
bool FloatParameterController::handleEvent(Ion::Events::Event event) {
template<typename T>
bool FloatParameterController<T>::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Back) {
stackController()->pop();
return true;
@@ -58,49 +63,56 @@ bool FloatParameterController::handleEvent(Ion::Events::Event event) {
return false;
}
int FloatParameterController::typeAtLocation(int i, int j) {
template<typename T>
int FloatParameterController<T>::typeAtLocation(int i, int j) {
if (j == numberOfRows()-1) {
return 0;
}
return 1;
}
int FloatParameterController::reusableCellCount(int type) {
template<typename T>
int FloatParameterController<T>::reusableCellCount(int type) {
if (type == 0) {
return 1;
}
return reusableParameterCellCount(type);
}
HighlightCell * FloatParameterController::reusableCell(int index, int type) {
template<typename T>
HighlightCell * FloatParameterController<T>::reusableCell(int index, int type) {
if (type == 0) {
return &m_okButton;
}
return reusableParameterCell(index, type);
}
KDCoordinate FloatParameterController::rowHeight(int j) {
template<typename T>
KDCoordinate FloatParameterController<T>::rowHeight(int j) {
if (j == numberOfRows()-1) {
return Metric::ParameterCellHeight+k_buttonMargin;
}
return Metric::ParameterCellHeight;
}
KDCoordinate FloatParameterController::cumulatedHeightFromIndex(int j) {
template<typename T>
KDCoordinate FloatParameterController<T>::cumulatedHeightFromIndex(int j) {
if (j == numberOfRows()) {
return j*Metric::ParameterCellHeight+k_buttonMargin;
}
return Metric::ParameterCellHeight*j;
}
int FloatParameterController::indexFromCumulatedHeight(KDCoordinate offsetY) {
template<typename T>
int FloatParameterController<T>::indexFromCumulatedHeight(KDCoordinate offsetY) {
if (offsetY > numberOfRows()*Metric::ParameterCellHeight + k_buttonMargin) {
return numberOfRows();
}
return (offsetY - 1) / Metric::ParameterCellHeight;
}
void FloatParameterController::willDisplayCellForIndex(HighlightCell * cell, int index) {
template<typename T>
void FloatParameterController<T>::willDisplayCellForIndex(HighlightCell * cell, int index) {
if (index == numberOfRows()-1) {
return;
}
@@ -111,18 +123,20 @@ void FloatParameterController::willDisplayCellForIndex(HighlightCell * cell, int
constexpr int precision = Preferences::LargeNumberOfSignificantDigits;
constexpr int bufferSize = PrintFloat::bufferSizeForFloatsWithPrecision(precision);
char buffer[bufferSize];
PrintFloat::ConvertFloatToText<double>(parameterAtIndex(index), buffer, bufferSize, precision, Preferences::PrintFloatMode::Decimal);
PrintFloat::ConvertFloatToText<T>(parameterAtIndex(index), buffer, bufferSize, precision, Preferences::PrintFloatMode::Decimal);
myCell->setAccessoryText(buffer);
}
bool FloatParameterController::textFieldShouldFinishEditing(TextField * textField, Ion::Events::Event event) {
template<typename T>
bool FloatParameterController<T>::textFieldShouldFinishEditing(TextField * textField, Ion::Events::Event event) {
return (event == Ion::Events::Down && selectedRow() < numberOfRows()-1)
|| (event == Ion::Events::Up && selectedRow() > 0)
|| TextFieldDelegate::textFieldShouldFinishEditing(textField, event);
}
bool FloatParameterController::textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) {
double floatBody;
template<typename T>
bool FloatParameterController<T>::textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) {
T floatBody;
if (textFieldDelegateApp()->hasUndefinedValue(text, floatBody)) {
return false;
}
@@ -139,17 +153,23 @@ bool FloatParameterController::textFieldDidFinishEditing(TextField * textField,
return true;
}
int FloatParameterController::activeCell() {
template<typename T>
int FloatParameterController<T>::activeCell() {
return selectedRow();
}
StackViewController * FloatParameterController::stackController() {
template<typename T>
StackViewController * FloatParameterController<T>::stackController() {
return (StackViewController *)parentResponder();
}
void FloatParameterController::buttonAction() {
template<typename T>
void FloatParameterController<T>::buttonAction() {
StackViewController * stack = stackController();
stack->pop();
}
template class FloatParameterController<float>;
template class FloatParameterController<double>;
}