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

[apps/graph] setDefault when changing models if non cartesian functions

Browse Source
This commit is contained in:
Léa Saviot
2019-09-12 09:54:02 +02:00
parent 2d38419989
commit 274795fcab
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/graph/graph/graph_controller.cpp
View File

@@ -169,4 +169,8 @@ bool GraphController::displaysNonCartesianFunctions() const {
|| store->numberOfActiveFunctionsOfType(CartesianFunction::PlotType::Parametric) > 0;
}
bool GraphController::shouldSetDefaultOnModelChange() const {
return displaysNonCartesianFunctions();
}
}

1
apps/graph/graph/graph_controller.h
View File

@@ -37,6 +37,7 @@ private:
bool displaysNonCartesianFunctions() const;
bool defautRangeIsNormalized() const override { return displaysNonCartesianFunctions(); }
void interestingFunctionRange(Shared::ExpiringPointer<Shared::CartesianFunction> f, float tMin, float tMax, float step, float * xm, float * xM, float * ym, float * yM) const;
bool shouldSetDefaultOnModelChange() const override;
Shared::RoundCursorView m_cursorView;
BannerView m_bannerView;

2
apps/shared/interactive_curve_view_controller.cpp
View File

@@ -144,7 +144,7 @@ Responder * InteractiveCurveViewController::defaultController() {
void InteractiveCurveViewController::viewWillAppear() {
uint32_t newModelVersion = modelVersion();
if (*m_modelVersion != newModelVersion) {
if (*m_modelVersion == 0 || numberOfCurves() == 1) {
if (*m_modelVersion == 0 || numberOfCurves() == 1 || shouldSetDefaultOnModelChange()) {
interactiveCurveViewRange()->setDefault();
}
*m_modelVersion = newModelVersion;

1
apps/shared/interactive_curve_view_controller.h
View File

@@ -64,6 +64,7 @@ private:
// InteractiveCurveViewRangeDelegate
float addMargin(float x, float range, bool isVertical, bool isMin) override;
virtual bool shouldSetDefaultOnModelChange() const { return false; }
uint32_t * m_modelVersion;
uint32_t * m_rangeVersion;
RangeParameterController m_rangeParameterController;