Loading source/domain.cc +1 −1 Original line number Diff line number Diff line Loading @@ -40,7 +40,7 @@ DomainConfig::DomainConfig() : kind(DomainKind::LINEAR), min_auto_snap_zero(false), inverted(false), padding(0.1f), padding(0.01f), limit_hints(std::make_shared<DomainLimitHints>()) {} void domain_fit_kind(const Series& data, DomainConfig* domain) { Loading source/elements/lines.cc +2 −2 Original line number Diff line number Diff line Loading @@ -56,7 +56,7 @@ ReturnCode draw( { bind(&convert_unit_typographic, layer->dpi, layer->font_size.value, _1), bind(&convert_unit_user, domain_translate_fn(config.scale_x), _1), bind(&convert_unit_relative, clip.x, clip.x + clip.w, _1) bind(&convert_unit_relative, clip.w, _1) }, &*config.x.begin(), &*config.x.end()); Loading @@ -65,7 +65,7 @@ ReturnCode draw( { bind(&convert_unit_typographic, layer->dpi, layer->font_size.value, _1), bind(&convert_unit_user, domain_translate_fn(config.scale_y), _1), bind(&convert_unit_relative, clip.y, clip.y + clip.h, _1) bind(&convert_unit_relative, clip.h, _1) }, &*config.y.begin(), &*config.y.end()); Loading source/elements/points.cc +2 −2 Original line number Diff line number Diff line Loading @@ -61,7 +61,7 @@ ReturnCode draw( { bind(&convert_unit_typographic, layer->dpi, layer->font_size.value, _1), bind(&convert_unit_user, domain_translate_fn(config.scale_x), _1), bind(&convert_unit_relative, clip.x, clip.x + clip.w, _1) bind(&convert_unit_relative, clip.w, _1) }, &*config.x.begin(), &*config.x.end()); Loading @@ -70,7 +70,7 @@ ReturnCode draw( { bind(&convert_unit_typographic, layer->dpi, layer->font_size.value, _1), bind(&convert_unit_user, domain_translate_fn(config.scale_y), _1), bind(&convert_unit_relative, clip.y, clip.y + clip.h, _1) bind(&convert_unit_relative, clip.h, _1) }, &*config.y.begin(), &*config.y.end()); Loading source/graphics/measure.cc +3 −5 Original line number Diff line number Diff line Loading @@ -161,14 +161,12 @@ void convert_unit_typographic( } void convert_unit_relative( double range_begin, double range_end, double range, Measure* measure) { switch (measure->unit) { case Unit::REL: measure->unit = Unit::UNIT; measure->value = range_begin + std::clamp(measure->value, 0.0, 1.0) * (range_end - range_begin); measure->value = std::clamp(measure->value, 0.0, 1.0) * range; break; } } Loading @@ -179,7 +177,7 @@ void convert_unit_user( switch (measure->unit) { case Unit::USER: measure->unit = Unit::REL; measure->value = converter(measure->value); measure->value = std::clamp(converter(measure->value), 0.0, 1.0); break; } } Loading source/graphics/measure.h +1 −2 Original line number Diff line number Diff line Loading @@ -81,8 +81,7 @@ void convert_unit_typographic( Measure* measure); void convert_unit_relative( double range_begin, double range_end, double range, Measure* measure); void convert_unit_user( Loading Loading
source/domain.cc +1 −1 Original line number Diff line number Diff line Loading @@ -40,7 +40,7 @@ DomainConfig::DomainConfig() : kind(DomainKind::LINEAR), min_auto_snap_zero(false), inverted(false), padding(0.1f), padding(0.01f), limit_hints(std::make_shared<DomainLimitHints>()) {} void domain_fit_kind(const Series& data, DomainConfig* domain) { Loading
source/elements/lines.cc +2 −2 Original line number Diff line number Diff line Loading @@ -56,7 +56,7 @@ ReturnCode draw( { bind(&convert_unit_typographic, layer->dpi, layer->font_size.value, _1), bind(&convert_unit_user, domain_translate_fn(config.scale_x), _1), bind(&convert_unit_relative, clip.x, clip.x + clip.w, _1) bind(&convert_unit_relative, clip.w, _1) }, &*config.x.begin(), &*config.x.end()); Loading @@ -65,7 +65,7 @@ ReturnCode draw( { bind(&convert_unit_typographic, layer->dpi, layer->font_size.value, _1), bind(&convert_unit_user, domain_translate_fn(config.scale_y), _1), bind(&convert_unit_relative, clip.y, clip.y + clip.h, _1) bind(&convert_unit_relative, clip.h, _1) }, &*config.y.begin(), &*config.y.end()); Loading
source/elements/points.cc +2 −2 Original line number Diff line number Diff line Loading @@ -61,7 +61,7 @@ ReturnCode draw( { bind(&convert_unit_typographic, layer->dpi, layer->font_size.value, _1), bind(&convert_unit_user, domain_translate_fn(config.scale_x), _1), bind(&convert_unit_relative, clip.x, clip.x + clip.w, _1) bind(&convert_unit_relative, clip.w, _1) }, &*config.x.begin(), &*config.x.end()); Loading @@ -70,7 +70,7 @@ ReturnCode draw( { bind(&convert_unit_typographic, layer->dpi, layer->font_size.value, _1), bind(&convert_unit_user, domain_translate_fn(config.scale_y), _1), bind(&convert_unit_relative, clip.y, clip.y + clip.h, _1) bind(&convert_unit_relative, clip.h, _1) }, &*config.y.begin(), &*config.y.end()); Loading
source/graphics/measure.cc +3 −5 Original line number Diff line number Diff line Loading @@ -161,14 +161,12 @@ void convert_unit_typographic( } void convert_unit_relative( double range_begin, double range_end, double range, Measure* measure) { switch (measure->unit) { case Unit::REL: measure->unit = Unit::UNIT; measure->value = range_begin + std::clamp(measure->value, 0.0, 1.0) * (range_end - range_begin); measure->value = std::clamp(measure->value, 0.0, 1.0) * range; break; } } Loading @@ -179,7 +177,7 @@ void convert_unit_user( switch (measure->unit) { case Unit::USER: measure->unit = Unit::REL; measure->value = converter(measure->value); measure->value = std::clamp(converter(measure->value), 0.0, 1.0); break; } } Loading
source/graphics/measure.h +1 −2 Original line number Diff line number Diff line Loading @@ -81,8 +81,7 @@ void convert_unit_typographic( Measure* measure); void convert_unit_relative( double range_begin, double range_end, double range, Measure* measure); void convert_unit_user( Loading
