X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=35b6807dfc75c11ba825831c1552ee17fe490f5a;hp=29c6fef4ee4f1ec3bb24742e46865ef8806eca1c;hb=451dc5f33fbc4f559881acdf338c476a976fcbf2;hpb=60c426a05dee6636b61c29a747eb50ec5b005209 diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp index 29c6fef4..35b6807d 100644 --- a/pv/views/trace/view.cpp +++ b/pv/views/trace/view.cpp @@ -79,6 +79,7 @@ using std::make_pair; using std::make_shared; using std::min; using std::pair; +using std::placeholders::_1; using std::set; using std::set_difference; using std::shared_ptr; @@ -125,8 +126,11 @@ 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), @@ -195,6 +199,9 @@ View::View(Session &session, bool is_main_view, QWidget *parent) : GlobalSettings settings; coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool(); + GlobalSettings::register_change_handler(GlobalSettings::Key_View_TriggerIsZeroTime, + bind(&View::on_settingViewTriggerIsZeroTime_changed, this, _1)); + connect(scrollarea_->horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(h_scroll_value_changed(int))); connect(scrollarea_->verticalScrollBar(), SIGNAL(valueChanged(int)), @@ -227,6 +234,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() @@ -255,6 +265,9 @@ 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())); } @@ -271,6 +284,9 @@ void View::add_decode_signal(shared_ptr signal) 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())); } @@ -313,11 +329,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()); @@ -334,6 +359,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; @@ -342,12 +378,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); @@ -395,17 +436,41 @@ void View::set_scale(double scale) } } +void View::set_offset(const pv::util::Timestamp& offset, bool force_update) +{ + if ((offset_ != offset) || force_update) { + offset_ = offset; + ruler_offset_ = offset_ + ruler_shift_; + offset_changed(); + } +} + const Timestamp& View::offset() const { return offset_; } -void View::set_offset(const pv::util::Timestamp& offset) +const Timestamp& View::ruler_offset() const { - if (offset_ != offset) { - offset_ = offset; - offset_changed(); - } + return ruler_offset_; +} + +void View::set_zero_position(pv::util::Timestamp& position) +{ + ruler_shift_ = -position; + + // Force an immediate update of the offsets + set_offset(offset_, true); + ruler_->update(); +} + +void View::reset_zero_position() +{ + ruler_shift_ = 0; + + // Force an immediate update of the offsets + set_offset(offset_, true); + ruler_->update(); } int View::owner_visual_v_offset() const @@ -425,6 +490,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_; @@ -456,6 +526,11 @@ const pv::util::Timestamp& View::tick_period() const return tick_period_; } +unsigned int View::minor_tick_count() const +{ + return minor_tick_count_; +} + void View::set_tick_period(const pv::util::Timestamp& tick_period) { if (tick_period_ != tick_period) { @@ -477,6 +552,91 @@ 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_); + + vector triggers = session_.get_triggers(current_segment_); + + trigger_markers_.clear(); + for (util::Timestamp timestamp : triggers) + trigger_markers_.push_back(make_shared(*this, timestamp)); + + // When enabled, the first trigger for this segment is used as the zero position + GlobalSettings settings; + bool trigger_is_zero_time = settings.value(GlobalSettings::Key_View_TriggerIsZeroTime).toBool(); + + if (trigger_is_zero_time && (triggers.size() > 0)) + set_zero_position(triggers.front()); + + 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) +{ + trigger_markers_.clear(); + + 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); @@ -701,8 +861,22 @@ void View::restack_all_trace_tree_items() i->animate_to_layout_v_offset(); } -void View::trigger_event(util::Timestamp location) +void View::trigger_event(int segment_id, util::Timestamp location) { + // TODO This doesn't work if we're showing multiple segments at once + if ((uint32_t)segment_id != current_segment_) + return; + + // Set zero location if the Key_View_TriggerIsZeroTime setting is set and + // if this is the first trigger for this segment. + GlobalSettings settings; + bool trigger_is_zero_time = settings.value(GlobalSettings::Key_View_TriggerIsZeroTime).toBool(); + + size_t trigger_count = session_.get_triggers(current_segment_).size(); + + if (trigger_is_zero_time && trigger_count == 1) + set_zero_position(location); + trigger_markers_.push_back(make_shared(*this, location)); } @@ -767,6 +941,7 @@ void View::calculate_tick_spacing() (ScaleUnits[unit++] + tp_margin); } while (tp_with_margin < min_period && unit < countof(ScaleUnits)); + minor_tick_count_ = (unit == 2) ? (4) : (5); tick_period = order_decimal * ScaleUnits[unit - 1]; tick_prefix = static_cast( (order - pv::util::exponent(pv::util::SIPrefix::yocto)) / 3); @@ -1353,6 +1528,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) { @@ -1383,14 +1562,46 @@ 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) { - current_segment_ = segment - 1; + switch (segment_display_mode_) { + case Trace::ShowLastSegmentOnly: + case Trace::ShowSingleSegmentOnly: + set_current_segment(segment); + break; - for (shared_ptr signal : signals_) - signal->set_current_segment(current_segment_); + case Trace::ShowLastCompleteSegmentOnly: + // Only update if all segments are complete + if (session_.all_segments_complete(segment)) + set_current_segment(segment); + break; - viewport_->update(); + case Trace::ShowAllSegments: + case Trace::ShowAccumulatedIntensity: + default: + break; + } +} + +void View::on_settingViewTriggerIsZeroTime_changed(const QVariant new_value) +{ + if (new_value.toBool()) { + // The first trigger for this segment is used as the zero position + vector triggers = session_.get_triggers(current_segment_); + if (triggers.size() > 0) + set_zero_position(triggers.front()); + } else + reset_zero_position(); } void View::perform_delayed_view_update()