ColorGradient fromString fix

Author: schaumb

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixed
 
 - Legend title bottomPadding extended.
+- ColorGradient fromString not increasing position prohibited.
 
 ### Added
 

src/base/gfx/colorgradient.cpp

@@ -14,15 +14,19 @@ namespace Gfx
 ColorGradient::ColorGradient(const std::string &stoplist)
 {
 	for (const auto &stopString :
-	    Text::SmartString::split(stoplist, ',', true))
+	    Text::SmartString::split(stoplist, ',', true)) {
 		if (auto &&parts =
 		        Text::SmartString::split(stopString, ' ', true);
 		    parts.size() == 2)
-			stops.emplace_back(std::stod(parts[1]),
-			    Color::fromString(parts[0]));
-		else
-			throw std::logic_error(
-			    "invalid gradient stop: " + stopString);
+			if (auto pos = std::stod(parts[1]);
+			    std::isfinite(pos)
+			    && (stops.empty() || pos >= stops.back().pos)) {
+				stops.emplace_back(pos, Color::fromString(parts[0]));
+				continue;
+			}
+		throw std::logic_error(
+		    "invalid gradient stop: " + stopString);
+	}
 }
 
 ColorGradient::operator std::string() const

src/base/math/segmentedfunc.h

@@ -73,18 +73,16 @@ template <typename T, class CRTP> struct SegmentedFunction
 		if (stops.empty()) return T();
 		if (stops.size() == 1 || pos < stops.front().pos)
 			return stops.front().value;
+		if (pos > stops.back().pos) return stops.back().value;
 
-		if (auto it = std::ranges::adjacent_find(stops,
-		        [pos](auto &&cur, auto &&next)
-		        {
-			        return cur.pos <= pos && pos <= next.pos;
-		        });
-		    it != stops.end())
-			return interpolate(it->value,
-			    std::next(it)->value,
-			    Range{it->pos, std::next(it)->pos}.rescale(pos));
-
-		return stops.back().value;
+		auto it = std::ranges::adjacent_find(stops,
+		    [pos](auto &&cur, auto &&next)
+		    {
+			    return cur.pos <= pos && pos <= next.pos;
+		    });
+		return interpolate(it->value,
+		    std::next(it)->value,
+		    Range{it->pos, std::next(it)->pos}.rescale(pos));
 	}
 };
 

src/chart/main/events.h

@@ -373,56 +373,46 @@ class Events
 		    const std::string_view &categoryName,
 		    const std::string_view &categoryValue,
 		    const std::string &label,
-
 		    const LegendProperties &properties)
 		{
 			return std::make_unique<CategoryInfo<Text<LegendChild>>>(
 			    categoryName,
 			    categoryValue,
 			    label,
 			    "label",
-
 			    properties);
 		}
 
 		static auto measLegendLabel(const std::string &label,
-
 		    const LegendProperties &properties)
 		{
 			return std::make_unique<Text<LegendChild>>(label,
 			    "label",
-
 			    properties);
 		}
 
 		static auto legendTitle(const std::string &title,
-
 		    const LegendProperties &properties)
 		{
 			return std::make_unique<Text<LegendChild>>(title,
 			    "title",
-
 			    properties);
 		}
 
 		static auto legendMarker(const std::string_view &categoryName,
 		    const std::string_view &categoryValue,
-
 		    const LegendProperties &properties)
 		{
 			return std::make_unique<CategoryInfo<LegendChild>>(
 			    categoryName,
 			    categoryValue,
 			    "marker",
-
 			    properties);
 		}
 
 		static auto legendBar(const LegendProperties &properties)
 		{
-			return std::make_unique<LegendChild>("bar",
-
-			    properties);
+			return std::make_unique<LegendChild>("bar", properties);
 		}
 
 		static auto dimAxisLabel(const std::string_view &categoryName,

src/chart/rendering/drawlegend.cpp

@@ -180,7 +180,6 @@ void DrawLegend::drawDimension(const Info &info) const
 			            info.dimension.category,
 			            value.second.categoryValue,
 			            value.second.categoryValue,
-
 			            info.properties),
 			        {.alpha =
 			                double{
@@ -247,7 +246,6 @@ void DrawLegend::drawMarker(const Info &info,
 	auto markerElement =
 	    Events::Targets::legendMarker(info.dimension.category,
 	        categoryValue,
-
 	        info.properties);
 
 	if (events.marker->invoke(
@@ -307,9 +305,7 @@ void DrawLegend::extremaLabel(const Info &info,
 	    text,
 	    style.label,
 	    *events.label,
-	    Events::Targets::measLegendLabel(text,
-
-	        info.properties),
+	    Events::Targets::measLegendLabel(text, info.properties),
 	    {.alpha = info.measureWeight * plusWeight});
 }