TimeMarker: Removed Offset

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 5f33416050d721b21af2b00835dc341259aeb391..b5fcf9d6798ebc466c63859e687294a9583ba2ac 100644 (file)
--- 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() -
                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())
        const float height = label_size.height();
 
        if (time_ > other->time())

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index a14f458bedd96710304cb06ad262944e5a91278d..00871107c38ccc2f3a6665c1d4356e14edafc8ac 100644 (file)
--- 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() -
                (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);
 }
 
                right - left, height);
 }
 

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 4b8d2b527a5992dc43c4e58f15c68d02dcf0312d..2b17184408a4ba8a5fb5f44f03320d832afdca8f 100644 (file)
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -40,7 +40,6 @@ namespace pv {
 namespace view {
 
 const int TimeMarker::ArrowSize = 4;
 namespace view {
 
 const int TimeMarker::ArrowSize = 4;

-const int TimeMarker::Offset = 1;

 
 TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
        TimeItem(view),
 
 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() -
                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,
        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 57d6c9b04ecc1bb7cb58d3c812688ecd31cfb2d5..4e5d92e6c6a75efee20a0283b36676c6d8d4cb86 100644 (file)
--- a/pv/view/timemarker.hpp
+++ b/pv/view/timemarker.hpp
@@ -43,7 +43,6 @@ class TimeMarker : public TimeItem
 
 public:
        static const int ArrowSize;
 
 public:
        static const int ArrowSize;

-       static const int Offset;

 
 protected:
        /**
 
 protected:
        /**