projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/CMakeLists.txt: Drop obsolete boost-thread references.
[pulseview.git]
/
pv
/
view
/
cursor.cpp
diff --git
a/pv/view/cursor.cpp
b/pv/view/cursor.cpp
index 7a4272f956642b1129d1c3c37987074ff99cafa7..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,10
+29,13
@@
#include <QRect>
#include <QRectF>
#include <QRect>
#include <QRectF>
-#include <stdio.h>
+#include <cassert>
+#include <cstdio>
#include <extdef.h>
#include <extdef.h>
+using std::shared_ptr;
+
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-45,14
+48,16
@@
const int Cursor::Offset = 1;
const int Cursor::ArrowSize = 4;
const int Cursor::ArrowSize = 4;
-Cursor::Cursor(const View &view, double time, Cursor &other) :
- TimeMarker(view, LineColour, time),
- _other(other)
+Cursor::Cursor(View &view, double time) :
+ TimeMarker(view, LineColour, time)
{
}
QRectF Cursor::get_label_rect(const QRect &rect) const
{
{
}
QRectF Cursor::get_label_rect(const QRect &rect) const
{
+ const shared_ptr<Cursor> other(get_other_cursor());
+ assert(other);
+
const float x = (_time - _view.offset()) / _view.scale();
const QSizeF label_size(
const float x = (_time - _view.offset()) / _view.scale();
const QSizeF label_size(
@@
-62,7
+67,7
@@
QRectF Cursor::get_label_rect(const QRect &rect) const
Cursor::Offset - Cursor::ArrowSize - 0.5f;
const float height = label_size.height();
Cursor::Offset - Cursor::ArrowSize - 0.5f;
const float height = label_size.height();
- if (_time >
_other.
time())
+ if (_time >
other->
time())
return QRectF(x, top, label_size.width(), height);
else
return QRectF(x - label_size.width(), top,
return QRectF(x, top, label_size.width(), height);
else
return QRectF(x - label_size.width(), top,
@@
-72,6
+77,9
@@
QRectF Cursor::get_label_rect(const QRect &rect) const
void Cursor::paint_label(QPainter &p, const QRect &rect,
unsigned int prefix)
{
void Cursor::paint_label(QPainter &p, const QRect &rect,
unsigned int prefix)
{
+ const shared_ptr<Cursor> other(get_other_cursor());
+ assert(other);
+
compute_text_size(p, prefix);
const QRectF r(get_label_rect(rect));
compute_text_size(p, prefix);
const QRectF r(get_label_rect(rect));
@@
-107,9
+115,9
@@
void Cursor::paint_label(QPainter &p, const QRect &rect,
QPointF(r.right() - 1, rect.bottom() - 1),
};
QPointF(r.right() - 1, rect.bottom() - 1),
};
- const QPointF *const points = (_time >
_other.
time()) ?
+ const QPointF *const points = (_time >
other->
time()) ?
left_points : right_points;
left_points : right_points;
- const QPointF *const highlight_points = (_time >
_other.
time()) ?
+ const QPointF *const highlight_points = (_time >
other->
time()) ?
left_highlight_points : right_highlight_points;
if (selected()) {
left_highlight_points : right_highlight_points;
if (selected()) {
@@
-132,13
+140,20
@@
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
+{
+ const CursorPair &cursors = _view.cursors();
+ return (cursors.first().get() == this) ?
+ cursors.second() : cursors.first();
}
} // namespace view
}
} // namespace view