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

Use std::min and std::max

Browse Source
This commit is contained in:
Romain Goyet
2020-04-12 15:43:39 -04:00
committed by Ecco
parent 77ee5126e1
commit 950862f8d0
79 changed files with 297 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/shared/interactive_curve_view_range.cpp
View File

@@ -5,13 +5,12 @@
#include <stddef.h>
#include <assert.h>
#include <poincare/preferences.h>
#include <algorithm>
using namespace Poincare;
namespace Shared {
static inline float maxFloat(float x, float y) { return x > y ? x : y; }
uint32_t InteractiveCurveViewRange::rangeChecksum() {
float data[5] = {xMin(), xMax(), yMin(), yMax(), m_yAuto ? 1.0f : 0.0f};
size_t dataLengthInBytes = 5*sizeof(float);
@@ -94,7 +93,7 @@ void InteractiveCurveViewRange::normalize() {
* 1cm = 2 current units. */
m_yAuto = false;
const float unit = maxFloat(xGridUnit(), yGridUnit());
const float unit = std::max(xGridUnit(), yGridUnit());
// Set x range
float newXHalfRange = NormalizedXHalfRange(unit);
@@ -160,7 +159,7 @@ void InteractiveCurveViewRange::setDefault() {
yRange = yMax() - yMin();
float xyRatio = xRange/yRange;
const float unit = maxFloat(xGridUnit(), yGridUnit());
const float unit = std::max(xGridUnit(), yGridUnit());
const float newXHalfRange = NormalizedXHalfRange(unit);
const float newYHalfRange = NormalizedYHalfRange(unit);
float normalizedXYRatio = newXHalfRange/newYHalfRange;