TimeMarker: Replaced time_changed signal with View::time_item_apparance_changed

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index fce5b18c2fc487b52a3cb365b47e2d4a9f76c65c..d58e074a3ef72ec77bc3e75c3487dac627cbb15d 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -50,13 +50,14 @@
 
 #include "pv/session.hpp"
 #include "pv/data/logic.hpp"
-#include "pv/data/logicsnapshot.hpp"
+#include "pv/data/logicsegment.hpp"
 #include "pv/util.hpp"
 
 using boost::shared_lock;
 using boost::shared_mutex;
 
 using pv::data::SignalData;
+using pv::data::Segment;
 using pv::util::format_time;
 
 using std::back_inserter;
@@ -103,7 +104,7 @@ View::View(Session &session, QWidget *parent) :
        tick_period_(0.0),
        tick_prefix_(0),
        show_cursors_(false),
-       cursors_(*this),
+       cursors_(new CursorPair(*this)),
        hover_point_(-1, -1)
 {
        connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
@@ -120,11 +121,6 @@ View::View(Session &session, QWidget *parent) :
        connect(&session_, SIGNAL(frame_ended()),
                this, SLOT(data_updated()));
 
-       connect(cursors_.first().get(), SIGNAL(time_changed()),
-               this, SLOT(marker_time_changed()));
-       connect(cursors_.second().get(), SIGNAL(time_changed()),
-               this, SLOT(marker_time_changed()));
-
        connect(header_, SIGNAL(signals_moved()),
                this, SLOT(on_signals_moved()));
 
@@ -194,6 +190,15 @@ const Viewport* View::viewport() const
        return viewport_;
 }
 
+vector< shared_ptr<TimeItem> > View::time_items() const
+{
+       vector< shared_ptr<TimeItem> > items;
+       items.push_back(cursors_);
+       items.push_back(cursors_->first());
+       items.push_back(cursors_->second());
+       return items;
+}
+
 double View::scale() const
 {
        return scale_;
@@ -262,7 +267,10 @@ void View::zoom_one_to_one()
        double samplerate = 0.0;
        for (const shared_ptr<SignalData> d : visible_data) {
                assert(d);
-               samplerate = max(samplerate, d->samplerate());
+               const vector< shared_ptr<Segment> > segments =
+                       d->segments();
+               for (const shared_ptr<Segment> &s : segments)
+                       samplerate = max(samplerate, s->samplerate());
        }
 
        if (samplerate == 0.0)
@@ -306,22 +314,26 @@ set< shared_ptr<SignalData> > View::get_visible_data() const
 
 pair<double, double> View::get_time_extents() const
 {
-       const set< shared_ptr<SignalData> > visible_data = get_visible_data();
-       if (visible_data.empty())
-               return make_pair(0.0, 0.0);
-
        double left_time = DBL_MAX, right_time = DBL_MIN;
+       const set< shared_ptr<SignalData> > visible_data = get_visible_data();
        for (const shared_ptr<SignalData> d : visible_data)
        {
-               const double start_time = d->get_start_time();
-               double samplerate = d->samplerate();
-               samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
-
-               left_time = min(left_time, start_time);
-               right_time = max(right_time, start_time +
-                       d->get_max_sample_count() / samplerate);
+               const vector< shared_ptr<Segment> > segments =
+                       d->segments();
+               for (const shared_ptr<Segment> &s : segments) {
+                       double samplerate = s->samplerate();
+                       samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
+
+                       const double start_time = s->start_time();
+                       left_time = min(left_time, start_time);
+                       right_time = max(right_time, start_time +
+                               d->get_max_sample_count() / samplerate);
+               }
        }
 
+       if (left_time == DBL_MAX && right_time == DBL_MIN)
+               return make_pair(0.0, 0.0);
+
        assert(left_time < right_time);
        return make_pair(left_time, right_time);
 }
@@ -341,18 +353,13 @@ void View::show_cursors(bool show)
 void View::centre_cursors()
 {
        const double time_width = scale_ * viewport_->width();
-       cursors_.first()->set_time(offset_ + time_width * 0.4);
-       cursors_.second()->set_time(offset_ + time_width * 0.6);
+       cursors_->first()->set_time(offset_ + time_width * 0.4);
+       cursors_->second()->set_time(offset_ + time_width * 0.6);
        cursorheader_->update();
        viewport_->update();
 }
 
-CursorPair& View::cursors()
-{
-       return cursors_;
-}
-
-const CursorPair& View::cursors() const
+std::shared_ptr<CursorPair> View::cursors() const
 {
        return cursors_;
 }
@@ -451,7 +458,10 @@ void View::update_scroll()
        get_scroll_layout(length, offset);
        length = max(length - areaSize.width(), 0.0);
 
+       int major_tick_distance = tick_period_ / scale_;
+
        horizontalScrollBar()->setPageStep(areaSize.width() / 2);
+       horizontalScrollBar()->setSingleStep(major_tick_distance);
 
        updating_scroll_ = true;
 
@@ -468,11 +478,11 @@ void View::update_scroll()
 
        // Set the vertical scrollbar
        verticalScrollBar()->setPageStep(areaSize.height());
+       verticalScrollBar()->setSingleStep(areaSize.height() / 8);
 
        const pair<int, int> extents = v_extents();
-       const int extra_scroll_height = (extents.second - extents.first) / 4;
-       verticalScrollBar()->setRange(extents.first - extra_scroll_height,
-               extents.first + extra_scroll_height);
+       verticalScrollBar()->setRange(extents.first - (areaSize.height() / 2),
+               extents.second - (areaSize.height() / 2));
 }
 
 void View::update_layout()
@@ -491,16 +501,16 @@ void View::update_layout()
        update_scroll();
 }
 
-void View::paint_label(QPainter &p, int right, bool hover)
+void View::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
        (void)p;
-       (void)right;
+       (void)rect;
        (void)hover;
 }
 
-QRectF View::label_rect(int right)
+QRectF View::label_rect(const QRectF &rect)
 {
-       (void)right;
+       (void)rect;
        return QRectF();
 }
 
@@ -592,7 +602,7 @@ void View::resizeEvent(QResizeEvent*)
        update_layout();
 }
 
-void View::appearance_changed(bool label, bool content)
+void View::row_item_appearance_changed(bool label, bool content)
 {
        if (label)
                header_->update();
@@ -600,11 +610,19 @@ void View::appearance_changed(bool label, bool content)
                viewport_->update();
 }
 
+void View::time_item_appearance_changed(bool label, bool content)
+{
+       if (label)
+               cursorheader_->update();
+       if (content)
+               viewport_->update();
+}
+
 void View::extents_changed(bool horz, bool vert)
 {
        sticky_events_ |=
-               (horz ? SelectableItemHExtentsChanged : 0) |
-               (vert ? SelectableItemVExtentsChanged : 0);
+               (horz ? RowItemHExtentsChanged : 0) |
+               (vert ? RowItemVExtentsChanged : 0);
        lazy_event_handler_.start();
 }
 
@@ -713,12 +731,6 @@ void View::data_updated()
        viewport_->update();
 }
 
-void View::marker_time_changed()
-{
-       cursorheader_->update();
-       viewport_->update();
-}
-
 void View::on_signals_moved()
 {
        update_scroll();
@@ -727,9 +739,9 @@ void View::on_signals_moved()
 
 void View::process_sticky_events()
 {
-       if (sticky_events_ & SelectableItemHExtentsChanged)
+       if (sticky_events_ & RowItemHExtentsChanged)
                update_layout();
-       if (sticky_events_ & SelectableItemVExtentsChanged)
+       if (sticky_events_ & RowItemVExtentsChanged)
                restack_all_row_items();
 
        // Clear the sticky events