projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
View: Make signals_changed() more predictable
[pulseview.git]
/
pv
/
view
/
cursor.cpp
diff --git
a/pv/view/cursor.cpp
b/pv/view/cursor.cpp
index 512b5fa9791425a6a84f8de5a12bab1f61d6ab2f..7432e3048e217c20a3e72a4d06bc6f1fffa4b53b 100644
(file)
--- a/
pv/view/cursor.cpp
+++ b/
pv/view/cursor.cpp
@@
-20,6
+20,7
@@
#include "cursor.hpp"
#include "cursor.hpp"
+#include "ruler.hpp"
#include "view.hpp"
#include "pv/util.hpp"
#include "view.hpp"
#include "pv/util.hpp"
@@
-55,7
+56,11
@@
bool Cursor::enabled() const
QString Cursor::get_text() const
{
QString Cursor::get_text() const
{
- return pv::util::format_time(time_, view_.tick_prefix(), 2);
+ const shared_ptr<Cursor> other = get_other_cursor();
+ const pv::util::Timestamp& diff = abs(time_ - other->time_);
+
+ return Ruler::format_time_with_distance(
+ diff, time_, view_.tick_prefix(), view_.time_unit(), view_.tick_precision());
}
QRectF Cursor::label_rect(const QRectF &rect) const
}
QRectF Cursor::label_rect(const QRectF &rect) const
@@
-63,7
+68,7
@@
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);
- const float x = (
time_ - view_.offset()) / view_.scale
();
+ const float x = (
(time_ - view_.offset())/ view_.scale()).convert_to<float>
();
QFontMetrics m(QApplication::font());
QSize text_size = m.boundingRect(get_text()).size();
QFontMetrics m(QApplication::font());
QSize text_size = m.boundingRect(get_text()).size();
@@
-75,14
+80,13
@@
QRectF Cursor::label_rect(const QRectF &rect) const
TimeMarker::ArrowSize - 0.5f;
const float height = label_size.height();
TimeMarker::ArrowSize - 0.5f;
const float height = label_size.height();
- const double other_time = other->time();
+ const pv::util::Timestamp& other_time = other->time();
+
if (time_ > other_time ||
if (time_ > other_time ||
- (abs(time_ - other_time) < numeric_limits<double>::epsilon() &&
- this > other.get()))
+ (abs(time_ - other_time).is_zero() && this > other.get()))
return QRectF(x, top, label_size.width(), height);
else
return QRectF(x, top, label_size.width(), height);
else
- return QRectF(x - label_size.width(), top,
- label_size.width(), height);
+ return QRectF(x - label_size.width(), top, label_size.width(), height);
}
shared_ptr<Cursor> Cursor::get_other_cursor() const
}
shared_ptr<Cursor> Cursor::get_other_cursor() const