X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=00a1c23968c0eb255b2f2b4a9957ce63242569e2;hp=58056e5c9a82279285a4357de17d91b9b0bf5329;hb=7ea2a4ff0765fdad34b84e4b4631d6f3f5588714;hpb=558ad6ceb934ab7406d286c1a4ae08da4aba1448 diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp index 58056e5c..00a1c239 100644 --- a/pv/views/trace/view.cpp +++ b/pv/views/trace/view.cpp @@ -129,6 +129,7 @@ View::View(Session &session, bool is_main_view, QWidget *parent) : segment_selectable_(false), scale_(1e-3), offset_(0), + ruler_offset_(0), updating_scroll_(false), settings_restored_(false), header_was_shrunk_(false), @@ -324,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()); @@ -345,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; @@ -353,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); @@ -406,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(); @@ -436,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_; @@ -467,6 +506,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) { @@ -497,7 +541,13 @@ void View::set_current_segment(uint32_t segment_id) for (shared_ptr dt : decode_traces_) dt->set_current_segment(current_segment_); + trigger_markers_.clear(); + for (util::Timestamp timestamp : session_.get_triggers(segment_id)) + trigger_markers_.push_back(make_shared(*this, timestamp)); + viewport_->update(); + + segment_changed(segment_id); } bool View::segment_is_selectable() const @@ -505,19 +555,57 @@ 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); - viewport_->update(); + 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::ShowLastSegmentOnly) + if ((mode == Trace::ShowAllSegments) || (mode == Trace::ShowAccumulatedIntensity)) segment_selectable_ = false; - segment_display_mode_changed(segment_selectable_); + viewport_->update(); + + segment_display_mode_changed((int)mode, segment_selectable_); } void View::zoom(double steps) @@ -744,8 +832,21 @@ 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 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)); } @@ -810,6 +911,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); @@ -1433,13 +1535,11 @@ void View::capture_state_updated(int state) void View::on_new_segment(int new_segment_id) { on_segment_changed(new_segment_id); - segment_changed(new_segment_id); } void View::on_segment_completed(int segment_id) { on_segment_changed(segment_id); - segment_changed(segment_id); } void View::on_segment_changed(int segment) @@ -1451,17 +1551,9 @@ void View::on_segment_changed(int segment) break; case Trace::ShowLastCompleteSegmentOnly: - { - // Only update if all segments are complete - bool all_complete = true; - - for (shared_ptr signal : signals_) - if (!signal->base()->segment_is_complete(segment)) - all_complete = false; - - if (all_complete) - set_current_segment(segment); - } + // Only update if all segments are complete + if (session_.all_segments_complete(segment)) + set_current_segment(segment); break; case Trace::ShowAllSegments: