projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Settings: Add Qt version
[pulseview.git]
/
pv
/
util.hpp
diff --git
a/pv/util.hpp
b/pv/util.hpp
index 5be379035bd875ae4bf3e6636444b89a5903519a..1c78b89f1831b802f16531a90bed7a489905d92f 100644
(file)
--- a/
pv/util.hpp
+++ b/
pv/util.hpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PULSEVIEW_UTIL_HPP
*/
#ifndef PULSEVIEW_UTIL_HPP
@@
-23,7
+22,9
@@
#include <cmath>
#include <cmath>
+#ifndef Q_MOC_RUN
#include <boost/multiprecision/cpp_dec_float.hpp>
#include <boost/multiprecision/cpp_dec_float.hpp>
+#endif
#include <QMetaType>
#include <QString>
#include <QMetaType>
#include <QString>
@@
-71,19
+72,19
@@
typedef boost::multiprecision::number<
* @param unit The unit of quantity.
* @param sign Whether or not to add a sign also for positive numbers.
*
* @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 format
t
ed value.
*/
QString format_time_si(
*/
QString format_time_si(
- const Timestamp&
t
,
+ const Timestamp&
v
,
SIPrefix prefix = SIPrefix::unspecified,
unsigned precision = 0,
QString unit = "s",
bool sign = true);
/**
SIPrefix prefix = SIPrefix::unspecified,
unsigned precision = 0,
QString unit = "s",
bool sign = true);
/**
- * Wrapper around 'format_time_si()' that interpret
e
s 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
* value as the number of decimal places if the timestamp would be formatted
- * without a SI prefix (using 'SIPrefix::none') and adjust
e
s 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.
* match the given 'prefix'
*
* @param t The value to format.
@@
-93,7
+94,7
@@
QString format_time_si(
* @param unit The unit of quantity.
* @param sign Whether or not to add a sign also for positive numbers.
*
* @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 format
t
ed value.
*/
QString format_time_si_adjusted(
const Timestamp& t,
*/
QString format_time_si_adjusted(
const Timestamp& t,
@@
-113,7
+114,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.
*
* @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 format
t
ed value.
*/
QString format_time_minutes(
const Timestamp& t,
*/
QString format_time_minutes(
const Timestamp& t,