linechart: add 'margin' property to set all margins at once (1ab27060) · Commits · github_fork / Clip

charts/linechart.cc

+9 −0

Original line number	Diff line number	Diff line
		@@ -181,6 +181,15 @@ ReturnCode configureSeries(const plist::Property& prop, LinechartConfig* config)
		ReturnCode configure(const plist::PropertyList& plist, ElementRef* elem) {
		LinechartConfig config;
		static const ParserDefinitions pdefs = {
		{
		"margin",
		configure_multiprop({
		std::bind(&parseMeasureProp, std::placeholders::_1, &config.margins[0]),
		std::bind(&parseMeasureProp, std::placeholders::_1, &config.margins[1]),
		std::bind(&parseMeasureProp, std::placeholders::_1, &config.margins[2]),
		std::bind(&parseMeasureProp, std::placeholders::_1, &config.margins[3])
		})
		},
		{"margin-top", std::bind(&parseMeasureProp, std::placeholders::_1, &config.margins[0])},
		{"margin-right", std::bind(&parseMeasureProp, std::placeholders::_1, &config.margins[1])},
		{"margin-bottom", std::bind(&parseMeasureProp, std::placeholders::_1, &config.margins[2])},

+12 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,18 @@ ReturnCode parseMeasureProp(
		return parse_measure(prop[0], value);
		}

		ParserFn configure_multiprop(const std::vector<ParserFn>& parsers) {
		return [parsers] (const plist::Property& prop) -> ReturnCode {
		for (const auto& p : parsers) {
		if (auto rc = p(prop); !rc) {
		return rc;
		}
		}

		return OK;
		};
		}

		ReturnCode configure_colour(
		const plist::Property& prop,
		Colour* value) {

+5 −3

Original line number	Diff line number	Diff line
		@@ -37,9 +37,9 @@

		namespace plotfx {

		using ParserDefinitions = std::unordered_map<
		std::string,
		std::function<ReturnCode (const plist::Property&)>>;
		using ParserFn = std::function<ReturnCode (const plist::Property&)>;

		using ParserDefinitions = std::unordered_map<std::string, ParserFn>;

		inline ReturnCode parseAll(
		const plist::PropertyList& plist,
		@@ -79,6 +79,8 @@ ReturnCode parseEnum(
		return ReturnCode::success();
		}

		ParserFn configure_multiprop(const std::vector<ParserFn>& parsers);

		ReturnCode parseDataSeries(
		const plist::Property& prop,
		std::vector<double>* data);

0 → 100644

+9 −0

0 → 100644

+44.3 KiB

Loading image diff...