X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Futil.hpp;h=67236c0dcc62420cf1be2a78bc0fa36a5f834d6f;hb=refs%2Fheads%2Fmaster;hp=274839f8b7fd5cbd898bb451f032969a20669120;hpb=34f4a40baa0b4485ebee71d51c0a3bf70a0bad8b;p=pulseview.git
diff --git a/pv/util.hpp b/pv/util.hpp
index 274839f8..67236c0d 100644
--- a/pv/util.hpp
+++ b/pv/util.hpp
@@ -17,19 +17,23 @@
* along with this program; if not, see .
*/
-#ifndef PULSEVIEW_UTIL_HPP
-#define PULSEVIEW_UTIL_HPP
+#ifndef PULSEVIEW_PV_UTIL_HPP
+#define PULSEVIEW_PV_UTIL_HPP
#include
#include
#include
#ifndef Q_MOC_RUN
+// Workaround for https://github.com/boostorg/serialization/issues/186
+#include
+
#include
#endif
#include
#include
+#include
using std::string;
using std::vector;
@@ -38,6 +42,7 @@ namespace pv {
namespace util {
enum class TimeUnit {
+ None = 0,
Time = 1,
Samples = 2
};
@@ -61,6 +66,11 @@ typedef boost::multiprecision::number<
boost::multiprecision::cpp_dec_float<24>,
boost::multiprecision::et_off> Timestamp;
+/**
+ * Chooses a prefix so that the value in front of the decimal point is between 1 and 999.
+ */
+SIPrefix determine_value_prefix(double v);
+
/**
* Formats a given timestamp with the specified SI prefix.
*
@@ -83,6 +93,24 @@ QString format_time_si(const Timestamp& v,
SIPrefix prefix = SIPrefix::unspecified, unsigned precision = 0,
QString unit = "s", bool sign = true);
+/**
+ * Formats a given value into a representation using SI units.
+ *
+ * If 'prefix' is left 'unspecified', the function chooses a prefix so that
+ * the value in front of the decimal point is between 1 and 999.
+ *
+ * @param value The value to format.
+ * @param prefix The SI prefix to use.
+ * @param precision The number of digits after the decimal separator.
+ * @param unit The unit of quantity.
+ * @param sign Whether or not to add a sign also for positive numbers.
+ *
+ * @return The formatted value.
+ */
+QString format_value_si(double v,
+ SIPrefix prefix = SIPrefix::unspecified, unsigned precision = 0,
+ QString unit = "", bool sign = true);
+
/**
* Wrapper around 'format_time_si()' that interprets the given 'precision'
* value as the number of decimal places if the timestamp would be formatted
@@ -119,9 +147,18 @@ QString format_time_minutes(const Timestamp& t, signed precision = 0,
vector split_string(string text, string separator);
+/**
+ * Return the width of a string in a given font.
+ * @param[in] metric metrics of the font
+ * @param[in] string the string whose width should be determined
+ *
+ * @return width of the string in pixels
+ */
+std::streamsize text_width(const QFontMetrics &metric, const QString &string);
+
} // namespace util
} // namespace pv
Q_DECLARE_METATYPE(pv::util::Timestamp)
-#endif // PULSEVIEW_UTIL_HPP
+#endif // PULSEVIEW_PV_UTIL_HPP