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

[apps/shared] Code cleaning and inlining

Browse Source
This commit is contained in:
Léa Saviot
2018-11-30 16:40:30 +01:00
parent 29ef8c6d23
commit 404db60a3d
3 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
apps/shared/interactive_curve_view_range.cpp
View File

@@ -9,22 +9,6 @@ using namespace Poincare;
namespace Shared {
InteractiveCurveViewRange::InteractiveCurveViewRange(CurveViewCursor * cursor, InteractiveCurveViewRangeDelegate * delegate) :
MemoizedCurveViewRange(),
m_yAuto(true),
m_delegate(delegate),
m_cursor(cursor)
{
}
void InteractiveCurveViewRange::setDelegate(InteractiveCurveViewRangeDelegate * delegate) {
m_delegate = delegate;
}
void InteractiveCurveViewRange::setCursor(CurveViewCursor * cursor) {
m_cursor = cursor;
}
uint32_t InteractiveCurveViewRange::rangeChecksum() {
float data[5] = {m_xMin, m_xMax, m_yMin, m_yMax, m_yAuto ? 1.0f : 0.0f};
size_t dataLengthInBytes = 5*sizeof(float);
@@ -32,8 +16,9 @@ uint32_t InteractiveCurveViewRange::rangeChecksum() {
return Ion::crc32((uint32_t *)data, dataLengthInBytes/sizeof(uint32_t));
}
bool InteractiveCurveViewRange::yAuto() {
return m_yAuto;
void InteractiveCurveViewRange::setYAuto(bool yAuto) {
m_yAuto = yAuto;
notifyRangeChange();
}
void InteractiveCurveViewRange::setXMin(float xMin) {
@@ -43,9 +28,7 @@ void InteractiveCurveViewRange::setXMin(float xMin) {
newXMin = m_xMax - k_minFloat;
MemoizedCurveViewRange::setXMin(clipped(newXMin, false));
}
if (m_delegate) {
m_delegate->didChangeRange(this);
}
notifyRangeChange();
}
void InteractiveCurveViewRange::setXMax(float xMax) {
@@ -55,9 +38,7 @@ void InteractiveCurveViewRange::setXMax(float xMax) {
newXMax = m_xMin + k_minFloat;
MemoizedCurveViewRange::setXMax(clipped(newXMax, true));
}
if (m_delegate) {
m_delegate->didChangeRange(this);
}
notifyRangeChange();
}
void InteractiveCurveViewRange::setYMin(float yMin) {
@@ -78,13 +59,6 @@ void InteractiveCurveViewRange::setYMax(float yMax) {
}
}
void InteractiveCurveViewRange::setYAuto(bool yAuto) {
m_yAuto = yAuto;
if (m_delegate) {
m_delegate->didChangeRange(this);
}
}
void InteractiveCurveViewRange::zoom(float ratio, float x, float y) {
float xMin = m_xMin;
float xMax = m_xMax;
@@ -131,9 +105,7 @@ void InteractiveCurveViewRange::roundAbscissa() {
}
m_xMax = newXMax;
MemoizedCurveViewRange::setXMin(newXMin);
if (m_delegate) {
m_delegate->didChangeRange(this);
}
notifyRangeChange();
}
void InteractiveCurveViewRange::normalize() {
@@ -240,4 +212,10 @@ float InteractiveCurveViewRange::clipped(float x, bool isMax) {
return clippedX;
}
void InteractiveCurveViewRange::notifyRangeChange() {
if (m_delegate) {
m_delegate->didChangeRange(this);
}
}
}