#include "data/analogsnapshot.h"
#include "data/logic.h"
#include "data/logicsnapshot.h"
+
#include "view/analogsignal.h"
+#include "view/decodesignal.h"
#include "view/logicsignal.h"
#include <assert.h>
return;
}
- update_signals((sr_dev_inst*)devlist->data);
+ sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
g_slist_free(devlist);
+ update_signals(sdi);
+ read_sample_rate(sdi);
+
_sampling_thread.reset(new boost::thread(
&SigSession::load_session_thread_proc, this,
error_handler));
return;
update_signals(in->sdi);
+ read_sample_rate(in->sdi);
_sampling_thread.reset(new boost::thread(
&SigSession::load_input_thread_proc, this,
return _logic_data;
}
+void SigSession::add_decoder(srd_decoder *const dec)
+{
+ {
+ shared_ptr<view::DecodeSignal> d(new view::DecodeSignal(*this, dec));
+ _decode_traces.push_back(d);
+ }
+ signals_changed();
+}
+
void SigSession::set_capture_state(capture_state state)
{
lock_guard<mutex> lock(_sampling_mutex);
unsigned int logic_probe_count = 0;
unsigned int analog_probe_count = 0;
+ // Clear the decode traces
+ _decode_traces.clear();
+
// Detect what data types we will receive
if(sdi) {
for (const GSList *l = sdi->probes; l; l = l->next) {
return false;
}
+void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
+{
+ GVariant *gvar;
+ uint64_t sample_rate = 0;
+
+ // Read out the sample rate
+ if(sdi->driver)
+ {
+ const int ret = sr_config_get(sdi->driver,
+ SR_CONF_SAMPLERATE, &gvar, sdi);
+ if (ret != SR_OK) {
+ qDebug("Failed to get samplerate\n");
+ return;
+ }
+
+ sample_rate = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
+ }
+
+ if(_analog_data)
+ _analog_data->set_samplerate(sample_rate);
+ if(_logic_data)
+ _logic_data->set_samplerate(sample_rate);
+}
+
void SigSession::load_session_thread_proc(
function<void (const QString)> error_handler)
{
void SigSession::feed_in_header(const sr_dev_inst *sdi)
{
- GVariant *gvar;
- uint64_t sample_rate = 0;
-
- // Read out the sample rate
- if(sdi->driver)
- {
- const int ret = sr_config_get(sdi->driver,
- SR_CONF_SAMPLERATE, &gvar, sdi);
- if (ret != SR_OK) {
- qDebug("Failed to get samplerate\n");
- return;
- }
-
- sample_rate = g_variant_get_uint64(gvar);
- g_variant_unref(gvar);
- }
-
- if(_analog_data)
- _analog_data->set_samplerate(sample_rate);
- if(_logic_data)
- _logic_data->set_samplerate(sample_rate);
+ read_sample_rate(sdi);
}
void SigSession::feed_in_meta(const sr_dev_inst *sdi,