Loading CMakeLists.txt +1 −0 Original line number Diff line number Diff line Loading @@ -4,6 +4,7 @@ enable_testing() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/extra/cmake") set(CMAKE_CXX_STANDARD 17) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/common) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/common/utils) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) Loading common/graphics/colour.cc +1 −0 Original line number Diff line number Diff line Loading @@ -29,6 +29,7 @@ */ #include <string.h> #include <iostream> #include <sstream> #include <iomanip> #include <utils/stringutil.h> #include "colour.h" Loading common/graphics/layer_svg.cc +2 −2 Original line number Diff line number Diff line Loading @@ -35,8 +35,8 @@ namespace plotfx { struct SVGData { std::stringstream buffer; uint32_t width; uint32_t height; double width; double height; Colour background_colour; std::string to_svg() const; }; Loading common/graphics/layout.cc +4 −4 Original line number Diff line number Diff line Loading @@ -50,10 +50,10 @@ Rectangle layout_margin_box( Point layout_align( const Rectangle& bbox, const Point& target) { return Point { .x = (target.x - (bbox.x + bbox.w / 2)), .y = (target.y - (bbox.y + bbox.h / 2)), }; Point p; p.x = (target.x - (bbox.x + bbox.w / 2)); p.y = (target.y - (bbox.y + bbox.h / 2)); return p; } Point layout_align( Loading common/graphics/measure.cc +6 −6 Original line number Diff line number Diff line Loading @@ -45,19 +45,19 @@ Measure::operator double() const { } Measure from_unit(double v) { return Measure{.unit = Unit::UNIT, .value = v}; return Measure(Unit::UNIT, v); } Measure from_px(double v) { return Measure{.unit = Unit::PX, .value = v}; return Measure(Unit::PX, v); } Measure from_pt(double v) { return Measure{.unit = Unit::PT, .value = v}; return Measure(Unit::PT, v); } Measure from_rem(double v) { return Measure{.unit = Unit::REM, .value = v}; return Measure(Unit::REM, v); } Measure to_px(const MeasureTable& t, const Measure& v) { Loading @@ -76,7 +76,7 @@ Measure to_px(const MeasureTable& t, const Measure& v) { break; } return Measure{.unit = Unit::PX, .value = v_px}; return Measure{Unit::PX, v_px}; } Measure to_unit(const MeasureTable& t, const Measure& v) { Loading @@ -95,7 +95,7 @@ Measure to_unit(const MeasureTable& t, const Measure& v) { break; } return Measure{.unit = Unit::UNIT, .value = v_unit}; return Measure{Unit::UNIT, v_unit}; } ReturnCode parse_measure(const std::string& s, Measure* measure) { Loading Loading
CMakeLists.txt +1 −0 Original line number Diff line number Diff line Loading @@ -4,6 +4,7 @@ enable_testing() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/extra/cmake") set(CMAKE_CXX_STANDARD 17) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/common) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/common/utils) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) Loading
common/graphics/colour.cc +1 −0 Original line number Diff line number Diff line Loading @@ -29,6 +29,7 @@ */ #include <string.h> #include <iostream> #include <sstream> #include <iomanip> #include <utils/stringutil.h> #include "colour.h" Loading
common/graphics/layer_svg.cc +2 −2 Original line number Diff line number Diff line Loading @@ -35,8 +35,8 @@ namespace plotfx { struct SVGData { std::stringstream buffer; uint32_t width; uint32_t height; double width; double height; Colour background_colour; std::string to_svg() const; }; Loading
common/graphics/layout.cc +4 −4 Original line number Diff line number Diff line Loading @@ -50,10 +50,10 @@ Rectangle layout_margin_box( Point layout_align( const Rectangle& bbox, const Point& target) { return Point { .x = (target.x - (bbox.x + bbox.w / 2)), .y = (target.y - (bbox.y + bbox.h / 2)), }; Point p; p.x = (target.x - (bbox.x + bbox.w / 2)); p.y = (target.y - (bbox.y + bbox.h / 2)); return p; } Point layout_align( Loading
common/graphics/measure.cc +6 −6 Original line number Diff line number Diff line Loading @@ -45,19 +45,19 @@ Measure::operator double() const { } Measure from_unit(double v) { return Measure{.unit = Unit::UNIT, .value = v}; return Measure(Unit::UNIT, v); } Measure from_px(double v) { return Measure{.unit = Unit::PX, .value = v}; return Measure(Unit::PX, v); } Measure from_pt(double v) { return Measure{.unit = Unit::PT, .value = v}; return Measure(Unit::PT, v); } Measure from_rem(double v) { return Measure{.unit = Unit::REM, .value = v}; return Measure(Unit::REM, v); } Measure to_px(const MeasureTable& t, const Measure& v) { Loading @@ -76,7 +76,7 @@ Measure to_px(const MeasureTable& t, const Measure& v) { break; } return Measure{.unit = Unit::PX, .value = v_px}; return Measure{Unit::PX, v_px}; } Measure to_unit(const MeasureTable& t, const Measure& v) { Loading @@ -95,7 +95,7 @@ Measure to_unit(const MeasureTable& t, const Measure& v) { break; } return Measure{.unit = Unit::UNIT, .value = v_unit}; return Measure{Unit::UNIT, v_unit}; } ReturnCode parse_measure(const std::string& s, Measure* measure) { Loading
