X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Futil.cpp;h=8f2d7d2544cd8e30301a28c56f6537269dbe759a;hb=ed77633334ce2237f5a12178f817548e30c69b64;hp=f7ee77276a3cd02034293a3130502c135c47f181;hpb=2ad82c2e40b6865481733913a2c32735602f63c4;p=pulseview.git
diff --git a/pv/util.cpp b/pv/util.cpp
index f7ee772..8f2d7d2 100644
--- a/pv/util.cpp
+++ b/pv/util.cpp
@@ -14,21 +14,27 @@
* 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 .
*/
#include "util.hpp"
#include
-#include
-
#include
+#include
#include
-#include
#include
+#include
+
+using std::fixed;
+using std::max;
+using std::ostringstream;
+using std::setfill;
+using std::setprecision;
+using std::showpos;
+using std::string;
using namespace Qt;
@@ -84,18 +90,18 @@ static QTextStream& operator<<(QTextStream& stream, const Timestamp& t)
int precision = stream.realNumberPrecision();
- std::ostringstream ss;
- ss << std::fixed;
+ ostringstream ss;
+ ss << fixed;
if (stream.numberFlags() & QTextStream::ForceSign)
- ss << std::showpos;
+ ss << showpos;
if (0 == precision)
- ss << std::setprecision(1) << round(t);
+ ss << setprecision(1) << round(t);
else
- ss << std::setprecision(precision) << t;
+ ss << setprecision(precision) << t;
- std::string str(ss.str());
+ string str(ss.str());
if (0 == precision) {
// remove the separator and the unwanted decimal place
str.resize(str.size() - 2);
@@ -104,12 +110,8 @@ static QTextStream& operator<<(QTextStream& stream, const Timestamp& t)
return stream << QString::fromStdString(str);
}
-QString format_time_si(
- const Timestamp& v,
- SIPrefix prefix,
- unsigned int precision,
- QString unit,
- bool sign)
+QString format_time_si(const Timestamp& v, SIPrefix prefix,
+ unsigned int precision, QString unit, bool sign)
{
if (prefix == SIPrefix::unspecified) {
// No prefix given, calculate it
@@ -136,22 +138,14 @@ QString format_time_si(
QTextStream ts(&s);
if (sign && !v.is_zero())
ts << forcesign;
- ts
- << qSetRealNumberPrecision(precision)
- << (v * multiplier)
- << ' '
- << prefix
- << unit;
+ ts << qSetRealNumberPrecision(precision) << (v * multiplier) << ' '
+ << prefix << unit;
return s;
}
-QString format_time_si_adjusted(
- const Timestamp& t,
- SIPrefix prefix,
- unsigned precision,
- QString unit,
- bool sign)
+QString format_time_si_adjusted(const Timestamp& t, SIPrefix prefix,
+ unsigned precision, QString unit, bool sign)
{
// The precision is always given without taking the prefix into account
// so we need to deduct the number of decimals the prefix might imply
@@ -159,12 +153,11 @@ QString format_time_si_adjusted(
const unsigned int relative_prec =
(prefix >= SIPrefix::none) ? precision :
- std::max((int)(precision - prefix_order), 0);
+ max((int)(precision - prefix_order), 0);
return format_time_si(t, prefix, relative_prec, unit, sign);
}
-
// Helper for 'format_time_minutes()'.
static QString pad_number(unsigned int number, int length)
{
@@ -214,13 +207,9 @@ QString format_time_minutes(const Timestamp& t, signed precision, bool sign)
const Timestamp fraction = fabs(t) - whole_seconds;
- std::ostringstream ss;
- ss
- << std::fixed
- << std::setprecision(precision)
- << std::setfill('0')
- << fraction;
- std::string fs = ss.str();
+ ostringstream ss;
+ ss << fixed << setprecision(precision) << setfill('0') << fraction;
+ string fs = ss.str();
// Copy all digits, inserting spaces as unit separators
for (int i = 1; i <= precision; i++) {