make precision of scientific and fixed formatters configurable (f62d40ae) · Commits · github_fork / Clip

common/config_helpers.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,11 @@ ReturnCode parseEnum(
		return ReturnCode::success();
		}

		ReturnCode parse_classlike(
		const plist::Property& prop,
		const std::string& fn,
		std::vector<std::string>* args);

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

		ReturnCode parseDataSeries(

common/format.cc

+57 −4

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		#include <sstream>
		#include <iomanip>
		#include "format.h"
		#include "common/config_helpers.h"

		namespace plotfx {

		@@ -44,6 +45,33 @@ Formatter format_decimal_scientific(size_t precision) {
		return f;
		}

		ReturnCode confgure_format_decimal_scientific(
		const plist::Property& prop,
		Formatter* formatter) {
		std::vector<std::string> args;
		if (auto rc = parse_classlike(prop, "scientific", &args); !rc) {
		return rc;
		}

		uint32_t precision = 1;
		switch (args.size()) {
		case 0:
		break;
		case 1:
		try {
		precision = std::stod(args[0]);
		break;
		} catch (... ) {
		return ERROR_INVALID_ARGUMENT;
		}
		default:
		return ERROR_INVALID_ARGUMENT;
		}

		*formatter = format_decimal_scientific(precision);
		return OK;
		}

		Formatter format_decimal_fixed(size_t precision) {
		Formatter f;
		f.format_number = [precision] (double v) -> std::string {
		@@ -55,6 +83,33 @@ Formatter format_decimal_fixed(size_t precision) {
		return f;
		}

		ReturnCode confgure_format_decimal_fixed(
		const plist::Property& prop,
		Formatter* formatter) {
		std::vector<std::string> args;
		if (auto rc = parse_classlike(prop, "fixed", &args); !rc) {
		return rc;
		}

		uint32_t precision = 1;
		switch (args.size()) {
		case 0:
		break;
		case 1:
		try {
		precision = std::stod(args[0]);
		break;
		} catch (... ) {
		return ERROR_INVALID_ARGUMENT;
		}
		default:
		return ERROR_INVALID_ARGUMENT;
		}

		*formatter = format_decimal_fixed(precision);
		return OK;
		}

		ReturnCode confgure_format(
		const plist::Property& prop,
		Formatter* formatter) {
		@@ -63,13 +118,11 @@ ReturnCode confgure_format(
		}

		if (prop[0].data == "fixed") {
		*formatter = format_decimal_fixed(1); // FIXME
		return OK;
		return confgure_format_decimal_fixed(prop, formatter);
		}

		if (prop[0].data == "scientific") {
		*formatter = format_decimal_scientific(1); // FIXME
		return OK;
		return confgure_format_decimal_scientific(prop, formatter);
		}

		return OK;

tests/linechart/test_linechart_timeseries.plot

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ plot {
		axis-top: off;
		axis-right: off;

		ydomain-format: scientific;
		ydomain-format: fixed(1);

		series {
		xs: csv('tests/testdata/measurement.csv', 0);

tests/linechart/test_linechart_timeseries.png

−2.63 KiB (39.5 KiB)

Loading image diff...

Admin message