#include <cassert>
#include <cstdio>
+#include <limits>
+using std::abs;
using std::shared_ptr;
+using std::numeric_limits;
namespace pv {
namespace view {
{
}
+bool Cursor::enabled() const
+{
+ return view_.cursors_shown();
+}
+
QString Cursor::get_text() const
{
- return pv::util::format_time(time_, view_.tick_prefix(), 2);
+ return util::format_time(time_, view_.tick_prefix(),
+ view_.time_unit(), 2);
}
-QRectF Cursor::get_label_rect(const QRect &rect) const
+QRectF Cursor::label_rect(const QRectF &rect) const
{
const shared_ptr<Cursor> other(get_other_cursor());
assert(other);
QSize text_size = m.boundingRect(get_text()).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() -
- TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
+ TimeMarker::ArrowSize - 0.5f;
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,
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