Fix qt + simplify segmentedfunc

Author: schaumb

src/base/anim/easinggradient.cpp

@@ -19,7 +19,7 @@ EasingGradient EasingGradient::Bezier(const Geom::Point &p1,
 	if (p1.x < 0 || p1.x > 1 || p2.x < 0 || p2.x > 1)
 		throw std::logic_error("bezier point is out of range");
 
-	EasingGradient res;
+	EasingGradient res(stepCount);
 
 	const Geom::CubicBezier<Geom::Point> bezier(Geom::Point{0, 0},
 	    p1,
@@ -29,7 +29,7 @@ EasingGradient EasingGradient::Bezier(const Geom::Point &p1,
 	for (auto i = 0U; i < stepCount; ++i) {
 		auto point = bezier(static_cast<double>(i)
 		                    / static_cast<double>(stepCount - 1));
-		res.stops.emplace_back(point.x, point.y);
+		res.stops[i] = {point.x, point.y};
 	}
 
 	return res;

src/base/math/segmentedfunc.h

@@ -10,10 +10,8 @@ template <typename T> struct SegmentedFunction
 {
 	struct Stop
 	{
-		double pos;
-		T value;
-		Stop() : pos(0), value(T()) {}
-		Stop(double pos, const T &value) : pos(pos), value(value) {}
+		double pos{};
+		T value{};
 		bool operator==(const Stop &other) const
 		{
 			return pos == other.pos && value == other.value;
@@ -22,8 +20,9 @@ template <typename T> struct SegmentedFunction
 
 	std::vector<Stop> stops;
 
-	SegmentedFunction() = default;
-	explicit SegmentedFunction(std::vector<Stop> stops) :
+	SegmentedFunction() noexcept = default;
+	explicit SegmentedFunction(std::size_t init) : stops(init) {}
+	explicit SegmentedFunction(std::vector<Stop> &&stops) noexcept :
 	    stops(std::move(stops))
 	{}
 

src/base/math/segmentedfunc.tpp

@@ -16,15 +16,12 @@ T Math::SegmentedFunction<T>::at(double pos) const
 	if (pos > stops.back().pos) return stops.back().value;
 
 	for (auto i = 1U; i < stops.size(); ++i) {
-		if (pos >= stops.at(i - 1).pos && pos <= stops.at(i).pos) {
-			const Range range(stops.at(i - 1).pos, stops.at(i).pos);
-
-			auto factor = range.rescale(pos);
-
-			return interpolate(stops.at(i - 1).value,
-			    stops.at(i).value,
-			    factor);
-		}
+		auto &[ppos, pval] = stops[i - 1];
+		auto &[cpos, cval] = stops[i];
+		if (ppos <= pos && pos <= cpos)
+			return interpolate(pval,
+			    cval,
+			    Range{ppos, cpos}.rescale(pos));
 	}
 
 	return stops.back().value;

src/chart/generator/marker.cpp

@@ -165,8 +165,6 @@ double Marker::getValueForChannel(const Channels &channels,
 
 	if (channel.isEmpty()) return channel.defaultValue;
 
-	auto measure = channel.measureId;
-
 	double value{};
 
 	auto &stat = stats.channels[type];

test/qtest/chart.cpp

@@ -5,7 +5,7 @@
 #include "chart/rendering/drawplot.h"
 #include "chart/rendering/logo.h"
 #include "chart/ui/events.h"
-#include "data/datacube/datacube.h"
+#include "dataframe/old/datatable.h"
 
 TestChart::TestChart() {}
 
@@ -142,14 +142,16 @@ void TestChart::run()
 			IO::log() << "step 1b";
 			auto &options = chart.getChart().getOptions();
 			auto &styles = chart.getChart().getStyles();
-			options.dataFilter = {[&](const auto &row)
+			options.dataFilter = {1,
+			    [&](const Vizzu::Data::RowWrapper &row)
 			    {
-				    return std::string{row["Cat1"].dimensionValue()}
+				    return std::get<std::string_view>(
+				               row.get_value("Cat1"))
 				            == "A"
-				        || std::string{row["Cat2"].dimensionValue()}
+				        || std::get<std::string_view>(
+				               row.get_value("Cat2"))
 				               == "b";
-			    },
-			    0};
+			    }};
 			options.title = "VIZZU Chart - Phase 1b";
 			styles.legend.marker.type =
 			    Vizzu::Styles::Legend::Marker::Type::circle;