add the axis-{...}-title options (ef5bc239) · Commits · github_fork / Clip

CMakeLists.txt

+13 −7

Original line number	Diff line number	Diff line
		@@ -51,6 +51,9 @@ install(TARGETS fviz-cli DESTINATION bin)

		# Testing
		# -----------------------------------------------------------------------------
		add_custom_target(test_dir ALL
		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/test)

		file(GLOB unit_test_files "tests/unit/test_*.cc")
		foreach(unit_test_path ${unit_test_files})
		get_filename_component(unit_test_name ${unit_test_path} NAME_WE)
		@@ -61,7 +64,8 @@ foreach(unit_test_path ${unit_test_files})

		add_test(
		NAME ${unit_test_name}
		COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${unit_test_name})
		COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${unit_test_name}
		DEPENDS fviz-cli test_dir)
		endforeach()

		file(GLOB spec_test_files "tests/spec/*/.fvz")
		@@ -71,26 +75,28 @@ foreach(spec_test_path ${spec_test_files})
		add_test(
		NAME ${spec_test_name}_svg
		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
		COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tests/spec/test_runner.sh ${CMAKE_CURRENT_BINARY_DIR}/fviz ${spec_test_name} ${spec_test_srcdir} ${CMAKE_CURRENT_BINARY_DIR})
		COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tests/spec/test_runner.sh ${CMAKE_CURRENT_BINARY_DIR}/fviz ${spec_test_name} ${spec_test_srcdir} ${CMAKE_CURRENT_BINARY_DIR}/test
		DEPENDS fviz-cli test_dir)
		endforeach()


		# Examples
		# -----------------------------------------------------------------------------
		add_custom_target(examples)
		add_custom_target(examples_dir ALL
		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/examples)

		file(GLOB example_files "examples/*/.fvz")
		foreach(example_path ${example_files})
		get_filename_component(example_name ${example_path} NAME_WE)
		get_filename_component(example_srcdir ${example_path} DIRECTORY)
		add_test(
		NAME test_example_${example_name}_svg
		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
		COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tests/spec/test_runner.sh ${CMAKE_CURRENT_BINARY_DIR}/fviz ${example_name} ${example_srcdir} ${CMAKE_CURRENT_BINARY_DIR})
		add_custom_target(
		example_${example_name}
		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
		COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tests/spec/test_runner.sh ${CMAKE_CURRENT_BINARY_DIR}/fviz ${example_name} ${example_srcdir} ${CMAKE_CURRENT_BINARY_DIR})
		COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tests/spec/test_runner.sh ${CMAKE_CURRENT_BINARY_DIR}/fviz ${example_name} ${example_srcdir} ${CMAKE_CURRENT_BINARY_DIR}/examples)
		add_dependencies(examples example_${example_name})
		add_dependencies(example_${example_name} fviz)
		add_dependencies(example_${example_name} examples_dir)
		endforeach()

elements/chart/axis.cc

+359 −180

File changed.

Preview size limit exceeded, changes collapsed.

elements/chart/layout.cc

+14 −0

Original line number	Diff line number	Diff line
		@@ -307,6 +307,20 @@ ReturnCode build(
		},
		{"axis-x-labels", bind(&expr_rewritev, _1, "labels", &axis_x_opts)},
		{"axis-y-labels", bind(&expr_rewritev, _1, "labels", &axis_y_opts)},
		{"axis-x-label-font-size", bind(&expr_rewritev, _1, "label-font-size", &axis_x_opts)},
		{"axis-y-label-font-size", bind(&expr_rewritev, _1, "label-font-size", &axis_y_opts)},
		{"axis-x-label-color", bind(&expr_rewritev, _1, "label-color", &axis_x_opts)},
		{"axis-y-label-color", bind(&expr_rewritev, _1, "label-color", &axis_y_opts)},
		{"axis-x-label-padding", bind(&expr_rewritev, _1, "label-padding", &axis_x_opts)},
		{"axis-y-label-padding", bind(&expr_rewritev, _1, "label-padding", &axis_y_opts)},
		{"axis-x-title", bind(&expr_rewritev, _1, "title", &axis_x_opts)},
		{"axis-y-title", bind(&expr_rewritev, _1, "title", &axis_y_opts)},
		{"axis-x-title-font-size", bind(&expr_rewritev, _1, "title-font-size", &axis_x_opts)},
		{"axis-y-title-font-size", bind(&expr_rewritev, _1, "title-font-size", &axis_y_opts)},
		{"axis-x-title-color", bind(&expr_rewritev, _1, "title-color", &axis_x_opts)},
		{"axis-y-title-color", bind(&expr_rewritev, _1, "title-color", &axis_y_opts)},
		{"axis-x-title-padding", bind(&expr_rewritev, _1, "title-padding", &axis_x_opts)},
		{"axis-y-title-padding", bind(&expr_rewritev, _1, "title-padding", &axis_y_opts)},
		{"axes", bind(&expr_to_stringset, _1, &axes)},
		{"areas", bind(&build_geom, "chart/areas", _1, &geoms, &x, &y)},
		{"bars", bind(&build_geom, "chart/bars", _1, &geoms, &x, &y)},

elements/chart/linechart.cc

+14 −0

File changed.

Preview size limit exceeded, changes collapsed.

elements/chart/scatterplot.cc

+14 −0

File changed.

Preview size limit exceeded, changes collapsed.

Admin message