Merge pull request #519 from vizzuhq/iterate_on_dataframe

Iterate on dataframe v2

Author: schaumb

CHANGELOG.md

@@ -13,6 +13,8 @@
 - From now legend appears/disappears linear time.
 - Axis labels are not animated to a different axis label.
 - Dimension axis density on sorted values was wrongly calculated.
+- Tooltip with 'seriesName' does not rewrite first series data.
+- Handle as different category the empty string and the missing value.
 
 ### Added
 

project/cmake/lib/CMakeLists.txt

@@ -3,7 +3,6 @@ include(../common.txt)
 file(GLOB_RECURSE sources CONFIGURE_DEPENDS
 	${root}/plugin/*.cpp
 	${root}/src/base/*.cpp
-	${root}/src/data/*.cpp
 	${root}/src/chart/*.cpp
 	${root}/src/dataframe/*.cpp)
 
@@ -12,10 +11,7 @@ include(../version.txt)
 file(GLOB_RECURSE headers CONFIGURE_DEPENDS
 	${root}/plugin/*.h
 	${root}/src/base/*.h
-	${root}/src/data/*.h
-	${root}/src/data/*.inc
 	${root}/src/chart/*.h
-	${root}/src/chart/*.inc
 	${root}/src/dataframe/*.h)
 
 add_library(vizzulib ${sources})

src/.clang-tidy

@@ -6,6 +6,7 @@ Checks: >
   -bugprone-narrowing-conversions,
   -bugprone-unchecked-optional-access,
   cert-*,
+  -cert-dcl21-cpp,
   -cert-err58-cpp,
   clang-analyzer-*,
   clang-diagnostic-*,

src/apps/weblib/interface.cpp

@@ -5,6 +5,8 @@
 #include "base/conv/auto_json.h"
 #include "base/io/log.h"
 #include "base/refl/auto_accessor.h"
+#include "chart/main/version.h"
+#include "chart/ui/chart.h"
 
 #include "canvas.h"
 #include "interfacejs.h"
@@ -21,6 +23,26 @@ std::unique_ptr<T, Deleter> create_unique_ptr(T *&&ptr,
 	return {ptr, std::forward<Deleter>(deleter)};
 }
 
+struct Interface::Snapshot
+{
+	Snapshot(Gen::Options options, Styles::Chart styles) :
+	    options(std::move(options)),
+	    styles(std::move(styles))
+	{}
+	Gen::Options options;
+	Styles::Chart styles;
+};
+
+struct Interface::Animation
+{
+	Animation(Anim::AnimationPtr anim, Snapshot snapshot) :
+	    animation(std::move(anim)),
+	    snapshot(std::move(snapshot))
+	{}
+	Anim::AnimationPtr animation;
+	Snapshot snapshot;
+};
+
 Interface &Interface::getInstance()
 {
 	static Interface instance;

src/apps/weblib/interface.h

@@ -1,14 +1,13 @@
 #ifndef LIB_INTERFACE_H
 #define LIB_INTERFACE_H
 
-#include "chart/main/version.h"
-#include "chart/ui/chart.h"
-
+#include "cinterface.h"
 #include "jsfunctionwrapper.h"
 #include "objectregistry.h"
 
 namespace Vizzu
 {
+class Chart;
 
 class Interface
 {
@@ -122,28 +121,11 @@ class Interface
 	    const char *column);
 
 private:
-	struct Snapshot
-	{
-		Snapshot(Gen::Options options, Styles::Chart styles) :
-		    options(std::move(options)),
-		    styles(std::move(styles))
-		{}
-		Gen::Options options;
-		Styles::Chart styles;
-	};
-
-	struct Animation
-	{
-		Animation(Anim::AnimationPtr anim, Snapshot snapshot) :
-		    animation(std::move(anim)),
-		    snapshot(std::move(snapshot))
-		{}
-		Anim::AnimationPtr animation;
-		Snapshot snapshot;
-	};
-
-	std::shared_ptr<Vizzu::Chart> getChart(
-	    ObjectRegistry::Handle chart);
+	struct Snapshot;
+
+	struct Animation;
+
+	std::shared_ptr<Chart> getChart(ObjectRegistry::Handle chart);
 
 	ObjectRegistry objects;
 };

src/apps/weblib/objectregistry.h

@@ -4,6 +4,7 @@
 #include <any>
 #include <memory>
 #include <shared_mutex>
+#include <thread>
 #include <unordered_map>
 
 namespace Vizzu

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/conv/auto_json.h

@@ -92,32 +92,9 @@ struct JSON
 		}
 	}
 
-	template <class T> inline void array(const T &val) const
-	{
-		json += '[';
-		bool not_first = false;
-		for (const auto &e : val) {
-			if (not_first)
-				json += ',';
-			else
-				not_first = true;
-			any(e);
-		}
-		json += ']';
-	}
+	template <class T> inline void array(const T &val) const;
 
-	template <class T> inline void tupleObj(const T &val) const
-	{
-		std::apply(
-		    [this](const auto &arg, const auto &...args)
-		    {
-			    json += '[';
-			    any(arg);
-			    ((json += ',', any(args)), ...);
-			    json += ']';
-		    },
-		    val);
-	}
+	template <class T> inline void tupleObj(const T &val) const;
 
 	template <class T> void dynamicObj(const T &val) const;
 
@@ -267,26 +244,36 @@ template <class J> struct JSONNoBaseAutoObj : JSONAutoObj
 	}
 };
 
-struct JSONObj : JSON
+template <char open, char close> struct JSONRepeat : JSON
 {
 	using JSON::JSON;
 
-	inline ~JSONObj()
+	JSONRepeat(JSONRepeat &&) = delete;
+	JSONRepeat(const JSONRepeat &) = delete;
+	JSONRepeat &operator=(const JSONRepeat &) = delete;
+	JSONRepeat &operator=(JSONRepeat &&) = delete;
+
+	inline ~JSONRepeat()
 	{
-		if (!was) json += '{';
-		json += '}';
+		if (!was) json += open;
+		json += close;
 	}
 
-	JSONObj(JSONObj &&) = delete;
-	JSONObj(const JSONObj &) = delete;
-	JSONObj &operator=(const JSONObj &) = delete;
-	JSONObj &operator=(JSONObj &&) = delete;
+	void sep() { json += std::exchange(was, true) ? ',' : open; }
+
+	bool was{};
+};
+
+struct JSONArr;
+
+struct JSONObj : protected JSONRepeat<'{', '}'>
+{
+	using JSONRepeat::JSONRepeat;
 
 	template <bool KeyNoEscape = true>
 	inline JSON &key(std::string_view key)
 	{
-		json += std::exchange(was, true) ? ',' : '{';
-
+		sep();
 		json += '\"';
 		if constexpr (KeyNoEscape)
 			json.append(key);
@@ -304,6 +291,9 @@ struct JSONObj : JSON
 		return JSONObj{json};
 	}
 
+	template <bool KeyNoEscape = true>
+	inline JSONArr nestedArr(std::string_view key);
+
 	template <bool KeyNoEscape = true>
 	inline JSONObj &raw(std::string_view key, const std::string &str)
 	{
@@ -327,10 +317,48 @@ struct JSONObj : JSON
 		any(val);
 		return std::move(*this);
 	}
+};
 
-	bool was{};
+struct JSONArr : protected JSONRepeat<'[', ']'>
+{
+	using JSONRepeat::JSONRepeat;
+
+	template <class T> inline JSONArr &operator<<(const T &obj)
+	{
+		sep();
+		any(obj);
+		return *this;
+	}
+
+	inline JSONArr nested()
+	{
+		sep();
+		return JSONArr{json};
+	}
+
+	inline JSONObj nestedObj()
+	{
+		sep();
+		return JSONObj{json};
+	}
 };
 
+template <class T> inline void JSON::array(const T &val) const
+{
+	auto arr = JSONArr{json};
+	for (const auto &e : val) arr << e;
+}
+
+template <class T> inline void JSON::tupleObj(const T &val) const
+{
+	std::apply(
+	    [this](const auto &...args)
+	    {
+		    (JSONArr{json} << ... << args);
+	    },
+	    val);
+}
+
 template <class T> inline void JSON::dynamicObj(const T &val) const
 {
 	auto j = JSONObj{json};
@@ -344,6 +372,13 @@ template <class T> inline void JSON::staticObj(const T &val) const
 	Refl::visit(JSONNoBaseAutoObj<T>{json}, val);
 }
 
+template <bool KeyNoEscape>
+inline JSONArr JSONObj::nestedArr(std::string_view key)
+{
+	this->key<KeyNoEscape>(key);
+	return JSONArr{json};
+}
+
 template <class T> inline std::string toJSON(const T &v)
 {
 	std::string res;

src/base/gfx/draw/textbox.cpp

@@ -88,15 +88,19 @@ TextBox &TextBox::operator<<(const NewLine &)
 TextBox &TextBox::operator<<(const Font &font)
 {
 	newTextRun();
-	if (font.opCode == 0)
-		currentTextRun.font.size = font.size;
-	else if (font.opCode == 1)
+	switch (font.opCode) {
+	case 0: currentTextRun.font.size = font.size; break;
+	case 1:
 		currentTextRun.font.weight = Gfx::Font::Weight::Bold();
-	else if (font.opCode == 2)
+		break;
+	case 2:
 		currentTextRun.font.style = Gfx::Font::Style::italic;
-	else if (font.opCode == 3) {
+		break;
+	case 3:
 		currentTextRun.font.weight = Gfx::Font::Weight::Normal();
 		currentTextRun.font.style = Gfx::Font::Style::normal;
+		break;
+	default: break;
 	}
 	return *this;
 }
@@ -209,22 +213,20 @@ void TextBox::newTextRun()
 {
 	size.x = size.y = 0;
 	if (!currentTextRun.content.empty()) {
-		currentLine.texts.push_back(currentTextRun);
-		currentTextRun = TextRun{};
-		currentTextRun.font = currentLine.texts.rbegin()->font;
-		currentTextRun.backgroundColor =
-		    currentLine.texts.rbegin()->backgroundColor;
-		currentTextRun.foregroundColor =
-		    currentLine.texts.rbegin()->foregroundColor;
+		auto &preTextRun =
+		    currentLine.texts.emplace_back(std::move(currentTextRun));
+		currentTextRun =
+		    TextRun{.foregroundColor = preTextRun.foregroundColor,
+		        .backgroundColor = preTextRun.backgroundColor,
+		        .font = preTextRun.font};
 	}
 }
 
 void TextBox::newLine()
 {
 	newTextRun();
-	lines.push_back(currentLine);
-	currentLine = Line{};
-	currentLine.spacing = lines.rbegin()->spacing;
+	auto &back = lines.emplace_back(std::move(currentLine));
+	currentLine = Line{.spacing = back.spacing};
 }
 
 }

src/base/gfx/draw/textbox.h

@@ -98,15 +98,15 @@ class TextBox
 		std::optional<int> backgroundColor;
 		double width{0};
 		Gfx::Font font{};
-		std::string content;
+		std::string content{};
 	};
 
 	struct Line
 	{
 		double spacing{1.0};
 		double height{0};
 		double width{0};
-		std::vector<TextRun> texts;
+		std::vector<TextRun> texts{};
 	};
 
 	Geom::Size size;