projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MarginWidget: Moved in mouseMoveEvent
[pulseview.git]
/
pv
/
view
/
cursor.cpp
diff --git
a/pv/view/cursor.cpp
b/pv/view/cursor.cpp
index d5b0a641f075a5b9c5d7f4ddd0cb511102aee08a..512b5fa9791425a6a84f8de5a12bab1f61d6ab2f 100644
(file)
--- a/
pv/view/cursor.cpp
+++ b/
pv/view/cursor.cpp
@@
-32,8
+32,11
@@
#include <cassert>
#include <cstdio>
#include <cassert>
#include <cstdio>
+#include <limits>
+using std::abs;
using std::shared_ptr;
using std::shared_ptr;
+using std::numeric_limits;
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-45,7
+48,17
@@
Cursor::Cursor(View &view, double time) :
{
}
{
}
-QRectF Cursor::get_label_rect(const QRect &rect) const
+bool Cursor::enabled() const
+{
+ return view_.cursors_shown();
+}
+
+QString Cursor::get_text() const
+{
+ return pv::util::format_time(time_, view_.tick_prefix(), 2);
+}
+
+QRectF Cursor::label_rect(const QRectF &rect) const
{
const shared_ptr<Cursor> other(get_other_cursor());
assert(other);
{
const shared_ptr<Cursor> other(get_other_cursor());
assert(other);
@@
-53,17
+66,19
@@
QRectF Cursor::get_label_rect(const QRect &rect) const
const float x = (time_ - view_.offset()) / view_.scale();
QFontMetrics m(QApplication::font());
const float x = (time_ - view_.offset()) / view_.scale();
QFontMetrics m(QApplication::font());
- QSize text_size = m.boundingRect(
- pv::util::format_time(time_, view_.tick_prefix(), 2)).size();
+ QSize text_size = m.boundingRect(get_text()).size();
const QSizeF label_size(
const QSizeF label_size(
- text_size.width() +
View::
LabelPadding.width() * 2,
- text_size.height() +
View::
LabelPadding.height() * 2);
+ text_size.width() + LabelPadding.width() * 2,
+ text_size.height() + LabelPadding.height() * 2);
const float top = rect.height() - label_size.height() -
const float top = rect.height() - label_size.height() -
- TimeMarker::
Offset - TimeMarker::
ArrowSize - 0.5f;
+ TimeMarker::ArrowSize - 0.5f;
const float height = label_size.height();
const float height = label_size.height();
- if (time_ > other->time())
+ const double other_time = other->time();
+ if (time_ > other_time ||
+ (abs(time_ - other_time) < numeric_limits<double>::epsilon() &&
+ this > other.get()))
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,9
+87,10
@@
QRectF Cursor::get_label_rect(const QRect &rect) const
shared_ptr<Cursor> Cursor::get_other_cursor() const
{
shared_ptr<Cursor> Cursor::get_other_cursor() const
{
- const CursorPair &cursors = view_.cursors();
- return (cursors.first().get() == this) ?
- cursors.second() : cursors.first();
+ const shared_ptr<CursorPair> cursors(view_.cursors());
+ assert(cursors);
+ return (cursors->first().get() == this) ?
+ cursors->second() : cursors->first();
}
} // namespace view
}
} // namespace view