X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Futil.hpp;h=274839f8b7fd5cbd898bb451f032969a20669120;hp=1c78b89f1831b802f16531a90bed7a489905d92f;hb=2601ce965fc455d23f5a964b84ddd74eb93705c4;hpb=efdec55aec1a137460fa362a381ed1904182bfed diff --git a/pv/util.hpp b/pv/util.hpp index 1c78b89f..274839f8 100644 --- a/pv/util.hpp +++ b/pv/util.hpp @@ -21,6 +21,8 @@ #define PULSEVIEW_UTIL_HPP #include +#include +#include #ifndef Q_MOC_RUN #include @@ -29,6 +31,9 @@ #include #include +using std::string; +using std::vector; + namespace pv { namespace util { @@ -74,12 +79,9 @@ typedef boost::multiprecision::number< * * @return The formatted value. */ -QString format_time_si( - const Timestamp& v, - SIPrefix prefix = SIPrefix::unspecified, - unsigned precision = 0, - QString unit = "s", - bool sign = true); +QString format_time_si(const Timestamp& v, + SIPrefix prefix = SIPrefix::unspecified, unsigned precision = 0, + QString unit = "s", bool sign = true); /** * Wrapper around 'format_time_si()' that interprets the given 'precision' @@ -96,12 +98,8 @@ QString format_time_si( * * @return The formatted value. */ -QString format_time_si_adjusted( - const Timestamp& t, - SIPrefix prefix, - unsigned precision = 0, - QString unit = "s", - bool sign = true); +QString format_time_si_adjusted(const Timestamp& t, SIPrefix prefix, + unsigned precision = 0, QString unit = "s", bool sign = true); /** * Formats the given timestamp using "[+-]DD:HH:MM:SS.mmm uuu nnn ppp..." format. @@ -116,11 +114,11 @@ QString format_time_si_adjusted( * * @return The formatted value. */ -QString format_time_minutes( - const Timestamp& t, - signed precision = 0, +QString format_time_minutes(const Timestamp& t, signed precision = 0, bool sign = true); +vector split_string(string text, string separator); + } // namespace util } // namespace pv