Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions pv/data/signalbase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -884,10 +884,9 @@ void SignalBase::stop_conversion()

void SignalBase::on_samples_cleared()
{
if (converted_data_ && (converted_data_->get_segment_count() > 0)) {
if (converted_data_ && (converted_data_->get_segment_count() > 0))
converted_data_->clear();
samples_cleared();
}
samples_cleared();
}

void SignalBase::on_samples_added(SharedPtrToSegment segment, uint64_t start_sample,
Expand Down
8 changes: 8 additions & 0 deletions pv/views/trace/analogsignal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ const int AnalogSignal::InfoTextMarginBottom = 5;

AnalogSignal::AnalogSignal(pv::Session &session, shared_ptr<data::SignalBase> base) :
LogicSignal(session, base),
signal_min_(0),
signal_max_(0),
value_at_hover_pos_(std::numeric_limits<float>::quiet_NaN()),
scale_index_(4), // 20 per div
pos_vdivs_(1),
Expand Down Expand Up @@ -941,6 +943,12 @@ void AnalogSignal::on_setting_changed(const QString &key, const QVariant &value)
}
}

void AnalogSignal::on_samples_cleared()
{
signal_min_ = 0;
signal_max_ = 0;
}

void AnalogSignal::on_min_max_changed(float min, float max)
{
if (autoranging_)
Expand Down
1 change: 1 addition & 0 deletions pv/views/trace/analogsignal.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ class AnalogSignal : public LogicSignal
private Q_SLOTS:
virtual void on_setting_changed(const QString &key, const QVariant &value);

virtual void on_samples_cleared() override;
void on_min_max_changed(float min, float max);

void on_pos_vdivs_changed(int vdivs);
Expand Down
6 changes: 6 additions & 0 deletions pv/views/trace/trace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ Trace::Trace(shared_ptr<data::SignalBase> signal) :
this, SLOT(on_color_changed(const QColor&)));
connect(signal.get(), SIGNAL(error_message_changed(const QString&)),
this, SLOT(on_error_message_changed(const QString&)));
connect(signal.get(), SIGNAL(samples_cleared()),
this, SLOT(on_samples_cleared()));

GlobalSettings::add_change_handler(this);

Expand Down Expand Up @@ -439,6 +441,10 @@ void Trace::on_popup_closed()
popup_form_ = nullptr;
}

void Trace::on_samples_cleared()
{
}

void Trace::on_nameedit_changed(const QString &name)
{
/* This event handler notifies SignalBase that the name changed */
Expand Down
2 changes: 2 additions & 0 deletions pv/views/trace/trace.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@ protected Q_SLOTS:

void on_popup_closed();

virtual void on_samples_cleared();

private Q_SLOTS:
void on_nameedit_changed(const QString &name);

Expand Down
Loading