feedc0de/mp-units
1
0
Fork 0
forked from mpusz/mp-units
Code Pull Requests Activity

PrefixType renamed to PrefixFamily + units hierarchy PNG fixed

Browse Source
This commit is contained in:
Mateusz Pusz
2020-03-19 14:44:56 +01:00
parent a9432b1407
commit 034f239f96
10 changed files with 146 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/units/bits/to_string.h
+5 -5
View File
@@ -64,7 +64,7 @@ constexpr auto ratio_text()
}
}
template<typename Ratio, typename PrefixType>
template<typename Ratio, typename PrefixFamily>
constexpr auto prefix_or_ratio_text()
{
if constexpr(Ratio::num == 1 && Ratio::den == 1 && Ratio::exp == 0) {
@@ -72,11 +72,11 @@ constexpr auto prefix_or_ratio_text()
return basic_fixed_string("");
}
else {
if constexpr (!std::is_same_v<PrefixType, no_prefix>) {
if constexpr (!std::is_same_v<PrefixFamily, no_prefix>) {
// try to form a prefix
using prefix = downcast<detail::prefix_base<PrefixType, Ratio>>;
using prefix = downcast<detail::prefix_base<PrefixFamily, Ratio>>;
if constexpr(!std::is_same_v<prefix, prefix_base<PrefixType, Ratio>>) {
if constexpr(!std::is_same_v<prefix, prefix_base<PrefixFamily, Ratio>>) {
// print as a prefixed unit
return prefix::symbol;
}
@@ -149,7 +149,7 @@ constexpr auto unit_text()
// print as a prefix or ratio of a coherent unit
using coherent_unit = dimension_unit<Dim>;
using ratio = ratio_divide<typename U::ratio, typename coherent_unit::ratio>;
auto prefix_txt = prefix_or_ratio_text<ratio, typename U::reference::prefix_type>();
auto prefix_txt = prefix_or_ratio_text<ratio, typename U::reference::prefix_family>();
if constexpr(has_symbol<coherent_unit>) {
// use predefined coherent unit symbol