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/sum_graph_controller] Clean start/endSum

Browse Source
This commit is contained in:
Ruben Dashyan
2019-05-03 17:40:51 +02:00
committed by Léa Saviot
parent b2bca3e4aa
commit 2866a8f861
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/shared/sum_graph_controller.cpp
View File

@@ -17,8 +17,6 @@ namespace Shared {
SumGraphController::SumGraphController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, FunctionGraphView * graphView, InteractiveCurveViewRange * range, CurveViewCursor * cursor, CodePoint sumSymbol) :
SimpleInteractiveCurveViewController(parentResponder, cursor),
m_step(Step::FirstParameter),
m_startSum(NAN),
m_endSum(NAN),
m_record(),
m_graphRange(range),
m_graphView(graphView),
@@ -37,13 +35,10 @@ void SumGraphController::viewWillAppear() {
m_graphView->setAreaHighlight(NAN, NAN);
m_graphView->reload();
m_startSum = m_cursor->x();
m_endSum = NAN;
m_step = Step::FirstParameter;
reloadBannerView();
}
void SumGraphController::didEnterResponderChain(Responder * previousFirstResponder) {
Container::activeApp()->setFirstResponder(m_legendView.textField());
}
@@ -72,12 +67,8 @@ bool SumGraphController::moveCursorHorizontallyToPosition(double x) {
ExpiringPointer<Function> function = myApp->functionStore()->modelForRecord(m_record);
double y = function->evaluateAtAbscissa(x, myApp->localContext());
m_cursor->moveTo(x, y);
if (m_step == Step::FirstParameter) {
m_startSum = m_cursor->x();
}
if (m_step == Step::SecondParameter) {
m_endSum = m_cursor->x();
m_graphView->setAreaHighlight(m_startSum, m_endSum);
m_graphView->setAreaHighlight(m_startSum, m_cursor->x());
}
m_legendView.setEditableZone(m_cursor->x());
m_graphRange->panToMakePointVisible(x, y, cursorTopMarginRatio(), k_cursorRightMarginRatio, cursorBottomMarginRatio(), k_cursorLeftMarginRatio);
@@ -121,8 +112,8 @@ bool SumGraphController::handleEnter() {
stack->pop();
} else {
if (m_step == Step::FirstParameter) {
m_startSum = m_cursor->x();
m_graphView->setAreaHighlight(m_startSum, m_startSum);
m_endSum = m_startSum;
} else {
m_graphView->setAreaHighlightColor(true);
m_graphView->setCursorView(nullptr);
@@ -136,19 +127,21 @@ bool SumGraphController::handleEnter() {
void SumGraphController::reloadBannerView() {
m_legendView.setLegendMessage(legendMessageAtStep(m_step), m_step);
double endSum = NAN;
double result;
Poincare::Layout functionLayout;
if (m_step == Step::Result) {
endSum = m_cursor->x();
FunctionApp * myApp = FunctionApp::app();
assert(!m_record.isNull());
ExpiringPointer<Function> function = myApp->functionStore()->modelForRecord(m_record);
result = function->sumBetweenBounds(m_startSum, m_endSum, myApp->localContext());
result = function->sumBetweenBounds(m_startSum, endSum, myApp->localContext());
functionLayout = createFunctionLayout(function);
} else {
m_legendView.setEditableZone(m_cursor->x());
result = NAN;
}
m_legendView.setSumSymbol(m_step, m_startSum, m_endSum, result, functionLayout);
m_legendView.setSumSymbol(m_step, m_startSum, endSum, result, functionLayout);
}
/* Legend View */