UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-23 15:50:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/shared] In float parameter controllers, add a ok button

Browse Source 
Change-Id: I6063afd5ebc9bcb0bcddc13e42a91d029c4bd831
This commit is contained in:
Émilie Feral
2017-03-10 18:40:47 +01:00
parent 94ab6c6dba
commit e7abdbe2e3
14 changed files with 332 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
apps/shared/range_parameter_controller.cpp
View File

@@ -8,10 +8,10 @@ using namespace Poincare;
namespace Shared {
RangeParameterController::RangeParameterController(Responder * parentResponder, InteractiveCurveViewRange * interactiveRange) :
FloatParameterController(parentResponder),
FloatParameterController(parentResponder, "Valider"),
m_interactiveRange(interactiveRange),
m_rangeCells{PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, (char *)"Xmin"), PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, (char *)"Xmax"),
PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, (char *)"Ymin"), PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, (char *)"Ymax")},
m_rangeCells{PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, nullptr), PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, nullptr),
PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, nullptr), PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, nullptr)},
m_yAutoCell(PointerTableCellWithSwitch((char*)"Y auto"))
{
}
@@ -20,40 +20,65 @@ const char * RangeParameterController::title() const {
return "Axes";
}
void RangeParameterController::viewWillAppear() {
for (int i = 0; i < k_numberOfTextCell; i++) {
int index = i > 2 ? i + 1 : i;
m_previousParameters[i] = parameterAtIndex(index);
}
m_previousSwitchState = m_interactiveRange->yAuto();
FloatParameterController::viewWillAppear();
}
int RangeParameterController::numberOfRows() {
return k_numberOfTextCell+2;
}
int RangeParameterController::typeAtLocation(int i, int j) {
if (j == numberOfRows()-1) {
return 0;
}
if (j == 2) {
return 2;
}
return 1;
}
void RangeParameterController::willDisplayCellForIndex(HighlightCell * cell, int index) {
if (index == numberOfRows()-1) {
return;
}
if (index == 2) {
SwitchView * switchView = (SwitchView *)m_yAutoCell.accessoryView();
switchView->setState(m_interactiveRange->yAuto());
return;
}
if (index == 3 || index == 4) {
if (m_interactiveRange->yAuto()) {
m_rangeCells[index-1].setTextColor(Palette::GreyDark);
} else {
m_rangeCells[index-1].setTextColor(KDColorBlack);
}
}
PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *)cell;
const char * labels[k_numberOfTextCell+1] = {"Xmin", "Xmax", "", "Ymin", "Ymax"};
myCell->setText(labels[index]);
KDColor yColor = m_interactiveRange->yAuto() ? Palette::GreyDark : KDColorBlack;
KDColor colors[k_numberOfTextCell+1] = {KDColorBlack, KDColorBlack, KDColorBlack, yColor, yColor};
myCell->setTextColor(colors[index]);
FloatParameterController::willDisplayCellForIndex(cell, index);
}
bool RangeParameterController::textFieldDidFinishEditing(TextField * textField, const char * text) {
AppsContainer * appsContainer = ((TextFieldDelegateApp *)app())->container();
Context * globalContext = appsContainer->globalContext();
float floatBody = Expression::parse(text)->approximate(*globalContext);
setParameterAtIndex(m_selectableTableView.selectedRow(), floatBody);
willDisplayCellForIndex(m_selectableTableView.cellAtLocation(m_selectableTableView.selectedColumn(),
m_selectableTableView.selectedRow()), activeCell());
FloatParameterController::textFieldDidFinishEditing(textField, text);
m_selectableTableView.reloadData();
return true;
}
void RangeParameterController::tableViewDidChangeSelection(SelectableTableView * t, int previousSelectedCellX, int previousSelectedCellY) {
if (previousSelectedCellX == 0 && previousSelectedCellY >= 0 && previousSelectedCellY !=2) {
if (previousSelectedCellX < numberOfRows()-1 && previousSelectedCellY >= 0 && previousSelectedCellY !=2) {
PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *)t->cellAtLocation(previousSelectedCellX, previousSelectedCellY);
myCell->setEditing(false);
app()->setFirstResponder(t);
}
if (t->selectedColumn() == 0 && t->selectedRow() >= 0 && t->selectedRow() !=2) {
if (t->selectedRow() == numberOfRows()-1) {
Button * myNewCell = (Button *)t->cellAtLocation(t->selectedColumn(), t->selectedRow());
app()->setFirstResponder(myNewCell);
return;
}
if (t->selectedRow() >= 0 && t->selectedRow() !=2) {
PointerTableCellWithEditableText * myNewCell = (PointerTableCellWithEditableText *)t->cellAtLocation(t->selectedColumn(), t->selectedRow());
if ((t->selectedRow() == 0 || t->selectedRow() == 1) || !m_interactiveRange->yAuto()) {
app()->setFirstResponder(myNewCell);
@@ -73,7 +98,15 @@ bool RangeParameterController::handleEvent(Ion::Events::Event event) {
if (m_interactiveRange->yAuto() && (activeCell() == 3 || activeCell() == 4)) {
return false;
}
return false;
if (event == Ion::Events::Back) {
m_interactiveRange->setYAuto(m_previousSwitchState);
}
return FloatParameterController::handleEvent(event);
}
float RangeParameterController::previousParameterAtIndex(int parameterIndex) {
int index = parameterIndex > 2 ? parameterIndex - 1 : parameterIndex;
return m_previousParameters[index];
}
float RangeParameterController::parameterAtIndex(int parameterIndex) {
@@ -90,22 +123,20 @@ void RangeParameterController::setParameterAtIndex(int parameterIndex, float f)
(m_interactiveRange->*setters[index])(f);
}
int RangeParameterController::numberOfRows() {
return k_numberOfTextCell+1;
};
HighlightCell * RangeParameterController::reusableCell(int index) {
if (index == 2) {
HighlightCell * RangeParameterController::reusableParameterCell(int index, int type) {
if (type == 2) {
return &m_yAutoCell;
}
int cellIndex = index > 2 ? index - 1 : index;
assert(cellIndex >= 0);
assert(cellIndex < k_numberOfTextCell);
return &m_rangeCells[cellIndex];
assert(index >= 0);
assert(index < k_numberOfTextCell);
return &m_rangeCells[index];
}
int RangeParameterController::reusableCellCount() {
return k_numberOfTextCell+1;
int RangeParameterController::reusableParameterCellCount(int type) {
if (type == 2) {
return 1;
}
return k_numberOfTextCell;
}
}