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

[apps/shared] CurveView: implement CurveView::pixelLength(Axis)

Browse Source
This commit is contained in:
Émilie Feral
2020-10-01 13:38:33 +02:00
parent d6751e6e03
commit 5b4fc6ff84
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/shared/curve_view.cpp
View File

@@ -112,6 +112,10 @@ float CurveView::pixelHeight() const {
return (m_curveViewRange->yMax() - m_curveViewRange->yMin()) / (m_frame.height() - 1);
}
float CurveView::pixelLength(Axis axis) const {
return axis == Axis::Horizontal ? pixelWidth() : pixelHeight();
}
float CurveView::pixelToFloat(Axis axis, KDCoordinate p) const {
return (axis == Axis::Horizontal) ?
m_curveViewRange->xMin() + p * pixelWidth() :
@@ -140,8 +144,7 @@ float CurveView::floatToPixel(Axis axis, float f) const {
}
float CurveView::floatLengthToPixelLength(Axis axis, float f) const {
float pixelLength = axis == Axis::Horizontal ? pixelWidth() : pixelHeight();
float dist = f / pixelLength;
float dist = f / pixelLength(axis);
return clippedFloat(dist);
}

1
apps/shared/curve_view.h
View File

@@ -41,6 +41,7 @@ public:
void setForceOkDisplay(bool force) { m_forceOkDisplay = force; }
float pixelWidth() const;
float pixelHeight() const;
float pixelLength(Axis axis) const;
protected:
CurveViewRange * curveViewRange() const { return m_curveViewRange; }
void setCurveViewRange(CurveViewRange * curveViewRange);