Moved LabelPadding into View

[pulseview.git] / pv / view / view.cpp

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 54871b5ebc3d4c211898f5961fc9eb3978571782..81b3fcd225c60f8c1d24e994557a94492e8acbdd 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -53,6 +53,10 @@ const int View::MaxScrollValue = INT_MAX / 2;
 
 const int View::SignalHeight = 50;
 
+const QColor View::CursorAreaColour(220, 231, 243);
+
+const QSizeF View::LabelPadding(4, 0);
+
 View::View(SigSession &session, QWidget *parent) :
        QAbstractScrollArea(parent),
        _session(session),
@@ -63,6 +67,9 @@ View::View(SigSession &session, QWidget *parent) :
        _scale(1e-6),
        _offset(0),
        _v_offset(0),
+       _show_cursors(false),
+       _cursors(pair<Cursor, Cursor>(Cursor(*this, 0.0),
+               Cursor(*this, 1.0))),
        _hover_point(-1, -1)
 {
        connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
@@ -72,6 +79,11 @@ View::View(SigSession &session, QWidget *parent) :
        connect(&_session, SIGNAL(data_updated()),
                this, SLOT(data_updated()));
 
+       connect(&_cursors.first, SIGNAL(time_changed()),
+               this, SLOT(marker_time_changed()));
+       connect(&_cursors.second, SIGNAL(time_changed()),
+               this, SLOT(marker_time_changed()));
+
        setViewportMargins(LabelMarginWidth, RulerHeight, 0, 0);
        setViewport(_viewport);
 
@@ -128,6 +140,23 @@ void View::set_scale_offset(double scale, double offset)
        _viewport->update();
 }
 
+bool View::cursors_shown() const
+{
+       return _show_cursors;
+}
+
+void View::show_cursors(bool show)
+{
+       _show_cursors = show;
+       _ruler->update();
+       _viewport->update();
+}
+
+std::pair<Cursor, Cursor>& View::cursors()
+{
+       return _cursors;
+}
+
 const QPoint& View::hover_point() const
 {
        return _hover_point;
@@ -264,5 +293,11 @@ void View::data_updated()
        _viewport->update();
 }
 
+void View::marker_time_changed()
+{
+       _ruler->update();
+       _viewport->update();
+}
+
 } // namespace view
 } // namespace pv