UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-29 19:49:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

[apps/regression] Add private method globalContext on GraphController

Browse Source
This commit is contained in:
Léa Saviot
2018-08-30 17:39:10 +02:00
parent f4dfe82f60
commit 2f946e7987
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/regression/graph_controller.cpp
View File

@@ -68,6 +68,10 @@ void GraphController::selectRegressionCurve() {
m_roundCursorView.setColor(Palette::DataColor[*m_selectedSeriesIndex]);
}
Poincare::Context * GraphController::globalContext() {
return const_cast<AppsContainer *>(static_cast<const AppsContainer *>(app()->container()))->globalContext();
}
CurveView * GraphController::curveView() {
return &m_view;
}
@@ -157,8 +161,7 @@ void GraphController::reloadBannerView() {
m_bannerView.setMessageAtIndex(model->formulaMessage(), 3);
// Get the coefficients
Poincare::Context * globContext = const_cast<AppsContainer *>(static_cast<const AppsContainer *>(app()->container()))->globalContext();
double * coefficients = m_store->coefficientsForSeries(selectedSeriesIndex(), globContext);
double * coefficients = m_store->coefficientsForSeries(selectedSeriesIndex(), globalContext());
bool coefficientsAreDefined = true;
for (int i = 0; i < model->numberOfCoefficients(); i++) {
if (std::isnan(coefficients[i])) {
@@ -259,8 +262,7 @@ bool GraphController::moveCursorHorizontally(int direction) {
}
double x = direction > 0 ? m_cursor->x() + m_store->xGridUnit()/k_numberOfCursorStepsInGradUnit :
m_cursor->x() - m_store->xGridUnit()/k_numberOfCursorStepsInGradUnit;
Poincare::Context * globContext = const_cast<AppsContainer *>(static_cast<const AppsContainer *>(app()->container()))->globalContext();
double y = m_store->yValueForXValue(*m_selectedSeriesIndex, x, globContext);
double y = m_store->yValueForXValue(*m_selectedSeriesIndex, x, globalContext());
m_cursor->moveTo(x, y);
m_store->panToMakePointVisible(x, y, cursorTopMarginRatio(), k_cursorRightMarginRatio, cursorBottomMarginRatio(), k_cursorLeftMarginRatio);
return true;
@@ -270,7 +272,7 @@ bool GraphController::moveCursorVertically(int direction) {
int closestRegressionSeries = -1;
int closestDotSeries = -1;
int dotSelected = -1;
Poincare::Context * globContext = const_cast<AppsContainer *>(static_cast<const AppsContainer *>(app()->container()))->globalContext();
Poincare::Context * globContext = globalContext();
if (*m_selectedDotIndex == -1) {
// The current cursor is on a regression