X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=292933e7eefa70abb5753a0a3e66f9614292415a;hp=0b5eef74e27a21b2164d980ee8a18f19644bb02d;hb=ffc00fdd5946593ad2a587078fd4ee9ba0a507ec;hpb=e91fb166608133382baa1a90cc022bfa47d649de diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp index 0b5eef74..292933e7 100644 --- a/pv/views/trace/view.cpp +++ b/pv/views/trace/view.cpp @@ -73,7 +73,6 @@ using pv::util::Timestamp; using std::back_inserter; using std::copy_if; using std::count_if; -using std::dynamic_pointer_cast; using std::inserter; using std::max; using std::make_pair; @@ -126,10 +125,14 @@ bool CustomScrollArea::viewportEvent(QEvent *event) View::View(Session &session, bool is_main_view, QWidget *parent) : ViewBase(session, is_main_view, parent), splitter_(new QSplitter()), + segment_display_mode_(Trace::ShowLastSegmentOnly), + segment_selectable_(false), scale_(1e-3), offset_(0), + ruler_offset_(0), updating_scroll_(false), settings_restored_(false), + header_was_shrunk_(false), sticky_scrolling_(false), // Default setting is set in MainWindow::setup_ui() always_zoom_to_fit_(false), tick_period_(0), @@ -213,9 +216,6 @@ View::View(Session &session, bool is_main_view, QWidget *parent) : connect(splitter_, SIGNAL(splitterMoved(int, int)), this, SLOT(on_splitter_moved())); - connect(this, SIGNAL(hover_point_changed()), - this, SLOT(on_hover_point_changed())); - connect(&lazy_event_handler_, SIGNAL(timeout()), this, SLOT(process_sticky_events())); lazy_event_handler_.setSingleShot(true); @@ -230,6 +230,9 @@ View::View(Session &session, bool is_main_view, QWidget *parent) : // Update the zoom state calculate_tick_spacing(); + + // Make sure the standard bar's segment selector is in sync + set_segment_display_mode(segment_display_mode_); } Session& View::session() @@ -257,6 +260,12 @@ void View::add_signal(const shared_ptr signal) { ViewBase::add_signalbase(signal->base()); signals_.insert(signal); + + signal->set_segment_display_mode(segment_display_mode_); + signal->set_current_segment(current_segment_); + + connect(signal->base().get(), SIGNAL(name_changed(const QString&)), + this, SLOT(on_signal_name_changed())); } #ifdef ENABLE_DECODE @@ -270,6 +279,12 @@ void View::add_decode_signal(shared_ptr signal) shared_ptr d( new DecodeTrace(session_, signal, decode_traces_.size())); decode_traces_.push_back(d); + + d->set_segment_display_mode(segment_display_mode_); + d->set_current_segment(current_segment_); + + connect(signal.get(), SIGNAL(name_changed(const QString&)), + this, SLOT(on_signal_name_changed())); } void View::remove_decode_signal(shared_ptr signal) @@ -310,11 +325,20 @@ void View::save_settings(QSettings &settings) const scrollarea_->verticalScrollBar()->sliderPosition()); settings.setValue("splitter_state", splitter_->saveState()); + settings.setValue("segment_display_mode", segment_display_mode_); - stringstream ss; - boost::archive::text_oarchive oa(ss); - oa << boost::serialization::make_nvp("offset", offset_); - settings.setValue("offset", QString::fromStdString(ss.str())); + { + stringstream ss; + boost::archive::text_oarchive oa(ss); + oa << boost::serialization::make_nvp("ruler_shift", ruler_shift_); + settings.setValue("ruler_shift", QString::fromStdString(ss.str())); + } + { + 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()); @@ -331,6 +355,17 @@ void View::restore_settings(QSettings &settings) if (settings.contains("scale")) set_scale(settings.value("scale").toDouble()); + if (settings.contains("ruler_shift")) { + util::Timestamp shift; + stringstream ss; + ss << settings.value("ruler_shift").toString().toStdString(); + + boost::archive::text_iarchive ia(ss); + ia >> boost::serialization::make_nvp("ruler_shift", shift); + + ruler_shift_ = shift; + } + if (settings.contains("offset")) { util::Timestamp offset; stringstream ss; @@ -339,12 +374,17 @@ void View::restore_settings(QSettings &settings) boost::archive::text_iarchive ia(ss); ia >> boost::serialization::make_nvp("offset", offset); + // This also updates ruler_offset_ set_offset(offset); } if (settings.contains("splitter_state")) splitter_->restoreState(settings.value("splitter_state").toByteArray()); + if (settings.contains("segment_display_mode")) + set_segment_display_mode( + (Trace::SegmentDisplayMode)(settings.value("segment_display_mode").toInt())); + for (shared_ptr signal : signals_) { settings.beginGroup(signal->base()->internal_name()); signal->restore_settings(settings); @@ -360,6 +400,9 @@ void View::restore_settings(QSettings &settings) settings_restored_ = true; suppress_zoom_to_fit_after_acq_ = true; + + // Update the ruler so that it uses the new scale + calculate_tick_spacing(); } vector< shared_ptr > View::time_items() const @@ -389,19 +432,27 @@ void View::set_scale(double scale) } } -const Timestamp& View::offset() const -{ - return offset_; -} - void View::set_offset(const pv::util::Timestamp& offset) { if (offset_ != offset) { offset_ = offset; + ruler_offset_ = offset_ + ruler_shift_; offset_changed(); } } +// Returns the internal version of the time offset +const Timestamp& View::offset() const +{ + return offset_; +} + +// Returns the ruler version of the time offset +const Timestamp& View::ruler_offset() const +{ + return ruler_offset_; +} + int View::owner_visual_v_offset() const { return -scrollarea_->verticalScrollBar()->sliderPosition(); @@ -419,6 +470,11 @@ unsigned int View::depth() const return 0; } +uint32_t View::current_segment() const +{ + return current_segment_; +} + pv::util::SIPrefix View::tick_prefix() const { return tick_prefix_; @@ -471,6 +527,76 @@ void View::set_time_unit(pv::util::TimeUnit time_unit) } } +void View::set_current_segment(uint32_t segment_id) +{ + current_segment_ = segment_id; + + for (shared_ptr signal : signals_) + signal->set_current_segment(current_segment_); + for (shared_ptr dt : decode_traces_) + dt->set_current_segment(current_segment_); + + viewport_->update(); + + segment_changed(segment_id); +} + +bool View::segment_is_selectable() const +{ + return segment_selectable_; +} + +Trace::SegmentDisplayMode View::segment_display_mode() const +{ + return segment_display_mode_; +} + +void View::set_segment_display_mode(Trace::SegmentDisplayMode mode) +{ + segment_display_mode_ = mode; + + for (shared_ptr signal : signals_) + signal->set_segment_display_mode(mode); + + uint32_t last_segment = session_.get_segment_count() - 1; + + switch (mode) { + case Trace::ShowLastSegmentOnly: + if (current_segment_ != last_segment) + set_current_segment(last_segment); + break; + + case Trace::ShowLastCompleteSegmentOnly: + // Do nothing if we only have one segment so far + if (last_segment > 0) { + // If the last segment isn't complete, the previous one must be + uint32_t segment_id = + (session_.all_segments_complete(last_segment)) ? + last_segment : last_segment - 1; + + if (current_segment_ != segment_id) + set_current_segment(segment_id); + } + break; + + case Trace::ShowSingleSegmentOnly: + case Trace::ShowAllSegments: + case Trace::ShowAccumulatedIntensity: + default: + // Current segment remains as-is + break; + } + + segment_selectable_ = true; + + if ((mode == Trace::ShowAllSegments) || (mode == Trace::ShowAccumulatedIntensity)) + segment_selectable_ = false; + + viewport_->update(); + + segment_display_mode_changed((int)mode, segment_selectable_); +} + void View::zoom(double steps) { zoom(steps, viewport_->width() / 2); @@ -697,6 +823,15 @@ void View::restack_all_trace_tree_items() void View::trigger_event(util::Timestamp location) { + // Set up ruler_shift if the Key_View_TriggerIsZeroTime option is set. + GlobalSettings settings; + bool trigger_is_zero_time = settings.value(GlobalSettings::Key_View_TriggerIsZeroTime).toBool(); + + ruler_shift_ = (trigger_is_zero_time) ? (-location) : (0); + // Force an immediate update of both offsets + offset_ -= 0.001; + set_offset(offset_ + 0.001); + trigger_markers_.push_back(make_shared(*this, location)); } @@ -881,7 +1016,7 @@ void View::set_scroll_default() set_v_offset(extents.first); } -bool View::header_was_shrunk() const +void View::determine_if_header_was_shrunk() { const int header_pane_width = splitter_->sizes().front(); const int header_width = header_->extended_size_hint().width(); @@ -889,11 +1024,19 @@ bool View::header_was_shrunk() const // 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)); + header_was_shrunk_ = (header_pane_width < (header_width - 10)); } -void View::expand_header_to_fit() +void View::resize_header_to_fit() { + // 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. + int splitter_area_width = 0; for (int w : splitter_->sizes()) splitter_area_width += w; @@ -1006,11 +1149,11 @@ bool View::eventFilter(QObject *object, QEvent *event) else hover_point_ = QPoint(-1, -1); - hover_point_changed(); + update_hover_point(); } else if (type == QEvent::Leave) { hover_point_ = QPoint(-1, -1); - hover_point_changed(); + update_hover_point(); } else if (type == QEvent::Show) { // This is somewhat of a hack, unfortunately. We cannot use @@ -1022,8 +1165,10 @@ bool View::eventFilter(QObject *object, QEvent *event) // resized to their final sizes. update_layout(); - if (!settings_restored_) - expand_header_to_fit(); + if (settings_restored_) + determine_if_header_was_shrunk(); + else + resize_header_to_fit(); if (scroll_needs_defaults_) { set_scroll_default(); @@ -1048,6 +1193,16 @@ void View::resizeEvent(QResizeEvent* event) update_layout(); } +void View::update_hover_point() +{ + const vector> trace_tree_items( + list_by_type()); + for (shared_ptr r : trace_tree_items) + r->hover_point_changed(hover_point_); + + hover_point_changed(hover_point_); +} + void View::row_item_appearance_changed(bool label, bool content) { if (label) @@ -1078,17 +1233,19 @@ void View::extents_changed(bool horz, bool vert) lazy_event_handler_.start(); } +void View::on_signal_name_changed() +{ + if (!header_was_shrunk_) + resize_header_to_fit(); +} + 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(); + // The header can only shrink when the splitter is moved manually + determine_if_header_was_shrunk(); + + if (!header_was_shrunk_) + resize_header_to_fit(); } void View::h_scroll_value_changed(int value) @@ -1129,6 +1286,7 @@ void View::signals_changed() vector< shared_ptr > channels; shared_ptr sr_dev; + bool signals_added_or_removed = false; // 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 @@ -1260,6 +1418,7 @@ void View::signals_changed() TraceTreeItemOwner *const owner = trace->owner(); assert(owner); owner->remove_child_item(trace); + signals_added_or_removed = true; } // Remove any empty trace groups @@ -1284,13 +1443,12 @@ void View::signals_changed() if (item->enabled()) offset += extents.second; + signals_added_or_removed = true; } - 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(); + if (signals_added_or_removed && !header_was_shrunk_) + resize_header_to_fit(); update_layout(); @@ -1324,6 +1482,10 @@ void View::capture_state_updated(int state) // Enable sticky scrolling if the setting is enabled sticky_scrolling_ = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool(); + + // Reset all traces to segment 0 + current_segment_ = 0; + set_current_segment(current_segment_); } if (state == Session::Stopped) { @@ -1354,6 +1516,37 @@ void View::capture_state_updated(int state) } } +void View::on_new_segment(int new_segment_id) +{ + on_segment_changed(new_segment_id); +} + +void View::on_segment_completed(int segment_id) +{ + on_segment_changed(segment_id); +} + +void View::on_segment_changed(int segment) +{ + switch (segment_display_mode_) { + case Trace::ShowLastSegmentOnly: + case Trace::ShowSingleSegmentOnly: + set_current_segment(segment); + break; + + case Trace::ShowLastCompleteSegmentOnly: + // Only update if all segments are complete + if (session_.all_segments_complete(segment)) + set_current_segment(segment); + break; + + case Trace::ShowAllSegments: + case Trace::ShowAccumulatedIntensity: + default: + break; + } +} + void View::perform_delayed_view_update() { if (always_zoom_to_fit_) { @@ -1389,14 +1582,6 @@ void View::process_sticky_events() sticky_events_ = 0; } -void View::on_hover_point_changed() -{ - const vector> trace_tree_items( - list_by_type()); - for (shared_ptr r : trace_tree_items) - r->hover_point_changed(); -} - } // namespace trace } // namespace views } // namespace pv