X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=f634b4ae532966be2c08ae793bdb88df0aa3bb88;hp=9cd90be83015bafd4f709dc9d7a376418d11e56c;hb=e4e5a958507a2c4e2643f21e3c735021da97e577;hpb=4a07615736968fc8d635c8d187b8a5d6b8a0e2eb diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp index 9cd90be8..f634b4ae 100644 --- a/pv/views/trace/view.cpp +++ b/pv/views/trace/view.cpp @@ -124,31 +124,11 @@ bool CustomScrollArea::viewportEvent(QEvent *event) View::View(Session &session, bool is_main_view, QWidget *parent) : ViewBase(session, is_main_view, parent), + + // Note: Place defaults in View::reset_view_state(), not here 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), - tick_prefix_(pv::util::SIPrefix::yocto), - tick_precision_(0), - time_unit_(util::TimeUnit::Time), - show_cursors_(false), - cursors_(new CursorPair(*this)), - next_flag_text_('A'), - trigger_markers_(), - hover_point_(-1, -1), - scroll_needs_defaults_(true), - saved_v_offset_(0), - scale_at_acq_start_(0), - offset_at_acq_start_(0), - suppress_zoom_to_fit_after_acq_(false) + header_was_shrunk_(false), // The splitter remains unchanged after a reset, so this goes here + sticky_scrolling_(false) // Default setting is set in MainWindow::setup_ui() { QVBoxLayout *root_layout = new QVBoxLayout(this); root_layout->setContentsMargins(0, 0, 0, 0); @@ -196,7 +176,9 @@ View::View(Session &session, bool is_main_view, QWidget *parent) : // Set up settings and event handlers GlobalSettings settings; - coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool(); + colored_bg_ = settings.value(GlobalSettings::Key_View_ColoredBG).toBool(); + + GlobalSettings::add_change_handler(this); connect(scrollarea_->horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(h_scroll_value_changed(int))); @@ -228,6 +210,45 @@ View::View(Session &session, bool is_main_view, QWidget *parent) : ruler_->raise(); header_->raise(); + reset_view_state(); +} + +View::~View() +{ + GlobalSettings::remove_change_handler(this); +} + +void View::reset_view_state() +{ + ViewBase::reset_view_state(); + + segment_display_mode_ = Trace::ShowLastSegmentOnly; + segment_selectable_ = false; + scale_ = 1e-3; + offset_ = 0; + ruler_offset_ = 0; + updating_scroll_ = false; + settings_restored_ = false; + 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_ = make_shared(*this); + next_flag_text_ = 'A'; + trigger_markers_.clear(); + hover_point_ = QPoint(-1, -1); + scroll_needs_defaults_ = true; + saved_v_offset_ = 0; + scale_at_acq_start_ = 0; + offset_at_acq_start_ = 0; + suppress_zoom_to_fit_after_acq_ = false; + + show_cursors_ = false; + cursor_state_changed(show_cursors_); + flags_.clear(); + // Update the zoom state calculate_tick_spacing(); @@ -360,10 +381,13 @@ void View::restore_settings(QSettings &settings) 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; + try { + boost::archive::text_iarchive ia(ss); + ia >> boost::serialization::make_nvp("ruler_shift", shift); + ruler_shift_ = shift; + } catch (boost::archive::archive_exception) { + qDebug() << "Could not restore the view ruler shift"; + } } if (settings.contains("offset")) { @@ -371,11 +395,14 @@ void View::restore_settings(QSettings &settings) stringstream ss; ss << settings.value("offset").toString().toStdString(); - boost::archive::text_iarchive ia(ss); - ia >> boost::serialization::make_nvp("offset", offset); - - // This also updates ruler_offset_ - set_offset(offset); + try { + boost::archive::text_iarchive ia(ss); + ia >> boost::serialization::make_nvp("offset", offset); + // This also updates ruler_offset_ + set_offset(offset); + } catch (boost::archive::archive_exception) { + qDebug() << "Could not restore the view offset"; + } } if (settings.contains("splitter_state")) @@ -409,9 +436,12 @@ 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()); + + if (cursors_) { + 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); @@ -432,27 +462,43 @@ void View::set_scale(double scale) } } -void View::set_offset(const pv::util::Timestamp& offset) +void View::set_offset(const pv::util::Timestamp& offset, bool force_update) { - if (offset_ != offset) { + if ((offset_ != offset) || force_update) { 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_; } +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 { return -scrollarea_->verticalScrollBar()->sliderPosition(); @@ -538,8 +584,23 @@ void View::set_current_segment(uint32_t segment_id) for (shared_ptr signal : signals_) signal->set_current_segment(current_segment_); +#ifdef ENABLE_DECODE for (shared_ptr dt : decode_traces_) dt->set_current_segment(current_segment_); +#endif + + 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(); @@ -558,6 +619,8 @@ Trace::SegmentDisplayMode View::segment_display_mode() const void View::set_segment_display_mode(Trace::SegmentDisplayMode mode) { + trigger_markers_.clear(); + segment_display_mode_ = mode; for (shared_ptr signal : signals_) @@ -734,15 +797,15 @@ void View::enable_show_analog_minor_grid(bool state) viewport_->update(); } -void View::enable_coloured_bg(bool state) +void View::enable_colored_bg(bool state) { - coloured_bg_ = state; + colored_bg_ = state; viewport_->update(); } -bool View::coloured_bg() const +bool View::colored_bg() const { - return coloured_bg_; + return colored_bg_; } bool View::cursors_shown() const @@ -753,17 +816,21 @@ bool View::cursors_shown() const void View::show_cursors(bool show) { show_cursors_ = show; + cursor_state_changed(show); 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); - ruler_->update(); - viewport_->update(); + if (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); + + ruler_->update(); + viewport_->update(); + } } shared_ptr View::cursors() const @@ -826,16 +893,27 @@ void View::restack_all_trace_tree_items() i->animate_to_layout_v_offset(); } -void View::trigger_event(util::Timestamp location) +void View::on_setting_changed(const QString &key, const QVariant &value) +{ + if (key == GlobalSettings::Key_View_TriggerIsZeroTime) + on_settingViewTriggerIsZeroTime_changed(value); +} + +void View::trigger_event(int segment_id, util::Timestamp location) { - // Set up ruler_shift if the Key_View_TriggerIsZeroTime option is set. + // 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(); - ruler_shift_ = (trigger_is_zero_time) ? (-location) : (0); - // Force an immediate update of both offsets - offset_ -= 0.001; - set_offset(offset_ + 0.001); + 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)); } @@ -901,7 +979,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); + 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); @@ -1553,6 +1631,17 @@ void View::on_segment_changed(int segment) } } +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() { if (always_zoom_to_fit_) {