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

[apps/curve_view] Clean grid unit algorithm

Browse Source
This commit is contained in:
Léa Saviot
2018-12-28 11:03:07 +01:00
parent d3dd644e0d
commit 155688540f
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/shared/curve_view.h
View File

@@ -36,7 +36,6 @@ public:
void setOkView(View * okView);
void setForceOkDisplay(bool force) { m_forceOkDisplay = force; }
float resolution() const;
static float LabelsMarginRatio(Axis axis) { return axis == Axis::Horizontal ? k_labelsHorizontalMarginRatio : 0.0f; }
protected:
CurveViewRange * curveViewRange() { return m_curveViewRange; }
void setCurveViewRange(CurveViewRange * curveViewRange);

4
apps/shared/curve_view_range.cpp
View File

@@ -19,9 +19,7 @@ float CurveViewRange::yGridUnit() {
return 0.0f;
}
float CurveViewRange::computeGridUnit(Axis axis, float range1) {
float marginRatio = CurveView::LabelsMarginRatio(axis == Axis::X ? CurveView::Axis::Horizontal : CurveView::Axis::Vertical);
float range = range1 * (1.0f-2.0f*marginRatio);
float CurveViewRange::computeGridUnit(Axis axis, float range) {
int a = 0;
int b = 0;
float maxNumberOfUnits = (axis == Axis::X) ? k_maxNumberOfXGridUnits : k_maxNumberOfYGridUnits;