Merge remote-tracking branch 'origin/Translate_legend' into intermediate_steps_labels

# Conflicts:
#	CHANGELOG.md
#	test/e2e/test_cases/test_cases.json

Author: schaumb

CHANGELOG.md

@@ -5,11 +5,21 @@
 ### Fixed
 
 - Legend title bottomPadding extended.
+- ColorGradient fromString not increasing position prohibited.
+- Fix alpha settings to linear by default:
+  - Axis: line, title, labels, guides, interlacing, ticks
+  - Legend: title, dimension markers, measure extrema labels
+  - Marker: line with connections
+- Fix negative ranges on x, y, color (measure) and lightness.
+- Fix axis step parameter if not match with the range sign (neg/pos).
+- Fix axis interpolation. From now the axis and axis labels are following the markers.
+- Fix measure axis labels when the range started after the 2000th step value from origo. 
 - Remove marker labels at intermediate steps.
 
 ### Added
 
 - New style parameter for the legend scrolling.
+- Remove background settings for all text, including title, subtitle and caption.
 
 ## [0.12.1] - 2024-08-22
 

docs/tutorial/chart_layout.js

@@ -25,9 +25,7 @@ Promise.all([dataLoaded, mdChartLoaded]).then((results) => {
 				(chart) => {
 					return chart.animate({
 						style: {
-							title: {
-								backgroundColor: '#A0A0A0'
-							},
+							backgroundColor: '#A0A0A0',
 							plot: {
 								backgroundColor: '#D2D2D2'
 							},

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/apps/weblib/ts-api/events.ts

@@ -124,8 +124,8 @@ export interface Caption extends TextElement {
 export interface Legend extends Element {
 	tagName: 'legend'
 	channel: string
-	/** Marker labels y overflow by pixel */
-	yOverflow: number
+	scrollTop: number
+	scrollHeight: number
 }
 
 /** Logo element of the chart. */

src/apps/weblib/typeschema-api/styles.yaml

@@ -123,10 +123,6 @@ definitions:
                 type: string
                 enum: [center, left, right]
                 nullable: true
-            backgroundColor:
-                description: The background color of the displayed text.
-                $ref: Color
-                nullable: true
             numberFormat:
                 description: |
                     The format of the number. Only applicable for texts showing numerical

src/base/anim/duration.cpp

@@ -63,13 +63,13 @@ double Duration::sec() const { return msec() / 1000.0; }
 
 Duration &Duration::operator+=(const Duration &other)
 {
-	*this = *this + other;
+	static_cast<Base &>(*this) += other;
 	return *this;
 }
 
 Duration &Duration::operator-=(const Duration &other)
 {
-	*this = *this - other;
+	static_cast<Base &>(*this) -= other;
 	return *this;
 }
 

src/base/anim/easing.cpp

@@ -16,10 +16,10 @@ Easing::Easing(const std::string &name)
 {
 	if (name.empty()) return;
 
-	auto nameCopy = name;
-	Text::SmartString::trim(nameCopy);
-
-	if (nameCopy == "none") { func = &Easing::none; }
+	if (auto nameCopy = Text::SmartString::trim_view(name);
+	    nameCopy == "none") {
+		func = &Easing::none;
+	}
 	else if (nameCopy == "linear") {
 		func = &Easing::linear;
 	}
@@ -45,7 +45,7 @@ Easing::Easing(const std::string &name)
 		func = EasingGradient::Bezier(Geom::Point{0.42, 0},
 		    Geom::Point{0.58, 1});
 	}
-	else if (const Text::FuncString f(nameCopy, false);
+	else if (const Text::FuncString f(name);
 	         f.getName() == "cubic-bezier") {
 		if (f.getParams().size() != 4)
 			throw std::logic_error("parameter count missmatch");