projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use presence of logic/analog data as indicator of channel type
[pulseview.git]
/
pv
/
util.cpp
diff --git
a/pv/util.cpp
b/pv/util.cpp
index f7ee77276a3cd02034293a3130502c135c47f181..c5f9c832ef44be87034826df96fa7d79f42e9e03 100644
(file)
--- a/
pv/util.cpp
+++ b/
pv/util.cpp
@@
-14,22
+14,28
@@
* 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/>.
*/
#include "util.hpp"
#include <extdef.h>
*/
#include "util.hpp"
#include <extdef.h>
-#include <assert.h>
-
+#include <cassert>
#include <algorithm>
#include <sstream>
#include <QTextStream>
#include <QDebug>
#include <algorithm>
#include <sstream>
#include <QTextStream>
#include <QDebug>
+using std::fixed;
+using std::max;
+using std::ostringstream;
+using std::setfill;
+using std::setprecision;
+using std::showpos;
+using std::string;
+
using namespace Qt;
namespace pv {
using namespace Qt;
namespace pv {
@@
-84,18
+90,18
@@
static QTextStream& operator<<(QTextStream& stream, const Timestamp& t)
int precision = stream.realNumberPrecision();
int precision = stream.realNumberPrecision();
-
std::
ostringstream ss;
- ss <<
std::
fixed;
+ ostringstream ss;
+ ss << fixed;
if (stream.numberFlags() & QTextStream::ForceSign)
if (stream.numberFlags() & QTextStream::ForceSign)
- ss << s
td::s
howpos;
+ ss << showpos;
if (0 == precision)
if (0 == precision)
- ss << s
td::s
etprecision(1) << round(t);
+ ss << setprecision(1) << round(t);
else
else
- ss << s
td::s
etprecision(precision) << t;
+ ss << setprecision(precision) << t;
- st
d::st
ring str(ss.str());
+ string str(ss.str());
if (0 == precision) {
// remove the separator and the unwanted decimal place
str.resize(str.size() - 2);
if (0 == precision) {
// remove the separator and the unwanted decimal place
str.resize(str.size() - 2);
@@
-159,7
+165,7
@@
QString format_time_si_adjusted(
const unsigned int relative_prec =
(prefix >= SIPrefix::none) ? precision :
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);
}
return format_time_si(t, prefix, relative_prec, unit, sign);
}
@@
-214,13
+220,9
@@
QString format_time_minutes(const Timestamp& t, signed precision, bool sign)
const Timestamp fraction = fabs(t) - whole_seconds;
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++) {
// Copy all digits, inserting spaces as unit separators
for (int i = 1; i <= precision; i++) {