Merge pull request #554 from vizzuhq/resolution_v2

schaumb · web-flow · commit 940557062151 · 2024-07-25T17:59:01.000+02:00
Canvas line resolution
diff --git a/src/apps/weblib/cinterface.cpp b/src/apps/weblib/cinterface.cpp
@@ -178,7 +178,7 @@ void vizzu_wheel(APIHandles::Chart chart,
 
 void vizzu_update(APIHandles::Chart chart, double timeInMSecs)
 {
-	return Interface::getInstance().update(chart, timeInMSecs);
+	Interface::getInstance().update(chart, timeInMSecs);
 }
 
 void vizzu_render(APIHandles::Chart chart,
@@ -192,6 +192,13 @@ void vizzu_render(APIHandles::Chart chart,
 	    height);
 }
 
+void vizzu_setLineResolution(APIHandles::Canvas canvas,
+    double dMax,
+    double hMax)
+{
+	Interface::getInstance().setLineResolution(canvas, dMax, hMax);
+}
+
 const char *style_getList() { return Interface::getStyleList(); }
 
 void style_setValue(APIHandles::Chart chart,
diff --git a/src/apps/weblib/cinterface.h b/src/apps/weblib/cinterface.h
@@ -68,6 +68,10 @@ extern void vizzu_render(APIHandles::Chart chart,
     APIHandles::Canvas canvas,
     double width,
     double height);
+extern void vizzu_setLineResolution(APIHandles::Canvas canvas,
+    double dMax,
+    double hMax);
+
 extern const char *vizzu_errorMessage(
     APIHandles::Exception exceptionPtr,
     const std::type_info *typeinfo);
diff --git a/src/apps/weblib/interface.cpp b/src/apps/weblib/interface.cpp
@@ -403,6 +403,15 @@ void Interface::render(ObjectRegistryHandle chart,
 	ptr->frameEnd();
 }
 
+void Interface::setLineResolution(ObjectRegistryHandle canvas,
+    double dMax,
+    double hMax)
+{
+	static_cast<Draw::Painter *>(
+	    objects.get<Gfx::ICanvas>(canvas)->getPainter())
+	    ->setPathSamplerOptions({dMax, hMax});
+}
+
 void Interface::pointerDown(ObjectRegistryHandle chart,
     ObjectRegistryHandle,
     int pointerId,
diff --git a/src/apps/weblib/interface.h b/src/apps/weblib/interface.h
@@ -55,6 +55,9 @@ class Interface
 	    ObjectRegistryHandle canvas,
 	    double width,
 	    double height);
+	void setLineResolution(ObjectRegistryHandle canvas,
+	    double dMax,
+	    double hMax);
 
 	ObjectRegistryHandle storeAnim(ObjectRegistryHandle chart);
 	void restoreAnim(ObjectRegistryHandle chart,
diff --git a/src/apps/weblib/ts-api/cvizzu.types.d.ts b/src/apps/weblib/ts-api/cvizzu.types.d.ts
@@ -91,7 +91,8 @@ export interface CVizzu {
 	_vizzu_pointerLeave(chart: CChartPtr, canvas: CCanvasPtr, pointerId: number): void
 	_vizzu_wheel(chart: CChartPtr, canvas: CCanvasPtr, delta: number): void
 	_vizzu_setLogging(enable: boolean): void
-	_vizzu_update(chart: CChartPtr, time: number): void
+	_vizzu_update(chart: CChartPtr, time: number): CString
+	_vizzu_setLineResolution(canvas: CCanvasPtr, dMax: number, hMax: number): void
 	_vizzu_render(chart: CChartPtr, canvas: CCanvasPtr, width: number, height: number): void
 
 	_vizzu_errorMessage(exceptionPtr: CException, typeinfo: CTypeInfo): CString
diff --git a/src/base/gfx/pathsampler.cpp b/src/base/gfx/pathsampler.cpp
@@ -32,19 +32,19 @@ void PathSampler::path(const Geom::Point &pConv0,
 	auto height = 2 * area / (pConv1 - pConv0).abs();
 
 	auto needMore =
-	    height > hMax
+	    height > options.hMax
 	    || ((pConv1 - pConv0).sqrAbs() < (pConv - pConv0).sqrAbs())
 	    || ((pConv1 - pConv0).sqrAbs() < (pConv - pConv1).sqrAbs());
 
 	if (needMore) {
-		if ((pConv - pConv0).sqrAbs() > dMax)
+		if ((pConv - pConv0).sqrAbs() > options.dMax)
 			path(pConv0, pConv, i0, i, recurseCnt + 1);
 	}
 
 	addPoint(pConv);
 
 	if (needMore) {
-		if ((pConv - pConv1).sqrAbs() > dMax)
+		if ((pConv - pConv1).sqrAbs() > options.dMax)
 			path(pConv, pConv1, i, i1, recurseCnt + 1);
 	}
 }
diff --git a/src/base/gfx/pathsampler.h b/src/base/gfx/pathsampler.h
@@ -11,13 +11,17 @@ namespace Gfx
 class PathSampler
 {
 public:
-	PathSampler(double dMax, double hMax) : dMax(dMax), hMax(hMax) {}
+	struct Options
+	{
+		double dMax;
+		double hMax;
+	};
+	explicit PathSampler(const Options &options) : options(options) {}
 
 	virtual ~PathSampler() = default;
 
 protected:
-	double dMax;
-	double hMax;
+	Options options;
 
 	virtual void addPoint(const Geom::Point &) = 0;
 	virtual Geom::Point getPoint(double f) = 0;
diff --git a/src/chart/main/chart.h b/src/chart/main/chart.h
@@ -7,6 +7,7 @@
 
 #include "base/anim/control.h"
 #include "base/gfx/canvas.h"
+#include "base/gfx/pathsampler.h"
 #include "base/util/eventdispatcher.h"
 #include "chart/animator/animator.h"
 #include "chart/generator/plotptr.h"
diff --git a/src/chart/rendering/drawplot.cpp b/src/chart/rendering/drawplot.cpp
@@ -55,7 +55,6 @@ void DrawPlot::drawPlotArea(Gfx::ICanvas &canvas,
 	auto rect = Geom::Rect::Ident();
 	painter.setPolygonToCircleFactor(0.0);
 	painter.setPolygonStraightFactor(0.0);
-	painter.setResMode(ResolutionMode::High);
 
 	if (clip) { painter.drawPolygon(rect.points(), true); }
 	else {
diff --git a/src/chart/rendering/markerrenderer.cpp b/src/chart/rendering/markerrenderer.cpp
@@ -225,7 +225,6 @@ void MarkerRenderer::draw(Gfx::ICanvas &canvas,
 	           : static_cast<double>(abstractMarker.morphToCircle));
 	painter.setPolygonStraightFactor(
 	    static_cast<double>(abstractMarker.linear));
-	painter.setResMode(ResolutionMode::High);
 
 	auto colors = getColor(abstractMarker, factor);
 
diff --git a/src/chart/rendering/painter/drawline.cpp b/src/chart/rendering/painter/drawline.cpp
@@ -9,12 +9,9 @@ namespace Vizzu::Draw
 {
 
 DrawLine::DrawLine(const Geom::Line &line,
-    ResolutionMode resolutionMode,
-    CoordinateSystem &coordSys,
+    const PathSampler::Options &options,
     Gfx::ICanvas &canvas)
 {
-	PathSampler::Options options(coordSys);
-	options.resolutionMode = resolutionMode;
 	Path(line.begin, line.end, canvas, options).sample();
 }
 
@@ -51,7 +48,7 @@ DrawLine::DrawLine(const Geom::Line &line,
 DrawLine::Path::Path(const Geom::Point &p0,
     const Geom::Point &p1,
     Gfx::ICanvas &canvas,
-    const PathSampler::Options &options) :
+    const Options &options) :
     PathSampler(p0, p1, options),
     canvas(canvas)
 {}
@@ -74,8 +71,7 @@ void DrawLine::Path::addPoint(const Geom::Point &point)
 
 Geom::Point DrawLine::Path::getPoint(double i)
 {
-	return drawOptions.coordSys.convert(
-	    Math::interpolate<>(p0, p1, i));
+	return coordSys.convert(Math::interpolate<>(p0, p1, i));
 }
 
 }
diff --git a/src/chart/rendering/painter/drawline.h b/src/chart/rendering/painter/drawline.h
@@ -6,7 +6,6 @@
 #include "base/gfx/color.h"
 
 #include "coordinatesystem.h"
-#include "painteroptions.h"
 #include "pathsampler.h"
 
 namespace Vizzu::Draw
@@ -16,8 +15,7 @@ class DrawLine
 {
 public:
 	DrawLine(const Geom::Line &line,
-	    ResolutionMode resolutionMode,
-	    CoordinateSystem &coordSys,
+	    const PathSampler::Options &options,
 	    Gfx::ICanvas &canvas);
 
 	DrawLine(const Geom::Line &line,
diff --git a/src/chart/rendering/painter/drawpolygon.cpp b/src/chart/rendering/painter/drawpolygon.cpp
@@ -18,7 +18,7 @@ DrawPolygon::DrawPolygon(const std::array<Geom::Point, 4> &ps,
 	auto linSize = Geom::Size{options.coordSys.verConvert(boundary.x),
 	    options.coordSys.verConvert(boundary.y)};
 
-	if (options.circ == 1.0 && linSize.isSquare(0.005)) {
+	if (options.toCircleFactor == 1.0 && linSize.isSquare(0.005)) {
 		auto centerConv = options.coordSys.convert(center);
 		auto radius = fabs(linSize.x) / 2.0;
 		const Geom::Circle circle(centerConv, radius);
@@ -68,9 +68,10 @@ Geom::Point DrawPolygon::Path::getPoint(double f)
 	auto nonlinP =
 	    options.coordSys.convert(Math::interpolate(p0, p1, f));
 
-	auto mixedP = Math::interpolate(nonlinP, linP, options.linear);
+	auto mixedP =
+	    Math::interpolate(nonlinP, linP, options.straightFactor);
 
-	return intpToElipse(mixedP, options.circ);
+	return intpToElipse(mixedP, options.toCircleFactor);
 }
 
 Geom::Point DrawPolygon::Path::intpToElipse(Geom::Point point,
diff --git a/src/chart/rendering/painter/drawpolygon.h b/src/chart/rendering/painter/drawpolygon.h
@@ -16,15 +16,15 @@ namespace Vizzu::Draw
 class DrawPolygon
 {
 public:
-	struct Options : PathSampler::Options
+	struct PolygonOptions
 	{
-		explicit Options(CoordinateSystem &coordSys) :
-		    PathSampler::Options(coordSys)
-		{}
-		double circ{0};
-		double linear{0};
+		double toCircleFactor;
+		double straightFactor;
 	};
 
+	struct Options : PathSampler::Options, PolygonOptions
+	{};
+
 	DrawPolygon(const std::array<Geom::Point, 4> &ps,
 	    const Options &options,
 	    Gfx::ICanvas &canvas,
diff --git a/src/chart/rendering/painter/painter.cpp b/src/chart/rendering/painter/painter.cpp
@@ -8,7 +8,7 @@ namespace Vizzu::Draw
 
 void Painter::drawLine(const Geom::Line &line)
 {
-	Draw::DrawLine(line, mode, system, getCanvas());
+	DrawLine(line, {pathSamplerOptions, system}, getCanvas());
 }
 
 void Painter::drawStraightLine(const Geom::Line &line,
@@ -21,10 +21,10 @@ void Painter::drawStraightLine(const Geom::Line &line,
 void Painter::drawPolygon(const std::array<Geom::Point, 4> &ps,
     bool clip)
 {
-	Draw::DrawPolygon::Options options(system);
-	options.circ = polygonOptions.toCircleFactor;
-	options.linear = polygonOptions.straightFactor;
-	Draw::DrawPolygon(ps, options, getCanvas(), clip);
+	Draw::DrawPolygon(ps,
+	    {{pathSamplerOptions, system}, polygonOptions},
+	    getCanvas(),
+	    clip);
 }
 
 }
diff --git a/src/chart/rendering/painter/painter.h b/src/chart/rendering/painter/painter.h
@@ -2,9 +2,10 @@
 #define PAINTER_H
 
 #include "base/gfx/canvas.h"
+#include "base/gfx/pathsampler.h"
 
 #include "coordinatesystem.h"
-#include "painteroptions.h"
+#include "drawpolygon.h"
 
 namespace Vizzu::Draw
 {
@@ -21,8 +22,6 @@ class Painter
 		this->system = system;
 	}
 
-	void setResMode(const ResolutionMode &mode) { this->mode = mode; }
-
 	void drawLine(const Geom::Line &line);
 
 	void drawStraightLine(const Geom::Line &line,
@@ -41,16 +40,15 @@ class Painter
 	void drawPolygon(const std::array<Geom::Point, 4> &ps,
 	    bool clip = false);
 
-private:
-	struct PolygonOptions
+	void setPathSamplerOptions(Gfx::PathSampler::Options &&options)
 	{
-		double toCircleFactor;
-		double straightFactor;
-	};
+		pathSamplerOptions = options;
+	}
 
+private:
 	CoordinateSystem system;
-	ResolutionMode mode{ResolutionMode::Low};
-	PolygonOptions polygonOptions{};
+	Gfx::PathSampler::Options pathSamplerOptions{1.0, 0.5};
+	DrawPolygon::PolygonOptions polygonOptions{};
 };
 
 }
diff --git a/src/chart/rendering/painter/painteroptions.h b/src/chart/rendering/painter/painteroptions.h
diff --git a/src/chart/rendering/painter/pathsampler.cpp b/src/chart/rendering/painter/pathsampler.cpp
@@ -6,11 +6,9 @@ namespace Vizzu::Draw
 
 PathSampler::PathSampler(const Geom::Point &p0,
     const Geom::Point &p1,
-    const PathSampler::Options &options) :
-    Gfx::PathSampler(
-        options.resolutionMode == ResolutionMode::Low ? 5.0 : 1.0,
-        options.resolutionMode == ResolutionMode::Low ? 1.5 : 0.5),
-    drawOptions(options),
+    const Options &options) :
+    Gfx::PathSampler(options),
+    coordSys(options.coordSys),
     p0(p0),
     p1(p1)
 {}
diff --git a/src/chart/rendering/painter/pathsampler.h b/src/chart/rendering/painter/pathsampler.h
@@ -4,21 +4,15 @@
 #include "base/gfx/pathsampler.h"
 
 #include "coordinatesystem.h"
-#include "painteroptions.h"
 
 namespace Vizzu::Draw
 {
 
 class PathSampler : public Gfx::PathSampler
 {
 public:
-	struct Options
+	struct Options : Gfx::PathSampler::Options
 	{
-		explicit Options(const CoordinateSystem &coordSys) :
-		    coordSys(coordSys)
-		{}
-
-		ResolutionMode resolutionMode{ResolutionMode::Low};
 		const CoordinateSystem &coordSys;
 	};
 
@@ -27,7 +21,7 @@ class PathSampler : public Gfx::PathSampler
 	    const Options &options);
 
 protected:
-	const Options &drawOptions;
+	const CoordinateSystem &coordSys;
 	Geom::Point p0;
 	Geom::Point p1;
 };
diff --git a/src/chart/ui/chart.h b/src/chart/ui/chart.h
@@ -1,6 +1,7 @@
 #ifndef CHART_UI_CHART_H
 #define CHART_UI_CHART_H
 
+#include "base/gfx/pathsampler.h"
 #include "base/gui/pointer.h"
 #include "base/util/eventdispatcher.h"
 #include "chart/main/chart.h"
diff --git a/test/e2e/test_cases/test_cases.json b/test/e2e/test_cases/test_cases.json
diff --git a/test/e2e/tests/config_tests.json b/test/e2e/tests/config_tests.json
diff --git a/test/e2e/tests/features.json b/test/e2e/tests/features.json
diff --git a/test/e2e/tests/fixes.json b/test/e2e/tests/fixes.json
diff --git a/test/qtest/chart.cpp b/test/qtest/chart.cpp

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ void vizzu_wheel(APIHandles::Chart chart,`
`178`	`178`
`179`	`179`	`void vizzu_update(APIHandles::Chart chart, double timeInMSecs)`
`180`	`180`	`{`
`181`		`- return Interface::getInstance().update(chart, timeInMSecs);`
	`181`	`+ Interface::getInstance().update(chart, timeInMSecs);`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`void vizzu_render(APIHandles::Chart chart,`
`@@ -192,6 +192,13 @@ void vizzu_render(APIHandles::Chart chart,`
`192`	`192`	`height);`
`193`	`193`	`}`
`194`	`194`
	`195`	`+void vizzu_setLineResolution(APIHandles::Canvas canvas,`
	`196`	`+ double dMax,`
	`197`	`+ double hMax)`
	`198`	`+{`
	`199`	`+ Interface::getInstance().setLineResolution(canvas, dMax, hMax);`
	`200`	`+}`
	`201`	`+`
`195`	`202`	`const char *style_getList() { return Interface::getStyleList(); }`
`196`	`203`
`197`	`204`	`void style_setValue(APIHandles::Chart chart,`
Original file line number	Diff line number	Diff line change
`@@ -32,19 +32,19 @@ void PathSampler::path(const Geom::Point &pConv0,`
`32`	`32`	`auto height = 2 * area / (pConv1 - pConv0).abs();`
`33`	`33`
`34`	`34`	`auto needMore =`
`35`		`- height > hMax`
	`35`	`+ height > options.hMax`
`36`	`36`	`\|\| ((pConv1 - pConv0).sqrAbs() < (pConv - pConv0).sqrAbs())`
`37`	`37`	`\|\| ((pConv1 - pConv0).sqrAbs() < (pConv - pConv1).sqrAbs());`
`38`	`38`
`39`	`39`	`if (needMore) {`
`40`		`- if ((pConv - pConv0).sqrAbs() > dMax)`
	`40`	`+ if ((pConv - pConv0).sqrAbs() > options.dMax)`
`41`	`41`	`path(pConv0, pConv, i0, i, recurseCnt + 1);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`addPoint(pConv);`
`45`	`45`
`46`	`46`	`if (needMore) {`
`47`		`- if ((pConv - pConv1).sqrAbs() > dMax)`
	`47`	`+ if ((pConv - pConv1).sqrAbs() > options.dMax)`
`48`	`48`	`path(pConv, pConv1, i, i1, recurseCnt + 1);`
`49`	`49`	`}`
`50`	`50`	`}`