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

[shared/interactive_curve_view_range] Test zoom method

Browse Source
This commit is contained in:
Gabriel Ozouf
2020-12-22 16:29:43 +01:00
committed by EmilieNumworks
parent e9c953fd6e
commit 5bc9579db6
3 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
apps/graph/test/ranges.cpp
View File

@@ -125,4 +125,52 @@ QUIZ_CASE(graph_ranges_several_functions) {
}
}
void assert_zooms_to(float xMin, float xMax, float yMin, float yMax, float targetXMin, float targetXMax, float targetYMin, float targetYMax, bool conserveRatio, bool zoomIn) {
float ratio = zoomIn ? 1.f / ZoomCurveViewController::k_zoomOutRatio : ZoomCurveViewController::k_zoomOutRatio;
InteractiveCurveViewRange graphRange;
graphRange.setXMin(xMin);
graphRange.setXMax(xMax);
graphRange.setYMin(yMin);
graphRange.setYMax(yMax);
float xCenter = (xMax + xMin) / 2.f;
float yCenter = (yMax + yMin) / 2.f;
graphRange.zoom(ratio, xCenter, yCenter);
quiz_assert(float_equal(graphRange.xMin(), targetXMin) && float_equal(graphRange.xMax(), targetXMax) && float_equal(graphRange.yMin(), targetYMin) && float_equal(graphRange.yMax(), targetYMax));
quiz_assert(float_equal((yMax - yMin) / (xMax - xMin), (targetYMax - targetYMin) / (targetXMax - targetXMin)) == conserveRatio);
}
void assert_zooms_in_to(float xMin, float xMax, float yMin, float yMax, float targetXMin, float targetXMax, float targetYMin, float targetYMax, bool conserveRatio) {
assert_zooms_to(xMin, xMax, yMin, yMax, targetXMin, targetXMax, targetYMin, targetYMax, conserveRatio, true);
}
void assert_zooms_out_to(float xMin, float xMax, float yMin, float yMax, float targetXMin, float targetXMax, float targetYMin, float targetYMax, bool conserveRatio) {
assert_zooms_to(xMin, xMax, yMin, yMax, targetXMin, targetXMax, targetYMin, targetYMax, conserveRatio, false);
}
QUIZ_CASE(graph_ranges_zoom) {
assert_zooms_in_to(
-12, 12, -12, 12,
-8, 8, -8, 8,
true);
assert_zooms_in_to(
-3, 3, 0, 1e-4,
-3, 3, 0, 1e-4,
true);
assert_zooms_out_to(
-10, 10, -10, 10,
-15, 15, -15, 15,
true);
assert_zooms_out_to(
-1, 1, 9e7, 1e8,
-1.5, 1.5, 87500000, 1e8,
false);
}
}

2
apps/shared/zoom_curve_view_controller.cpp
View File

@@ -14,7 +14,7 @@ bool ZoomCurveViewController::handleEvent(Ion::Events::Event event) {
}
bool ZoomCurveViewController::handleZoom(Ion::Events::Event event) {
float ratio = event == Ion::Events::Plus ? 2.0f/3.0f : 3.0f/2.0f;
float ratio = event == Ion::Events::Plus ? 1.f / k_zoomOutRatio : k_zoomOutRatio;
interactiveCurveViewRange()->zoom(ratio, xFocus(), yFocus());
curveView()->reload();
return true;

2
apps/shared/zoom_curve_view_controller.h
View File

@@ -13,6 +13,8 @@ namespace Shared {
class ZoomCurveViewController : public ViewController {
public:
static constexpr float k_zoomOutRatio = 3.f / 2.f;
ZoomCurveViewController(Responder * parentResponder) : ViewController(parentResponder) {}
View * view() override { return curveView(); }
bool handleEvent(Ion::Events::Event event) override;