projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Created pv::widgets::SampleTimingWidget, and ported the SamplingBar to use it.
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index 2fb2a1c8af8e6ad109d1fd52d67ef51e2c36f85b..cda49b5ca5c3ada9a3b4853c61909a6aa66d35a6 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
@@
-26,8
+26,8
@@
#include <boost/thread.hpp>
#include <map>
#include <boost/thread.hpp>
#include <map>
+#include <set>
#include <string>
#include <string>
-#include <utility>
#include <vector>
#include <QObject>
#include <vector>
#include <QObject>
@@
-47,10
+47,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;
}
@@
-89,18
+91,20
@@
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);
+#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::DecodeTrace *signal);
+#endif
+
private:
void set_capture_state(capture_state state);
private:
void set_capture_state(capture_state state);
@@
-108,6
+112,9
@@
private:
bool is_trigger_enabled() const;
bool is_trigger_enabled() const;
+ boost::shared_ptr<view::Signal> signal_from_probe(
+ const sr_probe *probe) const;
+
void read_sample_rate(const sr_dev_inst *const sdi);
private:
void read_sample_rate(const sr_dev_inst *const sdi);
private:
@@
-159,7
+166,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;
@@
-170,10
+177,10
@@
private:
mutable boost::mutex _data_mutex;
boost::shared_ptr<data::Logic> _logic_data;
boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
mutable boost::mutex _data_mutex;
boost::shared_ptr<data::Logic> _logic_data;
boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
- boost::shared_ptr<data::Analog> _analog_data;
-
boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot
;
+ std::map< const sr_probe*, boost::shared_ptr<data::AnalogSnapshot> >
+
_cur_analog_snapshots
;
-
std::auto_ptr<boost::thread>
_sampling_thread;
+
boost::thread
_sampling_thread;
signals:
void capture_state_changed(int state);
signals:
void capture_state_changed(int state);