Create split style parameter for axises

Author: schaumb

CHANGELOG.md

@@ -31,6 +31,10 @@
 - Add meaning to crossing interlacing.
 - Do not draw dimension axis labels when the middle of the text is off the plot.
 
+### Added
+
+- Add split property for plot axis style structure. Only supported the percentage value.
+
 ## [0.15.0] - 2024-10-28
 
 ### Fixed

src/apps/weblib/typeschema-api/styles.yaml

@@ -452,6 +452,9 @@ definitions:
             interlacing:
                 $ref: Interlacing
                 nullable: true
+            split:
+                $ref: Length
+                nullable: true
 
     Plot:
         $extends: [Padding, Box]

src/base/conv/auto_json.h

@@ -75,7 +75,7 @@ struct JSON
 		else if constexpr (std::is_arithmetic_v<T>) {
 			json += toString(val);
 		}
-		else if constexpr (std::is_enum_v<T>
+		else if constexpr (Refl::is_enum<T>
 		                   || std::is_same_v<T, bool>) {
 			json += '\"';
 			json += toString(val);

src/base/conv/parse.h

@@ -16,7 +16,7 @@ concept Parsable = !std::is_void_v<decltype(T::fromString(
 
 template <class To>
 constexpr inline static bool IsParsable =
-    std::is_enum_v<To> || Parsable<To>
+    Refl::is_enum<To> || Parsable<To>
     || (Type::is_optional_v<To> && IsParsable<Type::optional_t<To>>)
     || std::is_constructible_v<To, std::string>
     || std::is_same_v<To, bool> || std::is_floating_point_v<To>
@@ -28,7 +28,7 @@ template <typename To>
     requires IsParsable<To>
 [[nodiscard]] decltype(auto) parse(const std::string &string)
 {
-	if constexpr (std::is_enum_v<To>)
+	if constexpr (Refl::is_enum<To>)
 		return Refl::get_enum<To>(string);
 	else if constexpr (Parsable<To>)
 		return To::fromString(string);

src/base/conv/tostring.h

@@ -19,7 +19,7 @@ concept ToStringMember =
 
 template <class From>
 constexpr inline static bool IsStringifiable =
-    ToStringMember<From> || std::is_enum_v<From>
+    ToStringMember<From> || Refl::is_enum<From>
     || (Type::is_optional_v<From>
         && IsStringifiable<Type::optional_t<From>>)
     || std::is_constructible_v<std::string, From>
@@ -32,7 +32,7 @@ template <typename From>
     requires IsStringifiable<From>
 [[nodiscard]] decltype(auto) toString(const From &value)
 {
-	if constexpr (std::is_enum_v<From>)
+	if constexpr (Refl::is_enum<From>)
 		return Refl::enum_name(value);
 	else if constexpr (Type::is_optional_v<From>) {
 		using T = std::remove_cvref_t<decltype(toString(*value))>;

src/base/refl/auto_enum.h

@@ -193,6 +193,9 @@ template <class E> constexpr E get_enum(const std::string_view &data)
 	return static_cast<E>(ix + first);
 }
 
+template <class E>
+concept is_enum = std::is_enum_v<E> && Detail::count<E>() > 0;
+
 template <class E> consteval auto enum_values()
 {
 	constexpr auto first = Detail::from_to<E>().first;
@@ -258,9 +261,8 @@ struct EnumArray : std::array<V, std::size(enum_names<E>)>
 	bool operator==(const EnumArray &) const = default;
 };
 
-template <class E, class... Args>
-    requires(std::is_enum_v<E>
-             && sizeof...(Args) == Detail::count<E>()
+template <is_enum E, class... Args>
+    requires(sizeof...(Args) == Detail::count<E>()
              && Detail::from_to<E>().first == 0)
 struct EnumVariant : std::variant<Args...>
 {

src/base/type/physicalvalue.h

@@ -1,27 +1,33 @@
 #ifndef TYPE_PHYSICALVALUE
 #define TYPE_PHYSICALVALUE
 
-#include <cstdint>
+#include "base/conv/parse.h"
+#include "base/conv/tostring.h"
+#include "base/refl/auto_enum.h"
+#include "base/text/valueunit.h"
 
 namespace Type
 {
 
-enum class SimpleUnit : std::uint8_t { none, relative, absolute };
-
-template <typename Value, typename Unit = SimpleUnit>
-class PhysicalValue
+template <typename Value, Refl::is_enum Unit> struct PhysicalValue
 {
-public:
-	Value value;
-	Unit unit;
-
-	constexpr PhysicalValue() : value{}, unit{} {}
-	constexpr PhysicalValue(Value value, Unit unit) :
-	    value(value),
-	    unit(unit)
-	{}
+	Value value{};
+	Unit unit{};
 
 	constexpr bool operator==(const PhysicalValue &) const = default;
+
+	template <std::same_as<double> = Value>
+	static PhysicalValue fromString(const std::string &str)
+	{
+		Text::ValueUnit vu{str};
+		return {vu.getValue(), Refl::get_enum<Unit>(vu.getUnit())};
+	}
+
+	std::string toString() const
+	{
+		return Conv::toString(value)
+		     + std::string{Conv::toString(unit)};
+	}
 };
 
 }

src/chart/generator/plotbuilder.cpp

@@ -504,44 +504,44 @@ void PlotBuilder::addAlignment(const Buckets &subBuckets) const
 void PlotBuilder::addSeparation(const Buckets &subBuckets,
     const std::size_t &mainBucketSize) const
 {
-	if (plot->getOptions()->isSplit()) {
-		auto align = plot->getOptions()->align;
-
-		std::vector ranges{mainBucketSize,
-		    Math::Range<>::Raw({}, {})};
-		std::vector<bool> anyEnabled(mainBucketSize);
-
-		auto &&subAxis = plot->getOptions()->subAxisType();
-		for (auto &&bucket : subBuckets)
-			for (std::size_t i{}, prIx{};
-			     auto &&[marker, idx] : bucket) {
-				(i += idx.itemId - std::exchange(prIx, idx.itemId)) %=
-				    ranges.size();
-				if (marker.enabled) {
-					ranges[i].include(
-					    marker.getSizeBy(subAxis).size());
-					anyEnabled[i] = true;
-				}
-			}
+	if (!plot->getOptions()->isSplit()) return;
 
-		auto max = Math::Range<>::Raw({}, {});
-		for (auto i = 0U; i < ranges.size(); ++i)
-			if (anyEnabled[i]) max = max + ranges[i];
-
-		for (auto i = 1U; i < ranges.size(); ++i)
-			ranges[i] = ranges[i] + ranges[i - 1].getMax()
-			          + (anyEnabled[i - 1] ? max.getMax() / 15 : 0);
-
-		for (auto &&bucket : subBuckets)
-			for (std::size_t i{}, prIx{};
-			     auto &&[marker, idx] : bucket) {
-				(i += idx.itemId - std::exchange(prIx, idx.itemId)) %=
-				    ranges.size();
-				marker.setSizeBy(subAxis,
-				    Base::Align{align, ranges[i]}.getAligned(
-				        marker.getSizeBy(subAxis)));
-			}
-	}
+	auto align = plot->getOptions()->align;
+
+	std::vector ranges{mainBucketSize, Math::Range<>::Raw({}, {})};
+	std::vector<bool> anyEnabled(mainBucketSize);
+
+	auto &&subAxis = plot->getOptions()->subAxisType();
+	for (auto &&bucket : subBuckets)
+		for (std::size_t i{}, prIx{}; auto &&[marker, idx] : bucket) {
+			if (!marker.enabled) continue;
+			(i += idx.itemId - std::exchange(prIx, idx.itemId)) %=
+			    ranges.size();
+			ranges[i].include(marker.getSizeBy(subAxis).size());
+			anyEnabled[i] = true;
+		}
+
+	auto max = Math::Range<>::Raw({}, {});
+	for (auto i = 0U; i < ranges.size(); ++i)
+		if (anyEnabled[i]) max = max + ranges[i];
+
+	auto &axis = plot->getStyle().plot.getAxis(
+	    plot->getOptions()->subAxisType());
+	auto splitSpace = axis.split->get(max.getMax(),
+	    plot->getStyle().calculatedSize());
+
+	for (auto i = 1U; i < ranges.size(); ++i)
+		ranges[i] = ranges[i] + ranges[i - 1].getMax()
+		          + (anyEnabled[i - 1] ? splitSpace : 0);
+
+	for (auto &&bucket : subBuckets)
+		for (std::size_t i{}, prIx{}; auto &&[marker, idx] : bucket) {
+			(i += idx.itemId - std::exchange(prIx, idx.itemId)) %=
+			    ranges.size();
+			marker.setSizeBy(subAxis,
+			    Base::Align{align, ranges[i]}.getAligned(
+			        marker.getSizeBy(subAxis)));
+		}
 }
 
 void PlotBuilder::normalizeSizes()

src/chart/main/style.cpp

@@ -279,7 +279,8 @@ Chart Chart::def()
 						},
 						.interlacing = {
 							.color = Gfx::Color::Gray(0.97)
-						}
+						},
+						.split = Gfx::Length::Relative(1 / 15.)
 					},
 					.yAxis = {
 						.color = Gfx::Color::Gray(0.8),
@@ -370,7 +371,8 @@ Chart Chart::def()
 						},
 						.interlacing = {
 							.color = Gfx::Color::Gray(0.97)
-						}
+						},
+						.split = Gfx::Length::Relative(1 / 15.)
 					},
 					.areaColor = Gfx::Color::Transparent(),
 					.overflow = ::Anim::Interpolated<Overflow>(Overflow::hidden)

src/chart/main/style.h

@@ -245,6 +245,7 @@ struct Axis
 	Tick ticks;
 	Guide guides;
 	Interlacing interlacing;
+	Param<Gfx::Length> split;
 };
 
 struct MarkerLabelParams