Merge pull request #566 from vizzuhq/dimfix

Fix dimension columns aggregation with non-existent values

Author: schaumb

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - Area charts with data series started with zero: tooltip fixed.
 - Series whose contained ',' and aggregated were not working properly.
+- Dimension columns with non-existent values aggregation was undefined.
 
 ## [0.12.0] - 2024-07-29
 

src/apps/qutils/canvas.cpp

@@ -6,6 +6,8 @@
 #include <QLinearGradient>
 #include <QScreen>
 
+// NOLINTBEGIN(misc-include-cleaner,readability-avoid-nested-conditional-operator)
+
 QColor toQColor(const Gfx::Color &color)
 {
 	return {color.getRedByte(),
@@ -276,4 +278,6 @@ QFont BaseCanvas::fromGfxFont(const Gfx::Font &newFont, QFont font)
 	                  ? QFont::StyleOblique
 	                  : QFont::StyleNormal);
 	return font;
-}
+}
+
+// NOLINTEND(misc-include-cleaner,readability-avoid-nested-conditional-operator)

src/base/geom/circle.cpp

@@ -4,8 +4,8 @@
 #include <cmath>
 #include <numbers>
 #include <optional>
-#include <stdexcept>
 
+#include "base/geom/point.h"
 #include "base/math/floating.h"
 #include "base/math/tolerance.h"
 

src/base/geom/quadrilateral.cpp

@@ -1,9 +1,10 @@
 #include "quadrilateral.h"
 
-#include "base/math/tolerance.h"
+#include <algorithm>
+
+#include "base/math/floating.h"
 
 #include "point.h"
-#include "rect.h"
 #include "triangle.h"
 
 namespace Geom

src/base/gfx/pathsampler.cpp

@@ -1,9 +1,11 @@
 #include "pathsampler.h"
 
+#include <cmath>
 #include <cstddef>
 
 #include "base/geom/point.h"
 #include "base/geom/triangle.h"
+#include "base/math/floating.h"
 
 namespace Gfx
 {

src/chart/rendering/markers/abstractmarker.cpp

@@ -1,5 +1,9 @@
 #include "abstractmarker.h"
 
+#include <array>
+#include <cstddef>
+#include <utility>
+
 #include "base/anim/interpolated.h"
 #include "base/geom/line.h"
 #include "chart/generator/marker.h"

src/chart/rendering/renderedchart.cpp

@@ -1,13 +1,13 @@
 #include "renderedchart.h"
 
 #include <algorithm>
+#include <limits>
 #include <ranges>
 #include <variant>
 
 #include "base/geom/point.h"
 #include "base/geom/transformedrect.h"
 #include "base/math/floating.h"
-#include "base/math/fuzzybool.h"
 #include "base/util/eventdispatcher.h"
 #include "chart/generator/marker.h" // NOLINT(misc-include-cleaner)
 #include "chart/options/shapetype.h"

src/dataframe/impl/data_source.cpp

@@ -238,14 +238,11 @@ cell_reference data_source::get_data(std::size_t record_id,
 		using enum series_type;
 	case dimension: {
 		const auto &dims = unsafe_get<dimension>(series).second;
-		if (record_id >= dims.values.size()) return nullptr;
 		return dims.get(record_id);
 	}
 	case measure: {
 		const auto &meas = unsafe_get<measure>(series).second;
-		if (record_id >= meas.values.size()) return nan;
-
-		return meas.values[record_id];
+		return meas.get(record_id);
 	}
 	case unknown:
 	default: error(error_type::series_not_found, column);
@@ -627,9 +624,9 @@ void data_source::dimension_t::add_more_data(
 const std::string *data_source::dimension_t::get(
     std::size_t index) const
 {
-	return values[index] == nav
-	         ? nullptr
-	         : std::addressof(categories[values[index]]);
+	return index < values.size() && values[index] != nav
+	         ? std::addressof(categories[values[index]])
+	         : nullptr;
 }
 
 void data_source::dimension_t::set(std::size_t index,

src/dataframe/interface.h

@@ -63,11 +63,6 @@ struct custom_aggregator
 		return name <=> oth.name;
 	}
 
-	auto operator!=(const custom_aggregator &oth) const
-	{
-		return name != oth.name;
-	}
-
 	auto operator==(const custom_aggregator &oth) const
 	{
 		return name == oth.name;

src/dataframe/old/datatable.cpp

@@ -16,10 +16,8 @@
 #include "base/conv/auto_json.h"
 #include "base/conv/numtostr.h"
 #include "base/refl/auto_enum.h"
-#include "base/text/funcstring.h"
 #include "chart/options/options.h"
 #include "chart/options/shapetype.h"
-#include "dataframe/impl/aggregators.h"
 #include "dataframe/impl/data_source.h"
 #include "dataframe/interface.h"