X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=f46045ad1af482d89d0da7f00d5b853f7ae34ea6;hp=5877c22d87584ed2e506e5dfdf5e76b35d5b6fa8;hb=067bb62415847791709f4c3cad8bb252a63f45f8;hpb=d7aae647fee176f7a0257f65b4e5d7fda81744c3 diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 5877c22d..f46045ad 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ #ifdef ENABLE_DECODE @@ -24,51 +23,72 @@ #include +#include #include #include #include +#include +#include #include #include +#include +#include +#include +#include + #include +#include #include #include #include #include -#include +#include -#include "cursorheader.hpp" -#include "decodetrace.hpp" +#include "analogsignal.hpp" #include "header.hpp" #include "logicsignal.hpp" #include "ruler.hpp" #include "signal.hpp" #include "tracegroup.hpp" +#include "triggermarker.hpp" #include "view.hpp" #include "viewport.hpp" #include "pv/session.hpp" +#include "pv/globalsettings.hpp" +#include "pv/devices/device.hpp" #include "pv/data/logic.hpp" -#include "pv/data/logicsnapshot.hpp" +#include "pv/data/logicsegment.hpp" #include "pv/util.hpp" +#ifdef ENABLE_DECODE +#include "decodetrace.hpp" +#endif + using boost::shared_lock; using boost::shared_mutex; using pv::data::SignalData; -using pv::util::format_time; +using pv::data::Segment; +using pv::util::TimeUnit; +using pv::util::Timestamp; using std::back_inserter; +using std::copy_if; using std::deque; using std::dynamic_pointer_cast; +using std::inserter; using std::list; using std::lock_guard; using std::max; using std::make_pair; +using std::make_shared; using std::min; using std::pair; using std::set; +using std::set_difference; using std::shared_ptr; using std::unordered_map; using std::unordered_set; @@ -76,66 +96,86 @@ using std::vector; using std::weak_ptr; namespace pv { -namespace view { +namespace views { +namespace TraceView { -const double View::MaxScale = 1e9; -const double View::MinScale = 1e-15; +const Timestamp View::MaxScale("1e9"); +const Timestamp View::MinScale("1e-12"); const int View::MaxScrollValue = INT_MAX / 2; +const int View::MaxViewAutoUpdateRate = 25; // No more than 25 Hz with sticky scrolling const int View::ScaleUnits[3] = {1, 2, 5}; -const QColor View::CursorAreaColour(220, 231, 243); -const QSizeF View::LabelPadding(4, 0); +CustomAbstractScrollArea::CustomAbstractScrollArea(QWidget *parent) : + QAbstractScrollArea(parent) +{ +} + +void CustomAbstractScrollArea::setViewportMargins(int left, int top, int right, int bottom) +{ + QAbstractScrollArea::setViewportMargins(left, top, right, bottom); +} + +bool CustomAbstractScrollArea::viewportEvent(QEvent *event) +{ + switch (event->type()) { + case QEvent::Paint: + case QEvent::MouseButtonPress: + case QEvent::MouseButtonRelease: + case QEvent::MouseButtonDblClick: + case QEvent::MouseMove: + case QEvent::Wheel: + case QEvent::TouchBegin: + case QEvent::TouchUpdate: + case QEvent::TouchEnd: + return false; + default: + return QAbstractScrollArea::viewportEvent(event); + } +} -View::View(Session &session, QWidget *parent) : - QAbstractScrollArea(parent), - session_(session), +View::View(Session &session, bool is_main_view, QWidget *parent) : + ViewBase(session, is_main_view, parent), viewport_(new Viewport(*this)), ruler_(new Ruler(*this)), - cursorheader_(new CursorHeader(*this)), header_(new Header(*this)), - scale_(1e-6), + scrollarea_(this), + scale_(1e-3), offset_(0), - v_offset_(0), updating_scroll_(false), - tick_period_(0.0), - tick_prefix_(0), + sticky_scrolling_(false), // Default setting is set in MainWindow::setup_ui() + always_zoom_to_fit_(false), + tick_period_(0), + tick_prefix_(pv::util::SIPrefix::yocto), + tick_precision_(0), + time_unit_(util::TimeUnit::Time), show_cursors_(false), - cursors_(*this), - hover_point_(-1, -1) + cursors_(new CursorPair(*this)), + next_flag_text_('A'), + trigger_markers_(), + hover_point_(-1, -1), + scroll_needs_defaults_(false), + saved_v_offset_(0), + size_finalized_(false) { - connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), + GlobalSettings settings; + coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool(); + + connect(scrollarea_.horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(h_scroll_value_changed(int))); - connect(verticalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(v_scroll_value_changed(int))); - - connect(&session_, SIGNAL(signals_changed()), - this, SLOT(signals_changed())); - connect(&session_, SIGNAL(capture_state_changed(int)), - this, SLOT(data_updated())); - connect(&session_, SIGNAL(data_received()), - this, SLOT(data_updated())); - 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())); + connect(scrollarea_.verticalScrollBar(), SIGNAL(valueChanged(int)), + this, SLOT(v_scroll_value_changed())); connect(header_, SIGNAL(selection_changed()), - cursorheader_, SLOT(clear_selection())); - connect(cursorheader_, SIGNAL(selection_changed()), + ruler_, SLOT(clear_selection())); + connect(ruler_, SIGNAL(selection_changed()), header_, SLOT(clear_selection())); connect(header_, SIGNAL(selection_changed()), this, SIGNAL(selection_changed())); - connect(cursorheader_, SIGNAL(selection_changed()), + connect(ruler_, SIGNAL(selection_changed()), this, SIGNAL(selection_changed())); connect(this, SIGNAL(hover_point_changed()), @@ -145,11 +185,21 @@ View::View(Session &session, QWidget *parent) : this, SLOT(process_sticky_events())); lazy_event_handler_.setSingleShot(true); - setViewport(viewport_); + connect(&delayed_view_updater_, SIGNAL(timeout()), + this, SLOT(perform_delayed_view_update())); + delayed_view_updater_.setSingleShot(true); + delayed_view_updater_.setInterval(1000 / MaxViewAutoUpdateRate); + + /* To let the scroll area fill up the parent QWidget (this), we need a layout */ + QHBoxLayout *layout = new QHBoxLayout(this); + setLayout(layout); + layout->setContentsMargins(0, 0, 0, 0); + layout->addWidget(&scrollarea_); + + scrollarea_.setViewport(viewport_); viewport_->installEventFilter(this); ruler_->installEventFilter(this); - cursorheader_->installEventFilter(this); header_->installEventFilter(this); // Trigger the initial event manually. The default device has signals @@ -157,7 +207,7 @@ View::View(Session &session, QWidget *parent) : signals_changed(); // make sure the transparent widgets are on the top - cursorheader_->raise(); + ruler_->raise(); header_->raise(); // Update the zoom state @@ -174,6 +224,45 @@ const Session& View::session() const return session_; } +std::unordered_set< std::shared_ptr > View::signals() const +{ + return signals_; +} + +void View::clear_signals() +{ + signals_.clear(); +} + +void View::add_signal(const shared_ptr signal) +{ + signals_.insert(signal); +} + +#ifdef ENABLE_DECODE +void View::clear_decode_signals() +{ + decode_traces_.clear(); +} + +void View::add_decode_signal(shared_ptr signalbase) +{ + shared_ptr d( + new DecodeTrace(session_, signalbase, decode_traces_.size())); + decode_traces_.push_back(d); +} + +void View::remove_decode_signal(shared_ptr signalbase) +{ + for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++) + if ((*i)->base() == signalbase) { + decode_traces_.erase(i); + signals_changed(); + return; + } +} +#endif + View* View::view() { return this; @@ -194,19 +283,107 @@ const Viewport* View::viewport() const return viewport_; } +void View::save_settings(QSettings &settings) const +{ + settings.setValue("scale", scale_); + settings.setValue("v_offset", + scrollarea_.verticalScrollBar()->sliderPosition()); + + std::stringstream ss; + boost::archive::text_oarchive oa(ss); + oa << boost::serialization::make_nvp("offset", offset_); + settings.setValue("offset", QString::fromStdString(ss.str())); + + for (shared_ptr signal : signals_) { + settings.beginGroup(signal->base()->internal_name()); + signal->save_settings(settings); + settings.endGroup(); + } +} + +void View::restore_settings(QSettings &settings) +{ + // Note: It is assumed that this function is only called once, + // immediately after restoring a previous session. + + if (settings.contains("scale")) + set_scale(settings.value("scale").toDouble()); + + if (settings.contains("offset")) { + util::Timestamp offset; + std::stringstream ss; + ss << settings.value("offset").toString().toStdString(); + + boost::archive::text_iarchive ia(ss); + ia >> boost::serialization::make_nvp("offset", offset); + + set_offset(offset); + } + + for (shared_ptr signal : signals_) { + settings.beginGroup(signal->base()->internal_name()); + signal->restore_settings(settings); + settings.endGroup(); + } + + if (settings.contains("v_offset")) { + saved_v_offset_ = settings.value("v_offset").toInt(); + set_v_offset(saved_v_offset_); + scroll_needs_defaults_ = false; + // Note: see resizeEvent() for additional information + } +} + +vector< shared_ptr > View::time_items() const +{ + const vector> f(flags()); + vector> items(f.begin(), f.end()); + items.push_back(cursors_); + items.push_back(cursors_->first()); + items.push_back(cursors_->second()); + + for (auto trigger_marker : trigger_markers_) + items.push_back(trigger_marker); + + return items; +} + double View::scale() const { return scale_; } -double View::offset() const +void View::set_scale(double scale) +{ + if (scale_ != scale) { + scale_ = scale; + Q_EMIT scale_changed(); + } +} + +const Timestamp& View::offset() const { return offset_; } +void View::set_offset(const pv::util::Timestamp& offset) +{ + if (offset_ != offset) { + offset_ = offset; + Q_EMIT offset_changed(); + } +} + int View::owner_visual_v_offset() const { - return -v_offset_; + return -scrollarea_.verticalScrollBar()->sliderPosition(); +} + +void View::set_v_offset(int offset) +{ + scrollarea_.verticalScrollBar()->setSliderPosition(offset); + header_->update(); + viewport_->update(); } unsigned int View::depth() const @@ -214,16 +391,58 @@ unsigned int View::depth() const return 0; } -unsigned int View::tick_prefix() const +pv::util::SIPrefix View::tick_prefix() const { return tick_prefix_; } -double View::tick_period() const +void View::set_tick_prefix(pv::util::SIPrefix tick_prefix) +{ + if (tick_prefix_ != tick_prefix) { + tick_prefix_ = tick_prefix; + Q_EMIT tick_prefix_changed(); + } +} + +unsigned int View::tick_precision() const +{ + return tick_precision_; +} + +void View::set_tick_precision(unsigned tick_precision) +{ + if (tick_precision_ != tick_precision) { + tick_precision_ = tick_precision; + Q_EMIT tick_precision_changed(); + } +} + +const pv::util::Timestamp& View::tick_period() const { return tick_period_; } +void View::set_tick_period(const pv::util::Timestamp& tick_period) +{ + if (tick_period_ != tick_period) { + tick_period_ = tick_period; + Q_EMIT tick_period_changed(); + } +} + +TimeUnit View::time_unit() const +{ + return time_unit_; +} + +void View::set_time_unit(pv::util::TimeUnit time_unit) +{ + if (time_unit_ != time_unit) { + time_unit_ = time_unit; + Q_EMIT time_unit_changed(); + } +} + void View::zoom(double steps) { zoom(steps, viewport_->width() / 2); @@ -234,11 +453,20 @@ void View::zoom(double steps, int offset) set_zoom(scale_ * pow(3.0/2.0, -steps), offset); } -void View::zoom_fit() +void View::zoom_fit(bool gui_state) { - const pair extents = get_time_extents(); - const double delta = extents.second - extents.first; - if (delta < 1e-12) + // Act as one-shot when stopped, toggle along with the GUI otherwise + if (session_.get_capture_state() == Session::Stopped) { + always_zoom_to_fit_ = false; + always_zoom_to_fit_changed(false); + } else { + always_zoom_to_fit_ = gui_state; + always_zoom_to_fit_changed(gui_state); + } + + const pair extents = get_time_extents(); + const Timestamp delta = extents.second - extents.first; + if (delta < Timestamp("1e-12")) return; assert(viewport_); @@ -246,8 +474,8 @@ void View::zoom_fit() if (w <= 0) return; - const double scale = max(min(delta / w, MaxScale), MinScale); - set_scale_offset(scale, extents.first); + const Timestamp scale = max(min(delta / w, MaxScale), MinScale); + set_scale_offset(scale.convert_to(), extents.first); } void View::zoom_one_to_one() @@ -259,71 +487,116 @@ void View::zoom_one_to_one() if (visible_data.empty()) return; - double samplerate = 0.0; - for (const shared_ptr d : visible_data) { - assert(d); - samplerate = max(samplerate, d->samplerate()); - } - - if (samplerate == 0.0) - return; - assert(viewport_); const int w = viewport_->width(); if (w <= 0) return; - set_zoom(1.0 / samplerate, w / 2); + set_zoom(1.0 / session_.get_samplerate(), w / 2); } -void View::set_scale_offset(double scale, double offset) +void View::set_scale_offset(double scale, const Timestamp& offset) { - scale_ = scale; - offset_ = offset; + // Disable sticky scrolling / always zoom to fit when acquisition runs + // and user drags the viewport + if ((scale_ == scale) && (offset_ != offset) && + (session_.get_capture_state() == Session::Running)) { + + if (sticky_scrolling_) { + sticky_scrolling_ = false; + sticky_scrolling_changed(false); + } + + if (always_zoom_to_fit_) { + always_zoom_to_fit_ = false; + always_zoom_to_fit_changed(false); + } + } + + set_scale(scale); + set_offset(offset); calculate_tick_spacing(); update_scroll(); ruler_->update(); - cursorheader_->update(); viewport_->update(); - scale_offset_changed(); } set< shared_ptr > View::get_visible_data() const { - shared_lock lock(session().signals_mutex()); - const vector< shared_ptr > &sigs(session().signals()); - // Make a set of all the visible data objects set< shared_ptr > visible_data; - for (const shared_ptr sig : sigs) + for (const shared_ptr sig : signals_) if (sig->enabled()) visible_data.insert(sig->data()); return visible_data; } -pair View::get_time_extents() const +pair View::get_time_extents() const { + boost::optional left_time, right_time; const set< shared_ptr > visible_data = get_visible_data(); - if (visible_data.empty()) - return make_pair(0.0, 0.0); + for (const shared_ptr d : visible_data) { + const vector< shared_ptr > segments = + d->segments(); + for (const shared_ptr &s : segments) { + double samplerate = s->samplerate(); + samplerate = (samplerate <= 0.0) ? 1.0 : samplerate; + + const Timestamp start_time = s->start_time(); + left_time = left_time ? + min(*left_time, start_time) : + start_time; + right_time = right_time ? + max(*right_time, start_time + d->max_sample_count() / samplerate) : + start_time + d->max_sample_count() / samplerate; + } + } + + if (!left_time || !right_time) + return make_pair(0, 0); + + assert(*left_time < *right_time); + return make_pair(*left_time, *right_time); +} + +void View::enable_sticky_scrolling(bool state) +{ + sticky_scrolling_ = state; +} - double left_time = DBL_MAX, right_time = DBL_MIN; - for (const shared_ptr d : visible_data) - { - const double start_time = d->get_start_time(); - double samplerate = d->samplerate(); - samplerate = (samplerate <= 0.0) ? 1.0 : samplerate; +void View::toggle_sticky_scrolling(void) +{ + sticky_scrolling_ = !sticky_scrolling_; +} + +void View::enable_coloured_bg(bool state) +{ + const vector> items( + list_by_type()); - left_time = min(left_time, start_time); - right_time = max(right_time, start_time + - d->get_max_sample_count() / samplerate); + for (shared_ptr i : items) { + // Can't cast to Trace because it's abstract, so we need to + // check for any derived classes individually + + shared_ptr a = dynamic_pointer_cast(i); + if (a) + a->set_coloured_bg(state); + + shared_ptr l = dynamic_pointer_cast(i); + if (l) + l->set_coloured_bg(state); + +#ifdef ENABLE_DECODE + shared_ptr d = dynamic_pointer_cast(i); + if (d) + d->set_coloured_bg(state); +#endif } - assert(left_time < right_time); - return make_pair(left_time, right_time); + viewport_->update(); } bool View::cursors_shown() const @@ -334,216 +607,343 @@ bool View::cursors_shown() const void View::show_cursors(bool show) { show_cursors_ = show; - cursorheader_->update(); + ruler_->update(); viewport_->update(); } 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); - cursorheader_->update(); + cursors_->first()->set_time(offset_ + time_width * 0.4); + cursors_->second()->set_time(offset_ + time_width * 0.6); + ruler_->update(); viewport_->update(); } -CursorPair& View::cursors() +std::shared_ptr View::cursors() const { return cursors_; } -const CursorPair& View::cursors() const +void View::add_flag(const Timestamp& time) { - return cursors_; + flags_.push_back(make_shared(*this, time, + QString("%1").arg(next_flag_text_))); + + next_flag_text_ = (next_flag_text_ >= 'Z') ? 'A' : + (next_flag_text_ + 1); + + time_item_appearance_changed(true, true); } -const QPoint& View::hover_point() const +void View::remove_flag(std::shared_ptr flag) { - return hover_point_; + flags_.remove(flag); + time_item_appearance_changed(true, true); } -void View::update_viewport() +vector< std::shared_ptr > View::flags() const { - assert(viewport_); - viewport_->update(); - header_->update(); + vector< std::shared_ptr > flags(flags_.begin(), flags_.end()); + stable_sort(flags.begin(), flags.end(), + [](const shared_ptr &a, const shared_ptr &b) { + return a->time() < b->time(); + }); + + return flags; } -void View::restack_all_row_items() +const QPoint& View::hover_point() const { - // Make a set of owners - unordered_set< RowItemOwner* > owners; - for (const auto &r : *this) - owners.insert(r->owner()); + return hover_point_; +} - // Make a list that is sorted from deepest first - vector< RowItemOwner* > sorted_owners(owners.begin(), owners.end()); +void View::restack_all_trace_tree_items() +{ + // Make a list of owners that is sorted from deepest first + const vector> items( + list_by_type()); + set< TraceTreeItemOwner* > owners; + for (const auto &r : items) + owners.insert(r->owner()); + vector< TraceTreeItemOwner* > sorted_owners(owners.begin(), owners.end()); sort(sorted_owners.begin(), sorted_owners.end(), - [](const RowItemOwner* a, const RowItemOwner *b) { + [](const TraceTreeItemOwner* a, const TraceTreeItemOwner *b) { return a->depth() > b->depth(); }); // Restack the items recursively for (auto &o : sorted_owners) o->restack_items(); + // Re-assign background colors + bool next_bgcolour_state = 0; + + for (auto &o : sorted_owners) + next_bgcolour_state = o->reassign_bgcolour_states(next_bgcolour_state); + // Animate the items to their destination - for (const auto &r : *this) - r->animate_to_layout_v_offset(); + for (const auto &i : items) + i->animate_to_layout_v_offset(); } -void View::get_scroll_layout(double &length, double &offset) const +void View::trigger_event(util::Timestamp location) { - const pair extents = get_time_extents(); - length = (extents.second - extents.first) / scale_; + trigger_markers_.push_back(make_shared(*this, location)); +} + +void View::get_scroll_layout(double &length, Timestamp &offset) const +{ + const pair extents = get_time_extents(); + length = ((extents.second - extents.first) / scale_).convert_to(); offset = offset_ / scale_; } void View::set_zoom(double scale, int offset) { - const double cursor_offset = offset_ + scale_ * offset; - const double new_scale = max(min(scale, MaxScale), MinScale); - const double new_offset = cursor_offset - new_scale * offset; - set_scale_offset(new_scale, new_offset); + // Reset the "always zoom to fit" feature as the user changed the zoom + always_zoom_to_fit_ = false; + always_zoom_to_fit_changed(false); + + const Timestamp cursor_offset = offset_ + scale_ * offset; + const Timestamp new_scale = max(min(Timestamp(scale), MaxScale), MinScale); + const Timestamp new_offset = cursor_offset - new_scale * offset; + set_scale_offset(new_scale.convert_to(), new_offset); } void View::calculate_tick_spacing() { - const double SpacingIncrement = 32.0f; - const double MinValueSpacing = 32.0f; + const double SpacingIncrement = 10.0f; + const double MinValueSpacing = 40.0f; + + // Figure out the highest numeric value visible on a label + const QSize areaSize = viewport_->size(); + const Timestamp max_time = max(fabs(offset_), + fabs(offset_ + scale_ * areaSize.width())); - double min_width = SpacingIncrement, typical_width; + double min_width = SpacingIncrement; + double label_width, tick_period_width; QFontMetrics m(QApplication::font()); + // Copies of the member variables with the same name, used in the calculation + // and written back afterwards, so that we don't emit signals all the time + // during the calculation. + pv::util::Timestamp tick_period = tick_period_; + pv::util::SIPrefix tick_prefix = tick_prefix_; + unsigned tick_precision = tick_precision_; + do { const double min_period = scale_ * min_width; const int order = (int)floorf(log10f(min_period)); - const double order_decimal = pow(10.0, order); - + const pv::util::Timestamp order_decimal = + pow(pv::util::Timestamp(10), order); + + // Allow for a margin of error so that a scale unit of 1 can be used. + // Otherwise, for a SU of 1 the tick period will almost always be below + // the min_period by a small amount - and thus skipped in favor of 2. + // Note: margin assumes that SU[0] and SU[1] contain the smallest values + double tp_margin = (ScaleUnits[0] + ScaleUnits[1]) / 2.0; + double tp_with_margin; unsigned int unit = 0; do { - tick_period_ = order_decimal * ScaleUnits[unit++]; - } while (tick_period_ < min_period && - unit < countof(ScaleUnits)); + tp_with_margin = order_decimal.convert_to() * + (ScaleUnits[unit++] + tp_margin); + } while (tp_with_margin < min_period && unit < countof(ScaleUnits)); + + tick_period = order_decimal * ScaleUnits[unit - 1]; + tick_prefix = static_cast( + (order - pv::util::exponent(pv::util::SIPrefix::yocto)) / 3); - tick_prefix_ = (order - pv::util::FirstSIPrefixPower) / 3; + // Precision is the number of fractional digits required, not + // taking the prefix into account (and it must never be negative) + tick_precision = std::max(ceil(log10(1 / tick_period)).convert_to(), 0); - typical_width = m.boundingRect(0, 0, INT_MAX, INT_MAX, - Qt::AlignLeft | Qt::AlignTop, - format_time(offset_, tick_prefix_)).width() + + tick_period_width = (tick_period / scale_).convert_to(); + + const QString label_text = Ruler::format_time_with_distance( + tick_period, max_time, tick_prefix, time_unit_, tick_precision); + + label_width = m.boundingRect(0, 0, INT_MAX, INT_MAX, + Qt::AlignLeft | Qt::AlignTop, label_text).width() + MinValueSpacing; min_width += SpacingIncrement; + } while (tick_period_width < label_width); - } while(typical_width > tick_period_ / scale_); + set_tick_period(tick_period); + set_tick_prefix(tick_prefix); + set_tick_precision(tick_precision); } void View::update_scroll() { assert(viewport_); + QScrollBar *hscrollbar = scrollarea_.horizontalScrollBar(); + QScrollBar *vscrollbar = scrollarea_.verticalScrollBar(); const QSize areaSize = viewport_->size(); // Set the horizontal scroll bar - double length = 0, offset = 0; + double length = 0; + Timestamp offset; get_scroll_layout(length, offset); length = max(length - areaSize.width(), 0.0); - int major_tick_distance = tick_period_ / scale_; + int major_tick_distance = (tick_period_ / scale_).convert_to(); - horizontalScrollBar()->setPageStep(areaSize.width() / 2); - horizontalScrollBar()->setSingleStep(major_tick_distance); + hscrollbar->setPageStep(areaSize.width() / 2); + hscrollbar->setSingleStep(major_tick_distance); updating_scroll_ = true; if (length < MaxScrollValue) { - horizontalScrollBar()->setRange(0, length); - horizontalScrollBar()->setSliderPosition(offset); + hscrollbar->setRange(0, length); + hscrollbar->setSliderPosition(offset.convert_to()); } else { - horizontalScrollBar()->setRange(0, MaxScrollValue); - horizontalScrollBar()->setSliderPosition( - offset_ * MaxScrollValue / (scale_ * length)); + hscrollbar->setRange(0, MaxScrollValue); + hscrollbar->setSliderPosition( + (offset_ * MaxScrollValue / (scale_ * length)).convert_to()); } updating_scroll_ = false; // Set the vertical scrollbar - verticalScrollBar()->setPageStep(areaSize.height()); + vscrollbar->setPageStep(areaSize.height()); + vscrollbar->setSingleStep(areaSize.height() / 8); const pair 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); + + // Don't change the scrollbar range if there are no traces + if (extents.first != extents.second) + vscrollbar->setRange(extents.first - areaSize.height(), + extents.second); + + if (scroll_needs_defaults_) + set_scroll_default(); +} + +void View::reset_scroll() +{ + scrollarea_.verticalScrollBar()->setRange(0, 0); +} + +void View::set_scroll_default() +{ + assert(viewport_); + + const QSize areaSize = viewport_->size(); + + const pair extents = v_extents(); + const int trace_height = extents.second - extents.first; + + // Do all traces fit in the view? + if (areaSize.height() >= trace_height) + // Center all traces vertically + set_v_offset(extents.first - + ((areaSize.height() - trace_height) / 2)); + else + // Put the first trace at the top, letting the bottom ones overflow + set_v_offset(extents.first); + + // If we're not sure whether setting the defaults worked as + // the window wasn't set up entirely yet, we want to be called + // again later to make sure + scroll_needs_defaults_ = !size_finalized_; } void View::update_layout() { - setViewportMargins( - header_->sizeHint().width() - pv::view::Header::BaselineOffset, + scrollarea_.setViewportMargins( + header_->sizeHint().width() - Header::BaselineOffset, ruler_->sizeHint().height(), 0, 0); ruler_->setGeometry(viewport_->x(), 0, - viewport_->width(), viewport_->y()); - cursorheader_->setGeometry( - viewport_->x(), - ruler_->sizeHint().height() - cursorheader_->sizeHint().height() / 2, - viewport_->width(), cursorheader_->sizeHint().height()); + viewport_->width(), ruler_->extended_size_hint().height()); header_->setGeometry(0, viewport_->y(), - header_->sizeHint().width(), viewport_->height()); + header_->extended_size_hint().width(), viewport_->height()); update_scroll(); } -void View::paint_label(QPainter &p, int right, bool hover) +TraceTreeItemOwner* View::find_prevalent_trace_group( + const shared_ptr &group, + const unordered_map, shared_ptr > + &signal_map) { - (void)p; - (void)right; - (void)hover; -} + assert(group); + + unordered_set owners; + vector owner_list; + + // Make a set and a list of all the owners + for (const auto &channel : group->channels()) { + for (auto entry : signal_map) { + if (entry.first->channel() == channel) { + TraceTreeItemOwner *const o = (entry.second)->owner(); + owner_list.push_back(o); + owners.insert(o); + } + } + } -QRectF View::label_rect(int right) -{ - (void)right; - return QRectF(); + // Iterate through the list of owners, and find the most prevalent + size_t max_prevalence = 0; + TraceTreeItemOwner *prevalent_owner = nullptr; + for (TraceTreeItemOwner *owner : owners) { + const size_t prevalence = std::count_if( + owner_list.begin(), owner_list.end(), + [&](TraceTreeItemOwner *o) { return o == owner; }); + if (prevalence > max_prevalence) { + max_prevalence = prevalence; + prevalent_owner = owner; + } + } + + return prevalent_owner; } -bool View::add_channels_to_owner( +vector< shared_ptr > View::extract_new_traces_for_channels( const vector< shared_ptr > &channels, - RowItemOwner *owner, int &offset, - unordered_map, shared_ptr > + const unordered_map, shared_ptr > &signal_map, - std::function)> filter_func) + set< shared_ptr > &add_list) { - bool any_added = false; - - assert(owner); - - for (const auto &channel : channels) - { - const auto iter = signal_map.find(channel); - if (iter == signal_map.end() || - (filter_func && !filter_func((*iter).second))) - continue; - - shared_ptr row_item = (*iter).second; - owner->add_child_item(row_item); - apply_offset(row_item, offset); - signal_map.erase(iter); - - any_added = true; + vector< shared_ptr > filtered_traces; + + for (const auto &channel : channels) { + for (auto entry : signal_map) { + if (entry.first->channel() == channel) { + shared_ptr trace = entry.second; + const auto list_iter = add_list.find(trace); + if (list_iter == add_list.end()) + continue; + + filtered_traces.push_back(trace); + add_list.erase(list_iter); + } + } } - return any_added; + return filtered_traces; } -void View::apply_offset(shared_ptr row_item, int &offset) { - assert(row_item); - const pair extents = row_item->v_extents(); - if (row_item->enabled()) - offset += -extents.first; - row_item->force_to_v_offset(offset); - if (row_item->enabled()) - offset += extents.second; +void View::determine_time_unit() +{ + // Check whether we know the sample rate and hence can use time as the unit + if (time_unit_ == util::TimeUnit::Samples) { + // Check all signals but... + for (const shared_ptr signal : signals_) { + const shared_ptr data = signal->data(); + + // ...only check first segment of each + const vector< shared_ptr > segments = data->segments(); + if (!segments.empty()) + if (segments[0]->samplerate()) { + set_time_unit(util::TimeUnit::Time); + break; + } + } + } } bool View::eventFilter(QObject *object, QEvent *event) @@ -554,7 +954,7 @@ bool View::eventFilter(QObject *object, QEvent *event) const QMouseEvent *const mouse_event = (QMouseEvent*)event; if (object == viewport_) hover_point_ = mouse_event->pos(); - else if (object == ruler_ || object == cursorheader_) + else if (object == ruler_) hover_point_ = QPoint(mouse_event->x(), 0); else if (object == header_) hover_point_ = QPoint(0, mouse_event->y()); @@ -571,34 +971,44 @@ bool View::eventFilter(QObject *object, QEvent *event) return QObject::eventFilter(object, event); } -bool View::viewportEvent(QEvent *e) +void View::resizeEvent(QResizeEvent*) { - switch(e->type()) { - case QEvent::Paint: - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - case QEvent::MouseButtonDblClick: - case QEvent::MouseMove: - case QEvent::Wheel: - case QEvent::TouchBegin: - case QEvent::TouchUpdate: - case QEvent::TouchEnd: - return false; + update_layout(); - default: - return QAbstractScrollArea::viewportEvent(e); + // This is somewhat of a hack, unfortunately. We cannot use + // set_v_offset() from within restore_settings() as the view + // at that point is neither visible nor properly sized. + // This is the least intrusive workaround I could come up + // with: set the vertical offset (or scroll defaults) when + // the view is visible and resized to its final size. + // Resize events that are sent when the view is not visible + // must be ignored as they have wrong sizes, potentially + // preventing the v offset from being set successfully. + + if (isVisible()) + size_finalized_ = true; + + if (size_finalized_ && saved_v_offset_) { + set_v_offset(saved_v_offset_); + saved_v_offset_ = 0; } + + if (size_finalized_ && scroll_needs_defaults_) + set_scroll_default(); } -void View::resizeEvent(QResizeEvent*) +void View::row_item_appearance_changed(bool label, bool content) { - update_layout(); + if (label) + header_->update(); + if (content) + viewport_->update(); } -void View::appearance_changed(bool label, bool content) +void View::time_item_appearance_changed(bool label, bool content) { if (label) - header_->update(); + ruler_->update(); if (content) viewport_->update(); } @@ -606,8 +1016,8 @@ void View::appearance_changed(bool label, bool content) void View::extents_changed(bool horz, bool vert) { sticky_events_ |= - (horz ? SelectableItemHExtentsChanged : 0) | - (vert ? SelectableItemVExtentsChanged : 0); + (horz ? TraceTreeItemHExtentsChanged : 0) | + (vert ? TraceTreeItemVExtentsChanged : 0); lazy_event_handler_.start(); } @@ -616,124 +1026,281 @@ void View::h_scroll_value_changed(int value) if (updating_scroll_) return; - const int range = horizontalScrollBar()->maximum(); + // Disable sticky scrolling when user moves the horizontal scroll bar + // during a running acquisition + if (sticky_scrolling_ && (session_.get_capture_state() == Session::Running)) { + sticky_scrolling_ = false; + sticky_scrolling_changed(false); + } + + const int range = scrollarea_.horizontalScrollBar()->maximum(); if (range < MaxScrollValue) - offset_ = scale_ * value; + set_offset(scale_ * value); else { - double length = 0, offset; + double length = 0; + Timestamp offset; get_scroll_layout(length, offset); - offset_ = scale_ * length * value / MaxScrollValue; + set_offset(scale_ * length * value / MaxScrollValue); } ruler_->update(); - cursorheader_->update(); viewport_->update(); } -void View::v_scroll_value_changed(int value) +void View::v_scroll_value_changed() { - v_offset_ = value; header_->update(); viewport_->update(); } void View::signals_changed() { - int offset = 0; + using sigrok::Channel; - // Populate the traces - clear_child_items(); + vector< shared_ptr > channels; + shared_ptr sr_dev; - shared_ptr device = session_.device(); - assert(device); + // Do we need to set the vertical scrollbar to its default position later? + // We do if there are no traces, i.e. the scroll bar has no range set + bool reset_scrollbar = + (scrollarea_.verticalScrollBar()->minimum() == + scrollarea_.verticalScrollBar()->maximum()); - // Collect a set of signals - unordered_map, shared_ptr > - signal_map; + if (!session_.device()) { + reset_scroll(); + signals_.clear(); + } else { + sr_dev = session_.device()->device(); + assert(sr_dev); + channels = sr_dev->channels(); + } + + vector< shared_ptr > new_top_level_items; + + // Make a list of traces that are being added, and a list of traces + // that are being removed + const vector> prev_trace_list = list_by_type(); + const set> prev_traces( + prev_trace_list.begin(), prev_trace_list.end()); - shared_lock lock(session_.signals_mutex()); - const vector< shared_ptr > &sigs(session_.signals()); + set< shared_ptr > traces(signals_.begin(), signals_.end()); - for (const shared_ptr &sig : sigs) - signal_map[sig->channel()] = sig; +#ifdef ENABLE_DECODE + traces.insert(decode_traces_.begin(), decode_traces_.end()); +#endif + + set< shared_ptr > add_traces; + set_difference(traces.begin(), traces.end(), + prev_traces.begin(), prev_traces.end(), + inserter(add_traces, add_traces.begin())); + + set< shared_ptr > remove_traces; + set_difference(prev_traces.begin(), prev_traces.end(), + traces.begin(), traces.end(), + inserter(remove_traces, remove_traces.begin())); + + // Make a look-up table of sigrok Channels to pulseview Signals + unordered_map, shared_ptr > + signal_map; + for (const shared_ptr &sig : signals_) + signal_map[sig->base()] = sig; // Populate channel groups - for (auto entry : device->channel_groups()) - { - const shared_ptr &group = entry.second; - - if (group->channels().size() <= 1) - continue; - - shared_ptr trace_group(new TraceGroup()); - int child_offset = 0; - if (add_channels_to_owner(group->channels(), - trace_group.get(), child_offset, signal_map)) - { - add_child_item(trace_group); - apply_offset(trace_group, offset); + if (sr_dev) + for (auto entry : sr_dev->channel_groups()) { + const shared_ptr &group = entry.second; + + if (group->channels().size() <= 1) + continue; + + // Find best trace group to add to + TraceTreeItemOwner *owner = find_prevalent_trace_group( + group, signal_map); + + // If there is no trace group, create one + shared_ptr new_trace_group; + if (!owner) { + new_trace_group.reset(new TraceGroup()); + owner = new_trace_group.get(); + } + + // Extract traces for the trace group, removing them from + // the add list + const vector< shared_ptr > new_traces_in_group = + extract_new_traces_for_channels(group->channels(), + signal_map, add_traces); + + // Add the traces to the group + const pair prev_v_extents = owner->v_extents(); + int offset = prev_v_extents.second - prev_v_extents.first; + for (shared_ptr trace : new_traces_in_group) { + assert(trace); + owner->add_child_item(trace); + + const pair extents = trace->v_extents(); + if (trace->enabled()) + offset += -extents.first; + trace->force_to_v_offset(offset); + if (trace->enabled()) + offset += extents.second; + } + + if (new_trace_group) { + // Assign proper vertical offsets to each channel in the group + new_trace_group->restack_items(); + + // If this is a new group, enqueue it in the new top level + // items list + if (!new_traces_in_group.empty()) + new_top_level_items.push_back(new_trace_group); + } } - } - // Add the remaining logic channels - shared_ptr logic_trace_group(new TraceGroup()); - int child_offset = 0; + // Enqueue the remaining logic channels in a group + vector< shared_ptr > logic_channels; + copy_if(channels.begin(), channels.end(), back_inserter(logic_channels), + [](const shared_ptr& c) { + return c->type() == sigrok::ChannelType::LOGIC; }); + + const vector< shared_ptr > non_grouped_logic_signals = + extract_new_traces_for_channels(logic_channels, signal_map, add_traces); - if (add_channels_to_owner(device->channels(), - logic_trace_group.get(), child_offset, signal_map, - [](shared_ptr r) -> bool { - return dynamic_pointer_cast(r) != nullptr; - })) + if (non_grouped_logic_signals.size() > 0) { + const shared_ptr non_grouped_trace_group( + make_shared()); + for (shared_ptr trace : non_grouped_logic_signals) + non_grouped_trace_group->add_child_item(trace); - { - add_child_item(logic_trace_group); - apply_offset(logic_trace_group, offset); + non_grouped_trace_group->restack_items(); + new_top_level_items.push_back(non_grouped_trace_group); } - // Add the remaining channels - add_channels_to_owner(device->channels(), this, offset, signal_map); - assert(signal_map.empty()); + // Enqueue the remaining channels as free ungrouped traces + const vector< shared_ptr > new_top_level_signals = + extract_new_traces_for_channels(channels, signal_map, add_traces); + new_top_level_items.insert(new_top_level_items.end(), + new_top_level_signals.begin(), new_top_level_signals.end()); + + // Enqueue any remaining traces i.e. decode traces + new_top_level_items.insert(new_top_level_items.end(), + add_traces.begin(), add_traces.end()); + + // Remove any removed traces + for (shared_ptr trace : remove_traces) { + TraceTreeItemOwner *const owner = trace->owner(); + assert(owner); + owner->remove_child_item(trace); + } - // Add decode signals -#ifdef ENABLE_DECODE - const vector< shared_ptr > decode_sigs( - session().get_decode_signals()); - for (auto s : decode_sigs) { - add_child_item(s); - apply_offset(s, offset); + // Remove any empty trace groups + for (shared_ptr group : list_by_type()) + if (group->child_items().size() == 0) { + remove_child_item(group); + group.reset(); + } + + // Add and position the pending top levels items + int offset = v_extents().second; + for (auto item : new_top_level_items) { + add_child_item(item); + + // Position the item after the last item or at the top if there is none + const pair extents = item->v_extents(); + + if (item->enabled()) + offset += -extents.first; + + item->force_to_v_offset(offset); + + if (item->enabled()) + offset += extents.second; } -#endif update_layout(); + + header_->update(); + viewport_->update(); + + if (reset_scrollbar) + set_scroll_default(); } -void View::data_updated() +void View::capture_state_updated(int state) { - // Update the scroll bars - update_scroll(); + if (state == Session::Running) { + set_time_unit(util::TimeUnit::Samples); + + trigger_markers_.clear(); + + // Activate "always zoom to fit" if the setting is enabled and we're + // the main view of this session (other trace views may be used for + // zooming and we don't want to mess them up) + GlobalSettings settings; + bool state = settings.value(GlobalSettings::Key_View_AlwaysZoomToFit).toBool(); + if (is_main_view_ && state) { + always_zoom_to_fit_ = true; + always_zoom_to_fit_changed(always_zoom_to_fit_); + } + } - // Repaint the view - viewport_->update(); + if (state == Session::Stopped) { + // After acquisition has stopped we need to re-calculate the ticks once + // as it's otherwise done when the user pans or zooms, which is too late + calculate_tick_spacing(); + + // Reset "always zoom to fit", the acquisition has stopped + if (always_zoom_to_fit_) { + // Perform a final zoom-to-fit before disabling + zoom_fit(always_zoom_to_fit_); + always_zoom_to_fit_ = false; + always_zoom_to_fit_changed(always_zoom_to_fit_); + } + } } -void View::marker_time_changed() +void View::data_updated() { - cursorheader_->update(); - viewport_->update(); + if (always_zoom_to_fit_ || sticky_scrolling_) { + if (!delayed_view_updater_.isActive()) + delayed_view_updater_.start(); + } else { + determine_time_unit(); + update_scroll(); + ruler_->update(); + viewport_->update(); + } } -void View::on_signals_moved() +void View::perform_delayed_view_update() { + if (always_zoom_to_fit_) { + zoom_fit(true); + } else if (sticky_scrolling_) { + // Make right side of the view sticky + double length = 0; + Timestamp offset; + get_scroll_layout(length, offset); + + const QSize areaSize = viewport_->size(); + length = max(length - areaSize.width(), 0.0); + + set_offset(scale_ * length); + } + + determine_time_unit(); update_scroll(); - signals_moved(); + ruler_->update(); + viewport_->update(); } void View::process_sticky_events() { - if (sticky_events_ & SelectableItemHExtentsChanged) + if (sticky_events_ & TraceTreeItemHExtentsChanged) update_layout(); - if (sticky_events_ & SelectableItemVExtentsChanged) - restack_all_row_items(); + if (sticky_events_ & TraceTreeItemVExtentsChanged) { + restack_all_trace_tree_items(); + update_scroll(); + } // Clear the sticky events sticky_events_ = 0; @@ -741,9 +1308,12 @@ void View::process_sticky_events() void View::on_hover_point_changed() { - for (shared_ptr r : *this) + const vector> trace_tree_items( + list_by_type()); + for (shared_ptr r : trace_tree_items) r->hover_point_changed(); } -} // namespace view +} // namespace TraceView +} // namespace views } // namespace pv