pick next default series colour from colour scheme (9c702d12) · Commits · github_fork / Clip

common/colour_scheme.h

+7 −6

Original line number	Diff line number	Diff line
		@@ -37,12 +37,13 @@ public:

		ColourScheme(
		const std::vector<std::string>& colors = std::vector<std::string>{
		"color1",
		"color2",
		"color3",
		"color4",
		"color5",
		"color6"}) :
		"#4572a7",
		"#aa4643",
		"#89a54e",
		"#80699b",
		"#3d96ae",
		"#db843d",
		}) :
		colors_(colors),
		color_index_(0) {}

+1 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,7 @@ ReturnCode configure(
		PlotConfig config;

		// FIXME
		config.colour_scheme = doc.colour_scheme;
		config.axis_top.font = doc.font_sans;
		config.axis_top.border_colour = doc.border_colour;
		config.axis_top.text_colour = doc.text_colour;

+1 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ struct PlotConfig {
		AxisDefinition axis_bottom;
		AxisDefinition axis_left;
		Measure margins[4];
		ColourScheme colour_scheme;
		std::vector<PlotSeries> series;
		};

+5 −0

Original line number	Diff line number	Diff line
		@@ -106,7 +106,12 @@ ReturnCode configure(const plist::Property& prop, PlotConfig* config) {
		return ERROR_INVALID_ARGUMENT;
		}

		auto colour = config->colour_scheme.next();

		PlotLinesConfig series;
		series.line_colour.parse(colour);
		series.point_colour.parse(colour);

		static const ParserDefinitions pdefs = {
		{"xs", std::bind(&parseDataSeries, std::placeholders::_1, &series.xs)},
		{"ys", std::bind(&parseDataSeries, std::placeholders::_1, &series.ys)},

+22 KiB (33.2 KiB)

Loading image diff...