From 6abffa979b89440af383cf1142648e34dcbdfc44 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sat, 20 Dec 2014 15:38:02 +0000 Subject: [PATCH] TimeMarker: Removed Offset --- pv/view/cursor.cpp | 2 +- pv/view/cursorpair.cpp | 2 +- pv/view/timemarker.cpp | 3 +-- pv/view/timemarker.hpp | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp index 5f334160..b5fcf9d6 100644 --- a/pv/view/cursor.cpp +++ b/pv/view/cursor.cpp @@ -69,7 +69,7 @@ QRectF Cursor::label_rect(const QRectF &rect) const text_size.width() + View::LabelPadding.width() * 2, text_size.height() + View::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()) diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp index a14f458b..00871107 100644 --- a/pv/view/cursorpair.cpp +++ b/pv/view/cursorpair.cpp @@ -97,7 +97,7 @@ QRectF CursorPair::label_rect(const QRectF &rect) const (float)rect.width() + height); return QRectF(left, rect.height() - label_size.height() - - TimeMarker::ArrowSize - TimeMarker::Offset - 0.5f, + TimeMarker::ArrowSize - 0.5f, right - left, height); } diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp index 4b8d2b52..2b171844 100644 --- a/pv/view/timemarker.cpp +++ b/pv/view/timemarker.cpp @@ -40,7 +40,6 @@ namespace pv { namespace view { const int TimeMarker::ArrowSize = 4; -const int TimeMarker::Offset = 1; TimeMarker::TimeMarker(View &view, const QColor &colour, double time) : TimeItem(view), @@ -93,7 +92,7 @@ QRectF TimeMarker::label_rect(const QRectF &rect) const text_width + View::LabelPadding.width() * 2, text_height + View::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(); return QRectF(x - label_size.width() / 2, top, diff --git a/pv/view/timemarker.hpp b/pv/view/timemarker.hpp index 57d6c9b0..4e5d92e6 100644 --- a/pv/view/timemarker.hpp +++ b/pv/view/timemarker.hpp @@ -43,7 +43,6 @@ class TimeMarker : public TimeItem public: static const int ArrowSize; - static const int Offset; protected: /** -- 2.30.2