Add lineargradient

Author: schaumb

src/apps/qutils/canvas.cpp

@@ -199,14 +199,12 @@ void BaseCanvas::text(const Geom::Rect &rect, const std::string &text)
 	    QString::fromStdString(text));
 }
 
-void BaseCanvas::setBrushGradient(const Geom::Line &line,
-    const Gfx::ColorGradient &gradient)
-{
-	QLinearGradient qGradient(toQPoint(line.begin),
-	    toQPoint(line.end));
-	for (auto stop : gradient.stops) {
-		qGradient.setColorAt(stop.pos, toQColor(stop.value));
-	}
+void BaseCanvas::setBrushGradient(const Gfx::LinearGradient &gradient)
+{
+	QLinearGradient qGradient(toQPoint(gradient.line.begin),
+	    toQPoint(gradient.line.end));
+	for (auto &&[pos, value] : gradient.colors.stops)
+		qGradient.setColorAt(pos, toQColor(value));
 	painter.setBrush(QBrush(qGradient));
 	painter.setPen(brushToPen(painter.brush()));
 }

src/apps/qutils/canvas.h

@@ -46,8 +46,8 @@ class BaseCanvas : public Gfx::ICanvas, public Vizzu::Draw::Painter
 	void text(const Geom::Rect &rect,
 	    const std::string &text) override;
 
-	void setBrushGradient(const Geom::Line &line,
-	    const Gfx::ColorGradient &gradient) override;
+	void setBrushGradient(
+	    const Gfx::LinearGradient &gradient) override;
 
 	void frameBegin() override {}
 	void frameEnd() override {}

src/apps/weblib/jscriptcanvas.cpp

@@ -170,10 +170,10 @@ void JScriptCanvas::text(const Geom::Rect &rect,
 	    text.c_str());
 }
 
-void JScriptCanvas::setBrushGradient(const Geom::Line &line,
-    const Gfx::ColorGradient &gradient)
+void JScriptCanvas::setBrushGradient(
+    const Gfx::LinearGradient &gradient)
 {
-	typedef decltype(gradient.stops)::value_type Stop;
+	typedef decltype(gradient.colors.stops)::value_type Stop;
 	static_assert(sizeof(double) == 8);
 	static_assert(sizeof(Stop) == sizeof(double) * 5);
 
@@ -189,12 +189,12 @@ void JScriptCanvas::setBrushGradient(const Geom::Line &line,
 	    std::is_same_v<decltype(Stop::value.alpha), double>);
 
 	::canvas_setBrushGradient(this,
-	    line.begin.x,
-	    line.begin.y,
-	    line.end.x,
-	    line.end.y,
-	    gradient.stops.size(),
-	    gradient.stops.data());
+	    gradient.line.begin.x,
+	    gradient.line.begin.y,
+	    gradient.line.end.x,
+	    gradient.line.end.y,
+	    gradient.colors.stops.size(),
+	    gradient.colors.stops.data());
 }
 
 void JScriptCanvas::frameEnd() { ::canvas_frameEnd(this); }

src/apps/weblib/jscriptcanvas.h

@@ -44,8 +44,8 @@ class JScriptCanvas : public Gfx::ICanvas, public Draw::Painter
 	void text(const Geom::Rect &rect,
 	    const std::string &text) override;
 
-	void setBrushGradient(const Geom::Line &line,
-	    const Gfx::ColorGradient &gradient) override;
+	void setBrushGradient(
+	    const Gfx::LinearGradient &gradient) override;
 
 	void frameBegin() override;
 	void frameEnd() override;

src/base/conv/auto_json.h

@@ -326,7 +326,7 @@ struct JSONObj : protected JSONRepeat<'{', '}'>
 		return std::move(*this);
 	}
 
-	template <class T> JSONObj &&mergeObj(T &&obj) &&
+	template <class T> JSONObj &&mergeObj(const T &obj) &&
 	{
 		auto pre_size = json.size();
 

src/base/gfx/canvas.h

@@ -10,9 +10,9 @@
 #include "base/geom/point.h"
 #include "base/geom/rect.h"
 #include "base/gfx/color.h"
-#include "base/gfx/colorgradient.h"
 #include "base/gfx/colortransform.h"
 #include "base/gfx/font.h"
+#include "base/gfx/lineargradient.h"
 
 namespace Gfx
 {
@@ -55,8 +55,7 @@ struct ICanvas
 	virtual void text(const Geom::Rect &rect,
 	    const std::string &text) = 0;
 
-	virtual void setBrushGradient(const Geom::Line &line,
-	    const ColorGradient &gradient) = 0;
+	virtual void setBrushGradient(const LinearGradient &gradient) = 0;
 
 	virtual void frameBegin() = 0;
 	virtual void frameEnd() = 0;

src/base/gfx/lineargradient.h

@@ -0,0 +1,19 @@
+#ifndef GFX_LINEARGRADIENT_H
+#define GFX_LINEARGRADIENT_H
+
+#include "base/geom/line.h"
+
+#include "colorgradient.h"
+
+namespace Gfx
+{
+
+struct LinearGradient
+{
+	Geom::Line line;
+	ColorGradient colors;
+};
+
+}
+
+#endif // GFX_LINEARGRADIENT_H

src/chart/rendering/drawlegend.cpp

@@ -108,7 +108,7 @@ void DrawLegend::ColorGradientSetter::operator()(Gfx::ICanvas &canvas,
 	modifiableStops[0].value.alpha = 0.0;
 	modifiableStops[3].value.alpha = 0.0;
 
-	canvas.setBrushGradient(transform(line), gradient);
+	canvas.setBrushGradient({transform(line), gradient});
 }
 
 void DrawLegend::drawTitle(const Info &info) const
@@ -340,9 +340,9 @@ void DrawLegend::colorBar(const Info &info,
 {
 	info.canvas.save();
 
-	info.canvas.setBrushGradient(rect.leftSide(),
+	info.canvas.setBrushGradient({rect.leftSide(),
 	    Gfx::ColorGradient{*rootStyle.plot.marker.colorGradient
-	                       * info.measureWeight});
+	                       * info.measureWeight}});
 	info.canvas.setLineColor(Gfx::Color::Transparent());
 	info.canvas.setLineWidth(0);
 
@@ -372,8 +372,8 @@ void DrawLegend::lightnessBar(const Info &info,
 
 	info.canvas.save();
 
-	info.canvas.setBrushGradient(rect.leftSide(),
-	    Gfx::ColorGradient{gradient * info.measureWeight});
+	info.canvas.setBrushGradient({rect.leftSide(),
+	    Gfx::ColorGradient{gradient * info.measureWeight}});
 	info.canvas.setLineColor(Gfx::Color::Transparent());
 	info.canvas.setLineWidth(0);
 

test/e2e/tests/features.json

@@ -11,7 +11,7 @@
 			"refs": ["d7c6dee"]
 		},
 		"data_input/object_records": {
-			"refs": ["3a584a1"]
+			"refs": ["9d5443f"]
 		},
 		"events/drawing_events": {
 			"refs": ["a92ae15"]
@@ -26,7 +26,7 @@
 			"refs": ["7b07504"]
 		},
 		"presets": {
-			"refs": ["b49796d"]
+			"refs": ["f154a71"]
 		},
 		"detach": {
 			"refs": ["e3b0c44"]

test/e2e/tests/fixes.json

@@ -32,10 +32,10 @@
 			"refs": ["e03918d"]
 		},
 		"536": {
-			"refs": ["8d89406"]
+			"refs": ["40a70bd"]
 		},
 		"540": {
-			"refs": ["13feb5d"]
+			"refs": ["bc34559"]
 		},
 		"32303048": {
 			"refs": ["b5d95ea"]
@@ -44,10 +44,10 @@
 			"refs": ["2ad1738"]
 		},
 		"41932946": {
-			"refs": ["7a80484"]
+			"refs": ["eb411c5"]
 		},
 		"42836788": {
-			"refs": ["514c798"]
+			"refs": ["9a7a020"]
 		},
 		"47977099": {
 			"refs": ["5f58727"]