UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-28 10:09:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/graph][apps/regression][app/sequence] Move model and range

Browse Source 
versions to the snapshot

Change-Id: I6ec56ab59d734c0c43a5df32462173c611cc68b3
This commit is contained in:
Émilie Feral
2017-05-18 10:34:50 +02:00
parent 6b2ae04a13
commit e702c1f61b
19 changed files with 88 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/shared/interactive_curve_view_controller.cpp
View File

@@ -7,13 +7,13 @@ using namespace Poincare;
namespace Shared {
InteractiveCurveViewController::InteractiveCurveViewController(Responder * parentResponder, ButtonRowController * header, InteractiveCurveViewRange * interactiveRange, CurveView * curveView, CurveViewCursor * cursor) :
InteractiveCurveViewController::InteractiveCurveViewController(Responder * parentResponder, ButtonRowController * header, InteractiveCurveViewRange * interactiveRange, CurveView * curveView, CurveViewCursor * cursor, uint32_t * modelVersion, uint32_t * rangeVersion) :
ViewController(parentResponder),
ButtonRowDelegate(header, nullptr),
m_cursor(cursor),
m_cursorView(CursorView()),
m_modelVersion(0),
m_rangeVersion(0),
m_modelVersion(modelVersion),
m_rangeVersion(rangeVersion),
m_rangeParameterController(this, interactiveRange),
m_zoomParameterController(this, interactiveRange, curveView),
m_rangeButton(this, I18n::Message::Axis, Invocation([](void * context, void * sender) {
@@ -132,8 +132,8 @@ Responder * InteractiveCurveViewController::defaultController() {
void InteractiveCurveViewController::viewWillAppear() {
uint32_t newModelVersion = modelVersion();
if (m_modelVersion != newModelVersion) {
m_modelVersion = newModelVersion;
if (*m_modelVersion != newModelVersion) {
*m_modelVersion = newModelVersion;
initRangeParameters();
/* Warning: init cursor parameter before reloading banner view. Indeed,
* reloading banner view needs an updated cursor to load the right data. */
@@ -141,8 +141,8 @@ void InteractiveCurveViewController::viewWillAppear() {
centerCursorVertically();
}
uint32_t newRangeVersion = rangeVersion();
if (m_rangeVersion != newRangeVersion) {
m_rangeVersion = newRangeVersion;
if (*m_rangeVersion != newRangeVersion) {
*m_rangeVersion = newRangeVersion;
if (!interactiveCurveViewRange()->isCursorVisible()) {
initCursorParameters();
}