Implement flow map smoothing

cartocrow/flow_map/CMakeLists.txt

@@ -8,6 +8,8 @@ set(SOURCES
 	polar_point.cpp
 	polar_segment.cpp
 	reachable_region_algorithm.cpp
+	smooth_tree.cpp
+	smooth_tree_painting.cpp
 	spiral.cpp
 	spiral_segment.cpp
 	spiral_tree.cpp
@@ -28,6 +30,8 @@ set(HEADERS
 	polar_point.h
 	polar_segment.h
 	reachable_region_algorithm.h
+	smooth_tree.h
+	smooth_tree_painting.h
 	spiral.h
 	spiral_segment.h
 	spiral_tree.h

cartocrow/flow_map/node.h

@@ -57,6 +57,12 @@ struct Node {
 	/// leaf nodes, a node with the leaf type may have children if it is located
 	/// inside the spiral region of another node.
 	std::vector<std::shared_ptr<Node>> m_children;
+
+	/// The amount of flow through this node.
+	Number<Inexact> m_flow;
+
+	/// The index of this node in its tree.
+	int m_id = -1;
 };
 
 } // namespace cartocrow::flow_map

cartocrow/flow_map/polar_point.cpp

@@ -57,6 +57,14 @@ const Number<Inexact> PolarPoint::phi() const {
 	return m_phi;
 }
 
+void PolarPoint::setR(Number<Inexact> r) {
+	m_r = r;
+}
+
+void PolarPoint::setPhi(Number<Inexact> phi) {
+	m_phi = phi;
+}
+
 Point<Inexact> PolarPoint::toCartesian() const {
 	const Vector<Inexact> d = Vector<Inexact>(std::cos(phi()), std::sin(phi()));
 	return Point<Inexact>(CGAL::ORIGIN) + r() * d;

cartocrow/flow_map/polar_point.h

@@ -41,23 +41,17 @@ class PolarPoint {
   public:
 	/// Constructs a polar point at the origin.
 	PolarPoint();
-
 	/// Constructs a polar point at the origin.
 	[[deprecated]] PolarPoint(const CGAL::Origin& o);
-
 	/// Constructs a polar point with given \f$r\f$ and \f$\phi\f$.
 	PolarPoint(const Number<Inexact>& R, const Number<Inexact>& phi);
-
 	/// Copy constructor.
 	PolarPoint(const PolarPoint& p);
-
 	/// Constructs a polar point that corresponds to \f$p + t\f$, where \f$p\f$
 	/// is a polar point and \f$t\f$ is a vector in Cartesian coordinates.
 	PolarPoint(const PolarPoint& p, const Vector<Inexact>& t);
-
 	/// Constructs a polar point from a point in Cartesian coordinates.
 	explicit PolarPoint(const Point<Inexact>& p);
-
 	PolarPoint(const Point<Inexact>& p, const Vector<Inexact>& t);
 
 	/// Returns the distance \f$r\f$ from the origin.
@@ -67,6 +61,11 @@ class PolarPoint {
 	/// Returns the angle \f$\phi\f$ relative to the origin.
 	const Number<Inexact> phi() const;
 
+	/// Sets the distance \f$r\f$ from the origin.
+	void setR(Number<Inexact> r);
+	/// Sets the distance \f$\phi\f$ relative to the origin.
+	void setPhi(Number<Inexact> phi);
+
 	/// Returns the point in Cartesian coordinates corresponding to this polar
 	/// point.
 	Point<Inexact> toCartesian() const;