X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Futil.hpp;h=fa67472181990a3dfdf251094cbe057f9ab39b88;hp=5be379035bd875ae4bf3e6636444b89a5903519a;hb=33e1afbe17cfa91c24adb775aba923f07fbeed01;hpb=3ccf0f7f5b1b31ac628a983a2becee6f4c4c1507 diff --git a/pv/util.hpp b/pv/util.hpp index 5be37903..fa674721 100644 --- a/pv/util.hpp +++ b/pv/util.hpp @@ -23,7 +23,9 @@ #include +#ifndef Q_MOC_RUN #include +#endif #include #include @@ -71,19 +73,19 @@ typedef boost::multiprecision::number< * @param unit The unit of quantity. * @param sign Whether or not to add a sign also for positive numbers. * - * @return The formated value. + * @return The formatted value. */ QString format_time_si( - const Timestamp& t, + const Timestamp& v, SIPrefix prefix = SIPrefix::unspecified, unsigned precision = 0, QString unit = "s", bool sign = true); /** - * Wrapper around 'format_time_si()' that interpretes the given 'precision' + * Wrapper around 'format_time_si()' that interprets the given 'precision' * value as the number of decimal places if the timestamp would be formatted - * without a SI prefix (using 'SIPrefix::none') and adjustes the precision to + * without a SI prefix (using 'SIPrefix::none') and adjusts the precision to * match the given 'prefix' * * @param t The value to format. @@ -93,7 +95,7 @@ QString format_time_si( * @param unit The unit of quantity. * @param sign Whether or not to add a sign also for positive numbers. * - * @return The formated value. + * @return The formatted value. */ QString format_time_si_adjusted( const Timestamp& t, @@ -113,7 +115,7 @@ QString format_time_si_adjusted( * @param precision The number of digits after the decimal separator. * @param sign Whether or not to add a sign also for positive numbers. * - * @return The formated value. + * @return The formatted value. */ QString format_time_minutes( const Timestamp& t,