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] Get rid of DynamicViewController in FloatParameterController

Browse Source
This commit is contained in:
Émilie Feral
2018-09-11 10:16:36 +02:00
parent 5cb4258af6
commit 6d9f0c0f0b
15 changed files with 89 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
apps/solver/interval_controller.cpp
View File

@@ -43,10 +43,17 @@ void IntervalController::ContentView::layoutSubviews() {
IntervalController::IntervalController(Responder * parentResponder, EquationStore * equationStore) :
FloatParameterController(parentResponder),
m_selectableTableView(nullptr),
m_contentView(&m_selectableTableView),
m_intervalCell{},
m_equationStore(equationStore)
{
m_selectableTableView.setTopMargin(0);
m_okButton.setMessage(I18n::Message::ResolveEquation);
for (int i = 0; i < k_maxNumberOfCells; i++) {
m_intervalCell[i].setParentResponder(&m_selectableTableView);
m_intervalCell[i].textField()->setDelegate(this);
m_intervalCell[i].textField()->setDraftTextBuffer(m_draftTextBuffer);
}
}
const char * IntervalController::title() {
@@ -70,7 +77,7 @@ void IntervalController::willDisplayCellForIndex(HighlightCell * cell, int index
HighlightCell * IntervalController::reusableParameterCell(int index, int type) {
assert(index >= 0);
assert(index < 2);
return m_intervalCell[index];
return &m_intervalCell[index];
}
int IntervalController::reusableParameterCellCount(int type) {
@@ -88,7 +95,7 @@ bool IntervalController::setParameterAtIndex(int parameterIndex, double f) {
bool IntervalController::textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) {
if (FloatParameterController::textFieldDidFinishEditing(textField, text, event)) {
m_selectableTableView->reloadData();
m_selectableTableView.reloadData();
return true;
}
return false;
@@ -101,34 +108,4 @@ void IntervalController::buttonAction() {
stack->push(solverApp->solutionsControllerStack(), KDColorWhite, Palette::SubTab, Palette::SubTab);
}
I18n::Message IntervalController::okButtonText() {
return I18n::Message::ResolveEquation;
}
View * IntervalController::loadView() {
m_selectableTableView = (SelectableTableView *)FloatParameterController::loadView();
m_selectableTableView->setTopMargin(0);
for (int i = 0; i < k_maxNumberOfCells; i++) {
m_intervalCell[i] = new MessageTableCellWithEditableText(m_selectableTableView, this, m_draftTextBuffer);
}
ContentView * contentView = (ContentView *)new ContentView(m_selectableTableView);
return contentView;
}
void IntervalController::unloadView(View * view) {
delete m_selectableTableView;
m_selectableTableView = nullptr;
for (int i = 0; i < k_maxNumberOfCells; i++) {
delete m_intervalCell[i];
m_intervalCell[i] = nullptr;
}
FloatParameterController::unloadView(view);
}
SelectableTableView * IntervalController::selectableTableView() {
return m_selectableTableView;
}
}