projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4913560
)
DecodeTrace: Reset cached trace properties when decoder stack resets
author
Soeren Apel
<soeren@apelpie.net>
Sat, 9 Sep 2017 07:01:07 +0000
(09:01 +0200)
committer
Soeren Apel
<soeren@apelpie.net>
Fri, 22 Sep 2017 19:13:48 +0000
(21:13 +0200)
pv/data/decodesignal.cpp
patch
|
blob
|
history
pv/data/decodesignal.hpp
patch
|
blob
|
history
pv/views/trace/decodetrace.cpp
patch
|
blob
|
history
pv/views/trace/decodetrace.hpp
patch
|
blob
|
history
diff --git
a/pv/data/decodesignal.cpp
b/pv/data/decodesignal.cpp
index 03ecc2efcc3a0bbb7fd42b90133514969952f7b3..8bdad1097af99c654779f5a8c48f0d05d77d4e4d 100644
(file)
--- a/
pv/data/decodesignal.cpp
+++ b/
pv/data/decodesignal.cpp
@@
-155,6
+155,8
@@
void DecodeSignal::reset_decode()
logic_mux_data_.reset();
logic_mux_data_invalid_ = true;
logic_mux_data_.reset();
logic_mux_data_invalid_ = true;
+
+ decode_reset();
}
void DecodeSignal::begin_decode()
}
void DecodeSignal::begin_decode()
diff --git
a/pv/data/decodesignal.hpp
b/pv/data/decodesignal.hpp
index 3187c850216dc1a4331bcca40d0b2ab504a01331..dd2ad79dbb790f0553220fe34fbb211ba710ca2f 100644
(file)
--- a/
pv/data/decodesignal.hpp
+++ b/
pv/data/decodesignal.hpp
@@
-153,6
+153,7
@@
private:
Q_SIGNALS:
void new_annotations();
Q_SIGNALS:
void new_annotations();
+ void decode_reset();
void decode_finished();
void channels_updated();
void decode_finished();
void channels_updated();
diff --git
a/pv/views/trace/decodetrace.cpp
b/pv/views/trace/decodetrace.cpp
index 7bbc5a19b526cd5afa6856a578f1d03f989533df..509e77f6224b5dacbd9514d47f48b245f47a6c08 100644
(file)
--- a/
pv/views/trace/decodetrace.cpp
+++ b/
pv/views/trace/decodetrace.cpp
@@
-146,6
+146,8
@@
DecodeTrace::DecodeTrace(pv::Session &session,
connect(decode_signal_.get(), SIGNAL(new_annotations()),
this, SLOT(on_new_annotations()));
connect(decode_signal_.get(), SIGNAL(new_annotations()),
this, SLOT(on_new_annotations()));
+ connect(decode_signal_.get(), SIGNAL(decode_reset()),
+ this, SLOT(on_decode_reset()));
connect(decode_signal_.get(), SIGNAL(decode_finished()),
this, SLOT(on_decode_finished()));
connect(decode_signal_.get(), SIGNAL(channels_updated()),
connect(decode_signal_.get(), SIGNAL(decode_finished()),
this, SLOT(on_decode_finished()));
connect(decode_signal_.get(), SIGNAL(channels_updated()),
@@
-889,6
+891,15
@@
void DecodeTrace::on_delayed_trace_update()
owner_->row_item_appearance_changed(false, true);
}
owner_->row_item_appearance_changed(false, true);
}
+void DecodeTrace::on_decode_reset()
+{
+ visible_rows_.clear();
+ max_visible_rows_ = 0;
+
+ if (owner_)
+ owner_->row_item_appearance_changed(false, true);
+}
+
void DecodeTrace::on_decode_finished()
{
if (owner_)
void DecodeTrace::on_decode_finished()
{
if (owner_)
diff --git
a/pv/views/trace/decodetrace.hpp
b/pv/views/trace/decodetrace.hpp
index fe3503b6008817b4d47b9fc0b10ffe47d3ab9d01..43473873444f01ba3f786b3c1fcd63b084215f70 100644
(file)
--- a/
pv/views/trace/decodetrace.hpp
+++ b/
pv/views/trace/decodetrace.hpp
@@
-184,6
+184,7
@@
public:
private Q_SLOTS:
void on_new_annotations();
void on_delayed_trace_update();
private Q_SLOTS:
void on_new_annotations();
void on_delayed_trace_update();
+ void on_decode_reset();
void on_decode_finished();
void on_delete();
void on_decode_finished();
void on_delete();