X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=61b03b2e16b8495b8d8c6e8f0093bb4b7830a978;hp=37cc94301ad24cd1c819108eb7ba66ab3459cf6d;hb=76750c410e299f9ba9f0f9d1e220713861cc67b6;hpb=adb3831eeae71b69bb035c9af713ea1f8623407f diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 37cc9430..61b03b2e 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 @@ -28,76 +27,105 @@ #include #include #include +#include #include -#include #include +#include +#include +#include + #include #include #include #include #include +#include #include -#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/devices/device.hpp" #include "pv/data/logic.hpp" #include "pv/data/logicsegment.hpp" +#include "pv/devices/device.hpp" +#include "pv/globalsettings.hpp" +#include "pv/session.hpp" #include "pv/util.hpp" -using boost::shared_lock; -using boost::shared_mutex; +#ifdef ENABLE_DECODE +#include "decodetrace.hpp" +#endif using pv::data::SignalData; using pv::data::Segment; -using pv::util::format_time; using pv::util::TimeUnit; using pv::util::Timestamp; -using std::deque; +using std::back_inserter; +using std::copy_if; +using std::count_if; 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::stringstream; using std::unordered_map; using std::unordered_set; using std::vector; -using std::weak_ptr; namespace pv { -namespace view { +namespace views { +namespace TraceView { 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}; -View::View(Session &session, QWidget *parent) : - QAbstractScrollArea(parent), - session_(session), - viewport_(new Viewport(*this)), - ruler_(new Ruler(*this)), - header_(new Header(*this)), + +CustomScrollArea::CustomScrollArea(QWidget *parent) : + QAbstractScrollArea(parent) +{ +} + +bool CustomScrollArea::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, bool is_main_view, QWidget *parent) : + ViewBase(session, is_main_view, parent), + splitter_(new QSplitter()), scale_(1e-3), offset_(0), updating_scroll_(false), @@ -110,22 +138,62 @@ View::View(Session &session, QWidget *parent) : show_cursors_(false), cursors_(new CursorPair(*this)), next_flag_text_('A'), - hover_point_(-1, -1) -{ - connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), + trigger_markers_(), + hover_point_(-1, -1), + scroll_needs_defaults_(false), + saved_v_offset_(0) +{ + QVBoxLayout *root_layout = new QVBoxLayout(this); + root_layout->setContentsMargins(0, 0, 0, 0); + root_layout->addWidget(splitter_); + + viewport_ = new Viewport(*this); + scrollarea_ = new CustomScrollArea(splitter_); + scrollarea_->setViewport(viewport_); + scrollarea_->setFrameShape(QFrame::NoFrame); + + ruler_ = new Ruler(*this); + + header_ = new Header(*this); + header_->setMinimumWidth(10); // So that the arrow tips show at least + + // We put the header into a simple layout so that we can add the top margin, + // allowing us to make it line up with the bottom of the ruler + QWidget *header_container = new QWidget(); + header_container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + QVBoxLayout *header_layout = new QVBoxLayout(header_container); + header_layout->setContentsMargins(0, ruler_->sizeHint().height(), 0, 0); + header_layout->addWidget(header_); + + // To let the ruler and scrollarea be on the same split pane, we need a layout + QWidget *trace_container = new QWidget(); + trace_container->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + QVBoxLayout *trace_layout = new QVBoxLayout(trace_container); + trace_layout->setSpacing(0); // We don't want space between the ruler and scrollarea + trace_layout->setContentsMargins(0, 0, 0, 0); + trace_layout->addWidget(ruler_); + trace_layout->addWidget(scrollarea_); + + splitter_->addWidget(header_container); + splitter_->addWidget(trace_container); + splitter_->setHandleWidth(1); // Don't show a visible rubber band + splitter_->setCollapsible(0, false); // Prevent the header from collapsing + splitter_->setCollapsible(1, false); // Prevent the traces from collapsing + splitter_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + + viewport_->installEventFilter(this); + ruler_->installEventFilter(this); + header_->installEventFilter(this); + + // Set up settings and event handlers + 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)), + connect(scrollarea_->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(v_scroll_value_changed())); - connect(&session_, SIGNAL(signals_changed()), - this, SLOT(signals_changed())); - connect(&session_, SIGNAL(capture_state_changed(int)), - this, SLOT(capture_state_updated(int))); - connect(&session_, SIGNAL(data_received()), - this, SLOT(data_updated())); - connect(&session_, SIGNAL(frame_ended()), - this, SLOT(data_updated())); - connect(header_, SIGNAL(selection_changed()), ruler_, SLOT(clear_selection())); connect(ruler_, SIGNAL(selection_changed()), @@ -136,6 +204,9 @@ View::View(Session &session, QWidget *parent) : connect(ruler_, SIGNAL(selection_changed()), this, SIGNAL(selection_changed())); + connect(splitter_, SIGNAL(splitterMoved(int, int)), + this, SLOT(on_splitter_moved())); + connect(this, SIGNAL(hover_point_changed()), this, SLOT(on_hover_point_changed())); @@ -143,17 +214,6 @@ View::View(Session &session, QWidget *parent) : this, SLOT(process_sticky_events())); lazy_event_handler_.setSingleShot(true); - connect(&delayed_view_updater_, SIGNAL(timeout()), - this, SLOT(perform_delayed_view_update())); - delayed_view_updater_.setSingleShot(true); - delayed_view_updater_.setInterval(1000 / MaxViewAutoUpdateRate); - - setViewport(viewport_); - - viewport_->installEventFilter(this); - ruler_->installEventFilter(this); - header_->installEventFilter(this); - // Trigger the initial event manually. The default device has signals // which were created before this object came into being signals_changed(); @@ -176,6 +236,47 @@ const Session& View::session() const return session_; } +unordered_set< shared_ptr > View::signals() const +{ + return signals_; +} + +void View::clear_signals() +{ + ViewBase::clear_signalbases(); + signals_.clear(); +} + +void View::add_signal(const shared_ptr signal) +{ + ViewBase::add_signalbase(signal->base()); + 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; @@ -196,6 +297,62 @@ 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()); + + settings.setValue("splitter_state", splitter_->saveState()); + + 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; + stringstream ss; + ss << settings.value("offset").toString().toStdString(); + + boost::archive::text_iarchive ia(ss); + ia >> boost::serialization::make_nvp("offset", offset); + + set_offset(offset); + } + + if (settings.contains("splitter_state")) + splitter_->restoreState(settings.value("splitter_state").toByteArray()); + + 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 eventFilter() for additional information + } +} + vector< shared_ptr > View::time_items() const { const vector> f(flags()); @@ -203,6 +360,10 @@ vector< shared_ptr > View::time_items() const 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; } @@ -215,7 +376,7 @@ void View::set_scale(double scale) { if (scale_ != scale) { scale_ = scale; - Q_EMIT scale_changed(); + scale_changed(); } } @@ -228,18 +389,18 @@ void View::set_offset(const pv::util::Timestamp& offset) { if (offset_ != offset) { offset_ = offset; - Q_EMIT offset_changed(); + offset_changed(); } } int View::owner_visual_v_offset() const { - return -verticalScrollBar()->sliderPosition(); + return -scrollarea_->verticalScrollBar()->sliderPosition(); } void View::set_v_offset(int offset) { - verticalScrollBar()->setSliderPosition(offset); + scrollarea_->verticalScrollBar()->setSliderPosition(offset); header_->update(); viewport_->update(); } @@ -258,7 +419,7 @@ void View::set_tick_prefix(pv::util::SIPrefix tick_prefix) { if (tick_prefix_ != tick_prefix) { tick_prefix_ = tick_prefix; - Q_EMIT tick_prefix_changed(); + tick_prefix_changed(); } } @@ -271,7 +432,7 @@ void View::set_tick_precision(unsigned tick_precision) { if (tick_precision_ != tick_precision) { tick_precision_ = tick_precision; - Q_EMIT tick_precision_changed(); + tick_precision_changed(); } } @@ -284,7 +445,7 @@ 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(); + tick_period_changed(); } } @@ -297,7 +458,7 @@ void View::set_time_unit(pv::util::TimeUnit time_unit) { if (time_unit_ != time_unit) { time_unit_ = time_unit; - Q_EMIT time_unit_changed(); + time_unit_changed(); } } @@ -308,7 +469,7 @@ void View::zoom(double steps) void View::zoom(double steps, int offset) { - set_zoom(scale_ * pow(3.0/2.0, -steps), offset); + set_zoom(scale_ * pow(3.0 / 2.0, -steps), offset); } void View::zoom_fit(bool gui_state) @@ -345,24 +506,12 @@ void View::zoom_one_to_one() if (visible_data.empty()) return; - double samplerate = 0.0; - for (const shared_ptr d : visible_data) { - assert(d); - const vector< shared_ptr > segments = - d->segments(); - for (const shared_ptr &s : segments) - samplerate = max(samplerate, s->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, const Timestamp& offset) @@ -395,12 +544,9 @@ void View::set_scale_offset(double scale, const Timestamp& offset) set< shared_ptr > View::get_visible_data() const { - shared_lock lock(session().signals_mutex()); - const unordered_set< 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()); @@ -411,10 +557,8 @@ pair View::get_time_extents() const { boost::optional left_time, right_time; const set< shared_ptr > visible_data = get_visible_data(); - for (const shared_ptr d : visible_data) - { - const vector< shared_ptr > segments = - d->segments(); + 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; @@ -436,9 +580,29 @@ pair View::get_time_extents() const return make_pair(*left_time, *right_time); } -void View::enable_sticky_scrolling(bool state) +void View::enable_show_sampling_points(bool state) { - sticky_scrolling_ = state; + (void)state; + + viewport_->update(); +} + +void View::enable_show_analog_minor_grid(bool state) +{ + (void)state; + + viewport_->update(); +} + +void View::enable_coloured_bg(bool state) +{ + coloured_bg_ = state; + viewport_->update(); +} + +bool View::coloured_bg() const +{ + return coloured_bg_; } bool View::cursors_shown() const @@ -462,29 +626,31 @@ void View::centre_cursors() viewport_->update(); } -std::shared_ptr View::cursors() const +shared_ptr View::cursors() const { return cursors_; } void View::add_flag(const Timestamp& time) { - flags_.push_back(shared_ptr(new Flag(*this, time, - QString("%1").arg(next_flag_text_)))); + 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); } -void View::remove_flag(std::shared_ptr flag) +void View::remove_flag(shared_ptr flag) { flags_.remove(flag); time_item_appearance_changed(true, true); } -vector< std::shared_ptr > View::flags() const +vector< shared_ptr > View::flags() const { - vector< std::shared_ptr > flags(flags_.begin(), flags_.end()); + vector< 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(); @@ -498,20 +664,17 @@ const QPoint& View::hover_point() const return hover_point_; } -void View::update_viewport() -{ - assert(viewport_); - viewport_->update(); - header_->update(); -} - -void View::restack_all_row_items() +void View::restack_all_trace_tree_items() { // Make a list of owners that is sorted from deepest first - const auto owners = list_row_item_owners(); - vector< RowItemOwner* > sorted_owners(owners.begin(), owners.end()); + 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 @@ -519,8 +682,13 @@ void View::restack_all_row_items() o->restack_items(); // 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::trigger_event(util::Timestamp location) +{ + trigger_markers_.push_back(make_shared(*this, location)); } void View::get_scroll_layout(double &length, Timestamp &offset) const @@ -590,12 +758,12 @@ void View::calculate_tick_spacing() // 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); + tick_precision = max(ceil(log10(1 / tick_period)).convert_to(), 0); tick_period_width = (tick_period / scale_).convert_to(); - const QString label_text = - format_time(max_time, tick_prefix, time_unit_, tick_precision); + 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() + @@ -609,9 +777,35 @@ void View::calculate_tick_spacing() set_tick_precision(tick_precision); } +void View::adjust_top_margin() +{ + assert(viewport_); + + const QSize areaSize = viewport_->size(); + + const pair extents = v_extents(); + const int top_margin = owner_visual_v_offset() + extents.first; + const int trace_bottom = owner_visual_v_offset() + extents.first + extents.second; + + // Do we have empty space at the top while the last trace goes out of screen? + if ((top_margin > 0) && (trace_bottom > areaSize.height())) { + const int trace_height = extents.second - extents.first; + + // Center everything vertically if there is enough space + if (areaSize.height() >= trace_height) + set_v_offset(extents.first - + ((areaSize.height() - trace_height) / 2)); + else + // Remove the top margin to make as many traces fit on screen as possible + set_v_offset(extents.first); + } +} + void View::update_scroll() { assert(viewport_); + QScrollBar *hscrollbar = scrollarea_->horizontalScrollBar(); + QScrollBar *vscrollbar = scrollarea_->verticalScrollBar(); const QSize areaSize = viewport_->size(); @@ -623,84 +817,118 @@ void View::update_scroll() 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.convert_to()); + hscrollbar->setRange(0, length); + hscrollbar->setSliderPosition(offset.convert_to()); } else { - horizontalScrollBar()->setRange(0, MaxScrollValue); - horizontalScrollBar()->setSliderPosition( + hscrollbar->setRange(0, MaxScrollValue); + hscrollbar->setSliderPosition( (offset_ * MaxScrollValue / (scale_ * length)).convert_to()); } updating_scroll_ = false; // Set the vertical scrollbar - verticalScrollBar()->setPageStep(areaSize.height()); - verticalScrollBar()->setSingleStep(areaSize.height() / 8); + vscrollbar->setPageStep(areaSize.height()); + vscrollbar->setSingleStep(areaSize.height() / 8); const pair extents = v_extents(); - verticalScrollBar()->setRange(extents.first - (areaSize.height() / 2), - extents.second - (areaSize.height() / 2)); + + // 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::update_layout() +void View::reset_scroll() { - setViewportMargins( - header_->sizeHint().width() - pv::view::Header::BaselineOffset, - ruler_->sizeHint().height(), 0, 0); - ruler_->setGeometry(viewport_->x(), 0, - viewport_->width(), ruler_->extended_size_hint().height()); - header_->setGeometry(0, viewport_->y(), - header_->extended_size_hint().width(), viewport_->height()); - update_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); } -void View::paint_label(QPainter &p, const QRect &rect, bool hover) +bool View::header_was_shrunk() const { - (void)p; - (void)rect; - (void)hover; + const int header_pane_width = splitter_->sizes().front(); + const int header_width = header_->extended_size_hint().width(); + + // Allow for a slight margin of error so that we also accept + // slight differences when e.g. a label name change increased + // the overall width + return (header_pane_width < (header_width - 10)); } -QRectF View::label_rect(const QRectF &rect) +void View::expand_header_to_fit() { - (void)rect; - return QRectF(); + int splitter_area_width = 0; + for (int w : splitter_->sizes()) + splitter_area_width += w; + + // Make sure the header has enough horizontal space to show all labels fully + QList pane_sizes; + pane_sizes.push_back(header_->extended_size_hint().width()); + pane_sizes.push_back(splitter_area_width - header_->extended_size_hint().width()); + splitter_->setSizes(pane_sizes); +} + +void View::update_layout() +{ + update_scroll(); } -RowItemOwner* View::find_prevalent_trace_group( +TraceTreeItemOwner* View::find_prevalent_trace_group( const shared_ptr &group, - const unordered_map, shared_ptr > + const unordered_map, shared_ptr > &signal_map) { assert(group); - unordered_set owners; - vector owner_list; + unordered_set owners; + vector owner_list; // Make a set and a list of all the owners for (const auto &channel : group->channels()) { - const auto iter = signal_map.find(channel); - if (iter == signal_map.end()) - continue; - - RowItemOwner *const o = (*iter).second->owner(); - owner_list.push_back(o); - owners.insert(o); + for (auto entry : signal_map) { + if (entry.first->channel() == channel) { + TraceTreeItemOwner *const o = (entry.second)->owner(); + owner_list.push_back(o); + owners.insert(o); + } + } } // Iterate through the list of owners, and find the most prevalent size_t max_prevalence = 0; - RowItemOwner *prevalent_owner = nullptr; - for (RowItemOwner *owner : owners) { - const size_t prevalence = std::count_if( + TraceTreeItemOwner *prevalent_owner = nullptr; + for (TraceTreeItemOwner *owner : owners) { + const size_t prevalence = count_if( owner_list.begin(), owner_list.end(), - [&](RowItemOwner *o) { return o == owner; }); + [&](TraceTreeItemOwner *o) { return o == owner; }); if (prevalence > max_prevalence) { max_prevalence = prevalence; prevalent_owner = owner; @@ -712,25 +940,24 @@ RowItemOwner* View::find_prevalent_trace_group( vector< shared_ptr > View::extract_new_traces_for_channels( const vector< shared_ptr > &channels, - const unordered_map, shared_ptr > + const unordered_map, shared_ptr > &signal_map, set< shared_ptr > &add_list) { vector< shared_ptr > filtered_traces; - for (const auto &channel : channels) - { - const auto map_iter = signal_map.find(channel); - if (map_iter == signal_map.end()) - continue; - - shared_ptr trace = (*map_iter).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); + 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 filtered_traces; @@ -740,11 +967,8 @@ 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) { - shared_lock lock(session().signals_mutex()); - const unordered_set< shared_ptr > &sigs(session().signals()); - // Check all signals but... - for (const shared_ptr signal : sigs) { + for (const shared_ptr signal : signals_) { const shared_ptr data = signal->data(); // ...only check first segment of each @@ -778,32 +1002,37 @@ bool View::eventFilter(QObject *object, QEvent *event) } else if (type == QEvent::Leave) { hover_point_ = QPoint(-1, -1); hover_point_changed(); + } else if (type == QEvent::Show) { + + // 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 shown, which happens after all widgets were + // resized to their final sizes. + update_layout(); + + if (scroll_needs_defaults_) { + set_scroll_default(); + scroll_needs_defaults_ = false; + } + + if (saved_v_offset_) { + set_v_offset(saved_v_offset_); + saved_v_offset_ = 0; + } } return QObject::eventFilter(object, event); } -bool View::viewportEvent(QEvent *e) +void View::resizeEvent(QResizeEvent* event) { - 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; + // Only adjust the top margin if we shrunk vertically + if (event->size().height() < event->oldSize().height()) + adjust_top_margin(); - default: - return QAbstractScrollArea::viewportEvent(e); - } -} - -void View::resizeEvent(QResizeEvent*) -{ update_layout(); } @@ -817,8 +1046,13 @@ void View::row_item_appearance_changed(bool label, bool content) void View::time_item_appearance_changed(bool label, bool content) { - if (label) + if (label) { ruler_->update(); + + // Make sure the header pane width is updated, too + update_layout(); + } + if (content) viewport_->update(); } @@ -826,11 +1060,25 @@ void View::time_item_appearance_changed(bool label, bool content) void View::extents_changed(bool horz, bool vert) { sticky_events_ |= - (horz ? RowItemHExtentsChanged : 0) | - (vert ? RowItemVExtentsChanged : 0); + (horz ? TraceTreeItemHExtentsChanged : 0) | + (vert ? TraceTreeItemVExtentsChanged : 0); + lazy_event_handler_.start(); } +void View::on_splitter_moved() +{ + // Setting the maximum width of the header widget doesn't work as + // expected because the splitter would allow the user to make the + // pane wider than that, creating empty space as a result. + // To make this work, we stricly enforce the maximum width by + // expanding the header unless the user shrunk it on purpose. + // As we're then setting the width of the header pane, we set the + // splitter to the maximum allowed position. + if (!header_was_shrunk()) + expand_header_to_fit(); +} + void View::h_scroll_value_changed(int value) { if (updating_scroll_) @@ -843,7 +1091,7 @@ void View::h_scroll_value_changed(int value) sticky_scrolling_changed(false); } - const int range = horizontalScrollBar()->maximum(); + const int range = scrollarea_->horizontalScrollBar()->maximum(); if (range < MaxScrollValue) set_offset(scale_ * value); else { @@ -865,28 +1113,38 @@ void View::v_scroll_value_changed() void View::signals_changed() { - vector< shared_ptr > new_top_level_items; + using sigrok::Channel; - const auto device = session_.device(); - if (!device) - return; + vector< shared_ptr > channels; + shared_ptr sr_dev; + + // 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()); + + if (!session_.device()) { + reset_scroll(); + signals_.clear(); + } else { + sr_dev = session_.device()->device(); + assert(sr_dev); + channels = sr_dev->channels(); + } - shared_ptr sr_dev = device->device(); - assert(sr_dev); + 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 set> prev_traces = list_by_type(); + 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 unordered_set< shared_ptr > &sigs(session_.signals()); - - set< shared_ptr > traces(sigs.begin(), sigs.end()); + set< shared_ptr > traces(signals_.begin(), signals_.end()); #ifdef ENABLE_DECODE - const vector< shared_ptr > decode_traces( - session().get_decode_signals()); - traces.insert(decode_traces.begin(), decode_traces.end()); + traces.insert(decode_traces_.begin(), decode_traces_.end()); #endif set< shared_ptr > add_traces; @@ -900,61 +1158,84 @@ void View::signals_changed() inserter(remove_traces, remove_traces.begin())); // Make a look-up table of sigrok Channels to pulseview Signals - unordered_map, shared_ptr > + unordered_map, shared_ptr > signal_map; - for (const shared_ptr &sig : sigs) - signal_map[sig->channel()] = sig; + for (const shared_ptr &sig : signals_) + signal_map[sig->base()] = sig; // Populate channel groups - 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 - RowItemOwner *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(); + 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); + } } - // 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; - } + // 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 (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); - // If this is a new group, enqueue it in the new top level - // items list - if (!new_traces_in_group.empty() && new_trace_group) - new_top_level_items.push_back(new_trace_group); + non_grouped_trace_group->restack_items(); + new_top_level_items.push_back(non_grouped_trace_group); } // Enqueue the remaining channels as free ungrouped traces const vector< shared_ptr > new_top_level_signals = - extract_new_traces_for_channels(sr_dev->channels(), - signal_map, add_traces); + 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()); @@ -964,36 +1245,71 @@ void View::signals_changed() // Remove any removed traces for (shared_ptr trace : remove_traces) { - RowItemOwner *const owner = trace->owner(); + TraceTreeItemOwner *const owner = trace->owner(); assert(owner); owner->remove_child_item(trace); } + // 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 present item - int offset = v_extents().second; + // 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; } + + if (!new_top_level_items.empty()) + // Expand the header pane because the header should become fully + // visible when new signals are added + expand_header_to_fit(); + update_layout(); header_->update(); viewport_->update(); + + if (reset_scrollbar) + set_scroll_default(); } void View::capture_state_updated(int state) { - if (state == Session::Running) + 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_); + } + + // Enable sticky scrolling if the setting is enabled + sticky_scrolling_ = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool(); + } + 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 @@ -1001,31 +1317,19 @@ void View::capture_state_updated(int state) // 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(false); + always_zoom_to_fit_changed(always_zoom_to_fit_); } } } -void View::data_updated() -{ - 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::perform_delayed_view_update() { - if (always_zoom_to_fit_) + if (always_zoom_to_fit_) { zoom_fit(true); - - if (sticky_scrolling_) { + } else if (sticky_scrolling_) { // Make right side of the view sticky double length = 0; Timestamp offset; @@ -1045,10 +1349,10 @@ void View::perform_delayed_view_update() void View::process_sticky_events() { - if (sticky_events_ & RowItemHExtentsChanged) + if (sticky_events_ & TraceTreeItemHExtentsChanged) update_layout(); - if (sticky_events_ & RowItemVExtentsChanged) { - restack_all_row_items(); + if (sticky_events_ & TraceTreeItemVExtentsChanged) { + restack_all_trace_tree_items(); update_scroll(); } @@ -1058,9 +1362,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