projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed missing includes and formward declarations hidden by cotire.
[pulseview.git]
/
pv
/
sigsession.cpp
diff --git
a/pv/sigsession.cpp
b/pv/sigsession.cpp
index 24a059ea8a35f03340461aac434047231087ec05..82fa877065254cd05c38f82aa64c19c54063732e 100644
(file)
--- a/
pv/sigsession.cpp
+++ b/
pv/sigsession.cpp
@@
-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
@@
-18,7
+18,9
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifdef ENABLE_DECODE
#include <libsigrokdecode/libsigrokdecode.h>
#include <libsigrokdecode/libsigrokdecode.h>
+#endif
#include "sigsession.h"
#include "sigsession.h"
@@
-26,9
+28,10
@@
#include "data/analog.h"
#include "data/analogsnapshot.h"
#include "data/analog.h"
#include "data/analogsnapshot.h"
-#include "data/decoder.h"
+#include "data/decoder
stack
.h"
#include "data/logic.h"
#include "data/logicsnapshot.h"
#include "data/logic.h"
#include "data/logicsnapshot.h"
+#include "data/decode/decoder.h"
#include "view/analogsignal.h"
#include "view/decodetrace.h"
#include "view/analogsignal.h"
#include "view/decodetrace.h"
@@
-44,8
+47,15
@@
#include <QDebug>
#include <QDebug>
-using namespace boost;
-using namespace std;
+using boost::dynamic_pointer_cast;
+using boost::function;
+using boost::lock_guard;
+using boost::mutex;
+using boost::shared_ptr;
+using std::map;
+using std::set;
+using std::string;
+using std::vector;
namespace pv {
namespace pv {
@@
-82,6
+92,9
@@
struct sr_dev_inst* SigSession::get_device() const
void SigSession::set_device(struct sr_dev_inst *sdi)
{
void SigSession::set_device(struct sr_dev_inst *sdi)
{
+ // Ensure we are not capturing before setting the device
+ stop_capture();
+
if (_sdi)
_device_manager.release_device(_sdi);
if (sdi)
if (_sdi)
_device_manager.release_device(_sdi);
if (sdi)
@@
-117,6
+130,7
@@
void SigSession::load_file(const string &name,
sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
g_slist_free(devlist);
sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
g_slist_free(devlist);
+ _decode_traces.clear();
update_signals(sdi);
read_sample_rate(sdi);
update_signals(sdi);
read_sample_rate(sdi);
@@
-131,6
+145,7
@@
void SigSession::load_file(const string &name,
error_handler)))
return;
error_handler)))
return;
+ _decode_traces.clear();
update_signals(in->sdi);
read_sample_rate(in->sdi);
update_signals(in->sdi);
read_sample_rate(in->sdi);
@@
-188,27
+203,37
@@
void SigSession::stop_capture()
_sampling_thread.join();
}
_sampling_thread.join();
}
-
vector< shared_ptr<view::Signal> > SigSession::get_signals
() const
+
set< shared_ptr<data::SignalData> > SigSession::get_data
() const
{
lock_guard<mutex> lock(_signals_mutex);
{
lock_guard<mutex> lock(_signals_mutex);
- return _signals;
+ set< shared_ptr<data::SignalData> > data;
+ BOOST_FOREACH(const shared_ptr<view::Signal> sig, _signals) {
+ assert(sig);
+ data.insert(sig->data());
+ }
+
+ return data;
}
}
-boost::shared_ptr<data::Logic> SigSession::get_data()
+vector< shared_ptr<view::Signal> > SigSession::get_signals() const
{
{
- return _logic_data;
+ lock_guard<mutex> lock(_signals_mutex);
+ return _signals;
}
}
+#ifdef ENABLE_DECODE
bool SigSession::add_decoder(srd_decoder *const dec)
{
map<const srd_probe*, shared_ptr<view::LogicSignal> > probes;
bool SigSession::add_decoder(srd_decoder *const dec)
{
map<const srd_probe*, shared_ptr<view::LogicSignal> > probes;
+ shared_ptr<data::DecoderStack> decoder_stack;
try
{
lock_guard<mutex> lock(_signals_mutex);
// Create the decoder
try
{
lock_guard<mutex> lock(_signals_mutex);
// Create the decoder
- shared_ptr<data::Decoder> decoder(new data::Decoder(dec));
+ decoder_stack = shared_ptr<data::DecoderStack>(
+ new data::DecoderStack(dec));
// Auto select the initial probes
for(const GSList *i = dec->probes; i; i = i->next)
// Auto select the initial probes
for(const GSList *i = dec->probes; i; i = i->next)
@@
-218,17
+243,21
@@
bool SigSession::add_decoder(srd_decoder *const dec)
{
shared_ptr<view::LogicSignal> l =
dynamic_pointer_cast<view::LogicSignal>(s);
{
shared_ptr<view::LogicSignal> l =
dynamic_pointer_cast<view::LogicSignal>(s);
- if (l && QString(probe->name).toLower().contains(
+ if (l && QString::fromUtf8(probe->name).
+ toLower().contains(
l->get_name().toLower()))
probes[probe] = l;
}
}
l->get_name().toLower()))
probes[probe] = l;
}
}
- decoder->set_probes(probes);
+ assert(decoder_stack);
+ assert(!decoder_stack->stack().empty());
+ assert(decoder_stack->stack().front());
+ decoder_stack->stack().front()->set_probes(probes);
// Create the decode signal
shared_ptr<view::DecodeTrace> d(
// Create the decode signal
shared_ptr<view::DecodeTrace> d(
- new view::DecodeTrace(*this, decoder,
+ new view::DecodeTrace(*this, decoder
_stack
,
_decode_traces.size()));
_decode_traces.push_back(d);
}
_decode_traces.size()));
_decode_traces.push_back(d);
}
@@
-239,6
+268,9
@@
bool SigSession::add_decoder(srd_decoder *const dec)
signals_changed();
signals_changed();
+ // Do an initial decode
+ decoder_stack->begin_decode();
+
return true;
}
return true;
}
@@
-261,6
+293,7
@@
void SigSession::remove_decode_signal(view::DecodeTrace *signal)
return;
}
}
return;
}
}
+#endif
void SigSession::set_capture_state(capture_state state)
{
void SigSession::set_capture_state(capture_state state)
{