Inline constructor, rename sort

Author: schaumb

src/chart/generator/plot.cpp

@@ -201,7 +201,7 @@ Plot::sortedBuckets(const Buckets &buckets, bool main)
 		}
 	}
 
-	if (main && options->sorted == Sort::byValue) {
+	if (main && options->sort == Sort::byValue) {
 		std::sort(sorted.begin(),
 		    sorted.end(),
 		    [=](const std::pair<uint64_t, double> &a,

src/chart/options/config.cpp

@@ -247,19 +247,7 @@ Config::Accessors Config::initAccessors()
 
 	res.emplace(accessor<&Options::title>);
 	res.emplace(accessor<&Options::legend>);
-
-	res.insert({"coordSystem",
-	    {.get =
-	            [](const Options &options)
-	        {
-		        return Conv::toString(options.coordSystem);
-	        },
-	        .set =
-	            [](OptionsSetter &setter, const std::string &value)
-	        {
-		        setter.setCoordSystem(
-		            Conv::parse<CoordSystem>(value));
-	        }}});
+	res.emplace(accessor<&Options::coordSystem>);
 
 	res.insert({"rotate",
 	    {.get =
@@ -292,18 +280,7 @@ Config::Accessors Config::initAccessors()
 		            orientation == Orientation::horizontal);
 	        }}});
 
-	res.insert({"sort",
-	    {.get =
-	            [](const Options &options)
-	        {
-		        return Conv::toString(options.sorted);
-	        },
-	        .set =
-	            [](OptionsSetter &setter, const std::string &value)
-	        {
-		        setter.setSorted(Conv::parse<Sort>(value));
-	        }}});
-
+	res.emplace(accessor<&Options::sort>);
 	res.emplace(accessor<&Options::reverse>);
 	res.emplace(accessor<&Options::align>);
 	res.emplace(accessor<&Options::split>);

src/chart/options/options.cpp

@@ -17,15 +17,6 @@ ChannelExtrema operator"" _perc(long double percent)
 
 uint64_t Options::nextMarkerInfoId = 1;
 
-Options::Options() :
-    title(std::nullopt),
-    coordSystem(CoordSystem::cartesian),
-    geometry(ShapeType::rectangle),
-    horizontal(true),
-    sorted(Sort::none),
-    reverse(false)
-{}
-
 void Options::reset()
 {
 	channels.reset();
@@ -185,7 +176,7 @@ bool Options::sameShadowAttribs(const Options &other) const
 	return shape == shapeOther && coordSystem == other.coordSystem
 	    && angle == other.angle && horizontal == other.horizontal
 	    && split == other.split && dataFilter == other.dataFilter
-	    && align == other.align && sorted == other.sorted
+	    && align == other.align && sort == other.sort
 	    && reverse == other.reverse;
 }
 

src/chart/options/options.h

@@ -35,7 +35,7 @@ class Options
 	using Legend = ::Anim::Interpolated<LegendType>;
 	using MarkersInfoMap = std::map<uint64_t, MarkerId>;
 
-	Options();
+	Options() = default;
 
 	[[nodiscard]] const Channels &getChannels() const
 	{
@@ -75,16 +75,16 @@ class Options
 
 	Channel &stackAxis() { return channels.at(stackAxisType()); }
 
-	Title title;
-	Anim::Interpolated<CoordSystem> coordSystem;
+	Title title{std::nullopt};
+	Anim::Interpolated<CoordSystem> coordSystem{CoordSystem::cartesian};
 	double angle;
-	Anim::Interpolated<ShapeType> geometry;
-	Math::FuzzyBool horizontal;
+	Anim::Interpolated<ShapeType> geometry{ShapeType::rectangle};
+	Math::FuzzyBool horizontal{true};
 	Math::FuzzyBool split;
 	Base::Align::Type align{Base::Align::Type::none};
 	Data::Filter dataFilter;
-	Sort sorted;
-	Math::FuzzyBool reverse;
+	Sort sort{Sort::none};
+	Math::FuzzyBool reverse{false};
 	Legend legend;
 	std::optional<uint64_t> tooltip;
 	MarkersInfoMap markersInfo;

src/chart/options/optionssetter.cpp

@@ -130,7 +130,7 @@ OptionsSetter::setLabelLevel(const ChannelId &channelId, int level)
 
 OptionsSetter &OptionsSetter::setSorted(Sort value)
 {
-	options.sorted = value;
+	options.sort = value;
 	return *this;
 }