projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change QApplication::translate to tr, removing deprecated UTF8 parameter
[pulseview.git]
/
pv
/
view
/
cursorpair.cpp
diff --git
a/pv/view/cursorpair.cpp
b/pv/view/cursorpair.cpp
index 70c7bac9235b41d203b74054036c36dbcd8f8fa9..d319a7b1bffc3b69e67e937c46a3b0a38aee1747 100644
(file)
--- a/
pv/view/cursorpair.cpp
+++ b/
pv/view/cursorpair.cpp
@@
-20,20
+20,24
@@
#include "cursorpair.h"
#include "cursorpair.h"
-#include "ruler.h"
#include "view.h"
#include "view.h"
+#include "pv/util.h"
+#include <cassert>
#include <algorithm>
#include <algorithm>
-using namespace boost;
-using namespace std;
+using std::max;
+using std::make_pair;
+using std::min;
+using std::shared_ptr;
+using std::pair;
namespace pv {
namespace view {
const int CursorPair::DeltaPadding = 8;
namespace pv {
namespace view {
const int CursorPair::DeltaPadding = 8;
-CursorPair::CursorPair(
const
View &view) :
+CursorPair::CursorPair(View &view) :
_first(new Cursor(view, 0.0)),
_second(new Cursor(view, 1.0)),
_view(view)
_first(new Cursor(view, 0.0)),
_second(new Cursor(view, 1.0)),
_view(view)
@@
-96,7
+100,7
@@
void CursorPair::draw_markers(QPainter &p,
p.setPen(Cursor::TextColour);
p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
p.setPen(Cursor::TextColour);
p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
-
Ruler
::format_time(_second->time() - _first->time(), prefix, 2));
+
pv::util
::format_time(_second->time() - _first->time(), prefix, 2));
}
// Paint the cursor markers
}
// Paint the cursor markers
@@
-134,7
+138,7
@@
void CursorPair::compute_text_size(QPainter &p, unsigned int prefix)
assert(_first);
assert(_second);
assert(_first);
assert(_second);
- _text_size = p.boundingRect(QRectF(), 0,
Ruler
::format_time(
+ _text_size = p.boundingRect(QRectF(), 0,
pv::util
::format_time(
_second->time() - _first->time(), prefix, 2)).size();
}
_second->time() - _first->time(), prefix, 2)).size();
}