projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #832 by saving/restoring the decoder stack without settings
[pulseview.git]
/
pv
/
data
/
decodesignal.hpp
diff --git
a/pv/data/decodesignal.hpp
b/pv/data/decodesignal.hpp
index 57887f1ec7609c5f66702db71481991f13c77644..d859ea0cdb665a9979d26685f639dbebca578333 100644
(file)
--- a/
pv/data/decodesignal.hpp
+++ b/
pv/data/decodesignal.hpp
@@
-79,7
+79,6
@@
private:
static const double DecodeMargin;
static const double DecodeThreshold;
static const int64_t DecodeChunkLength;
static const double DecodeMargin;
static const double DecodeThreshold;
static const int64_t DecodeChunkLength;
- static const unsigned int DecodeNotifyPeriod;
public:
DecodeSignal(pv::Session &session);
public:
DecodeSignal(pv::Session &session);
@@
-88,7
+87,7
@@
public:
bool is_decode_signal() const;
const vector< shared_ptr<data::decode::Decoder> >& decoder_stack() const;
bool is_decode_signal() const;
const vector< shared_ptr<data::decode::Decoder> >& decoder_stack() const;
- void stack_decoder(srd_decoder *decoder);
+ void stack_decoder(
const
srd_decoder *decoder);
void remove_decoder(int index);
bool toggle_decoder_visibility(int index);
void remove_decoder(int index);
bool toggle_decoder_visibility(int index);
@@
-129,13
+128,6
@@
public:
virtual void restore_settings(QSettings &settings);
virtual void restore_settings(QSettings &settings);
- /**
- * Helper function for static annotation_callback(),
- * must be public so the function can access it.
- * Don't use from outside this class.
- */
- uint64_t inc_annotation_count();
-
private:
void update_channel_list();
private:
void update_channel_list();
@@
-160,10
+152,12
@@
private:
Q_SIGNALS:
void new_annotations();
Q_SIGNALS:
void new_annotations();
+ void decode_finished();
void channels_updated();
private Q_SLOTS:
void on_capture_state_changed(int state);
void channels_updated();
private Q_SLOTS:
void on_capture_state_changed(int state);
+ void on_data_cleared();
void on_data_received();
private:
void on_data_received();
private:
@@
-180,7
+174,7
@@
private:
pv::util::Timestamp start_time_;
double samplerate_;
pv::util::Timestamp start_time_;
double samplerate_;
- int64_t
annotation_count_,
samples_decoded_;
+ int64_t samples_decoded_;
vector< shared_ptr<decode::Decoder> > stack_;
map<const decode::Row, decode::RowData> rows_;
vector< shared_ptr<decode::Decoder> > stack_;
map<const decode::Row, decode::RowData> rows_;