projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TraceGroup: Implemented stacking
[pulseview.git]
/
pv
/
view
/
cursor.cpp
diff --git
a/pv/view/cursor.cpp
b/pv/view/cursor.cpp
index 1b30518e04024225586f8e7dbfcc073a57891989..98b7289f11f0babd8c1bf73b33959d89ba0f1031 100644
(file)
--- a/
pv/view/cursor.cpp
+++ b/
pv/view/cursor.cpp
@@
-20,8
+20,8
@@
#include "cursor.h"
#include "cursor.h"
-#include "ruler.h"
#include "view.h"
#include "view.h"
+#include "pv/util.h"
#include <QBrush>
#include <QPainter>
#include <QBrush>
#include <QPainter>
@@
-29,11
+29,12
@@
#include <QRect>
#include <QRectF>
#include <QRect>
#include <QRectF>
-#include <stdio.h>
+#include <cassert>
+#include <cstdio>
#include <extdef.h>
#include <extdef.h>
-using
namespace boost
;
+using
std::shared_ptr
;
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-139,13
+140,13
@@
void Cursor::paint_label(QPainter &p, const QRect &rect,
p.setPen(TextColour);
p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
p.setPen(TextColour);
p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
-
Ruler
::format_time(_time, prefix, 2));
+
pv::util
::format_time(_time, prefix, 2));
}
void Cursor::compute_text_size(QPainter &p, unsigned int prefix)
{
_text_size = p.boundingRect(QRectF(), 0,
}
void Cursor::compute_text_size(QPainter &p, unsigned int prefix)
{
_text_size = p.boundingRect(QRectF(), 0,
-
Ruler
::format_time(_time, prefix, 2)).size();
+
pv::util
::format_time(_time, prefix, 2)).size();
}
shared_ptr<Cursor> Cursor::get_other_cursor() const
}
shared_ptr<Cursor> Cursor::get_other_cursor() const