projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added support for save
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index e0eb493853cb54d871f2aafc5e8e15b21376a232..5b4144a7cbb9f026378fef3427a0de96d895c585 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-1,7
+1,7
@@
/*
* This file is part of the PulseView project.
*
/*
* This file is part of the PulseView project.
*
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2012
-14
Joel Holdsworth <joel@airwebreathe.org.uk>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-46,10
+46,12
@@
class Analog;
class AnalogSnapshot;
class Logic;
class LogicSnapshot;
class AnalogSnapshot;
class Logic;
class LogicSnapshot;
+class SignalData;
}
namespace view {
}
namespace view {
-class DecodeSignal;
+class DecodeTrace;
+class LogicSignal;
class Signal;
}
class Signal;
}
@@
-88,20
+90,19
@@
public:
void stop_capture();
void stop_capture();
+ std::set< boost::shared_ptr<data::SignalData> > get_data() const;
+
std::vector< boost::shared_ptr<view::Signal> >
get_signals() const;
std::vector< boost::shared_ptr<view::Signal> >
get_signals() const;
- boost::shared_ptr<data::Logic> get_data();
-
- void add_decoder(srd_decoder *const dec,
- std::map<const srd_probe*,
- boost::shared_ptr<view::Signal> > probes,
- GHashTable *options);
+#ifdef ENABLE_DECODE
+ bool add_decoder(srd_decoder *const dec);
- std::vector< boost::shared_ptr<view::Decode
Signal
> >
+ std::vector< boost::shared_ptr<view::Decode
Trace
> >
get_decode_signals() const;
get_decode_signals() const;
- void remove_decode_signal(view::DecodeSignal *signal);
+ void remove_decode_signal(view::DecodeTrace *signal);
+#endif
private:
void set_capture_state(capture_state state);
private:
void set_capture_state(capture_state state);
@@
-161,7
+162,7
@@
private:
*/
struct sr_dev_inst *_sdi;
*/
struct sr_dev_inst *_sdi;
- std::vector< boost::shared_ptr<view::Decode
Signal
> > _decode_traces;
+ std::vector< boost::shared_ptr<view::Decode
Trace
> > _decode_traces;
mutable boost::mutex _sampling_mutex;
capture_state _capture_state;
mutable boost::mutex _sampling_mutex;
capture_state _capture_state;