update the default axis title rotation and padding values (553172b6) · Commits · github_fork / Clip

elements/chart/axis.cc

+22 −6

Original line number	Diff line number	Diff line
		@@ -30,7 +30,8 @@ using namespace std::placeholders;

		namespace fviz::elements::chart::axis {

		static const double kDefaultTitlePaddingEM = 0.8;
		static const double kDefaultTitlePaddingHorizEM = 1.4;
		static const double kDefaultTitlePaddingVertEM = 1;
		static const double kDefaultLabelPaddingEM = 0.8;
		static const double kDefaultLineWidthPT = 1;
		static const double kDefaultTickLengthPT = 4;
		@@ -287,9 +288,22 @@ ReturnCode axis_layout(

		/* add margin for the title */
		if (!axis.title.empty()) {
		switch (axis_position) {
		case AxisPosition::TOP:
		case AxisPosition::BOTTOM:
		case AxisPosition::CENTER_HORIZ:
		*margin += measure_or(
		axis.title_padding,
		from_em(kDefaultTitlePaddingVertEM, axis.title_font_size));
		break;
		case AxisPosition::LEFT:
		case AxisPosition::RIGHT:
		case AxisPosition::CENTER_VERT:
		*margin += measure_or(
		axis.title_padding,
		from_em(kDefaultTitlePaddingEM, axis.title_font_size));
		from_em(kDefaultTitlePaddingHorizEM, axis.title_font_size));
		break;
		}

		if (auto rc = axis_layout_title(
		axis,
		@@ -432,7 +446,7 @@ static ReturnCode axis_draw_vertical(

		double title_padding = measure_or(
		axis_config.title_padding,
		from_em(kDefaultTitlePaddingEM, axis_config.title_font_size));
		from_em(kDefaultTitlePaddingHorizEM, axis_config.title_font_size));

		if (title_position == label_position) {
		title_padding += label_size;
		@@ -579,7 +593,7 @@ static ReturnCode axis_draw_horizontal(

		double title_padding = measure_or(
		axis_config.title_padding,
		from_em(kDefaultTitlePaddingEM, axis_config.title_font_size));
		from_em(kDefaultTitlePaddingVertEM, axis_config.title_font_size));

		if (title_position == label_position) {
		title_padding += label_size;
		@@ -710,9 +724,11 @@ ReturnCode build(const Environment& env, const Expr* expr, ElementRef* elem) {
		break;
		case AxisPosition::LEFT:
		config->layout.position = Position::LEFT;
		config->title_rotate = -90;
		break;
		case AxisPosition::RIGHT:
		config->layout.position = Position::RIGHT;
		config->title_rotate = -90;
		break;
		};

tests/spec/chart/axis_bottom_title.svg

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,5 +35,5 @@
		<text x="758.559896" y="45.288889" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">14.0</text>
		<text x="812.365451" y="45.288889" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">15.0</text>
		<text x="866.171007" y="45.288889" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">16.0</text>
		<text x="400.812500" y="86.355556" fill="#333333" font-size="21.333333" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Fnord (f/s)</text>
		<text x="400.812500" y="90.622222" fill="#333333" font-size="21.333333" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Fnord (f/s)</text>
		</svg>
		No newline at end of file

tests/spec/chart/axis_bottom_title_rotate.svg

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,5 +35,5 @@
		<text x="758.559896" y="45.288889" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">14.0</text>
		<text x="812.365451" y="45.288889" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">15.0</text>
		<text x="866.171007" y="45.288889" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">16.0</text>
		<text x="400.812500" y="117.475205" fill="#333333" font-size="21.333333" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif" transform="rotate(-45 450 109.975)">Fnord (f/s)</text>
		<text x="400.812500" y="121.741872" fill="#333333" font-size="21.333333" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif" transform="rotate(-45 450 114.242)">Fnord (f/s)</text>
		</svg>
		No newline at end of file

tests/spec/chart/axis_left_title.svg

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,5 +35,5 @@
		<text x="840.164236" y="79.666667" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">14.0</text>
		<text x="840.164236" y="52.111111" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">15.0</text>
		<text x="840.164236" y="24.555556" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">16.0</text>
		<text x="724.722569" y="247.500000" fill="#333333" font-size="21.333333" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">Fnord (f/s)</text>
		<text x="748.610069" y="247.500000" fill="#333333" font-size="21.333333" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif" transform="rotate(-90 797.798 240)">Fnord (f/s)</text>
		</svg>
		No newline at end of file

tests/spec/chart/axis_left_title_rotate.svg

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,5 +35,5 @@
		<text x="840.164236" y="79.666667" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">14.0</text>
		<text x="840.164236" y="52.111111" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">15.0</text>
		<text x="840.164236" y="24.555556" fill="#333333" font-size="14.666667" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif">16.0</text>
		<text x="761.410069" y="247.500000" fill="#333333" font-size="21.333333" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif" transform="rotate(-90 810.598 240)">Fnord (f/s)</text>
		<text x="748.610069" y="247.500000" fill="#333333" font-size="21.333333" font-family="Arial,Helvetica,'Helvetica Neue',sans-serif" transform="rotate(-90 797.798 240)">Fnord (f/s)</text>
		</svg>
		No newline at end of file

Admin message