X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=44e474b942c4bfbd82281b42c8d7d909b7430d6f;hb=744905d4ec6a05b53c17efb393a0ef907d95ebe2;hp=592a746c7f612cc71dd34a914c2ab91ec1f8e8f7;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;p=pulseview.git

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 592a746..44e474b 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <libsigrok/libsigrok.h>
 #include <libsigrokdecode/libsigrokdecode.h>
 
 #include "decoder.h"
@@ -25,6 +26,7 @@
 #include <pv/view/logicsignal.h>
 
 using boost::shared_ptr;
+using std::set;
 using std::map;
 using std::string;
 
@@ -33,7 +35,8 @@ namespace data {
 namespace decode {
 
 Decoder::Decoder(const srd_decoder *const dec) :
-	_decoder(dec)
+	_decoder(dec),
+	_shown(true)
 {
 }
 
@@ -49,13 +52,23 @@ const srd_decoder* Decoder::decoder() const
 	return _decoder;
 }
 
-const map<const srd_probe*, shared_ptr<view::LogicSignal> >&
-Decoder::probes() const
+bool Decoder::shown() const
+{
+	return _shown;
+}
+
+void Decoder::show(bool show)
+{
+	_shown = show;
+}
+
+const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
+Decoder::channels() const
 {
 	return _probes;
 }
 
-void Decoder::set_probes(std::map<const srd_probe*,
+void Decoder::set_probes(std::map<const srd_channel*,
 	boost::shared_ptr<view::LogicSignal> > probes)
 {
 	_probes = probes;
@@ -73,8 +86,34 @@ void Decoder::set_option(const char *id, GVariant *value)
 	_options[id] = value;
 }
 
-srd_decoder_inst* Decoder::create_decoder_inst(
-	srd_session *const session) const
+bool Decoder::have_required_probes() const
+{
+	for (GSList *l = _decoder->channels; l; l = l->next) {
+		const srd_channel *const pdch = (const srd_channel*)l->data;
+		assert(pdch);
+		if (_probes.find(pdch) == _probes.end())
+			return false;
+	}
+
+	return true;
+}
+
+set< shared_ptr<pv::data::Logic> > Decoder::get_data()
+{
+	set< shared_ptr<pv::data::Logic> > data;
+	for(map<const srd_channel*, shared_ptr<view::LogicSignal> >::
+		const_iterator i = _probes.begin();
+		i != _probes.end(); i++)
+	{
+		shared_ptr<view::LogicSignal> signal((*i).second);
+		assert(signal);
+		data.insert(signal->logic_data());
+	}
+
+	return data;
+}
+
+srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_size) const
 {
 	GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
 		g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
@@ -99,7 +138,7 @@ srd_decoder_inst* Decoder::create_decoder_inst(
 	GHashTable *const probes = g_hash_table_new_full(g_str_hash,
 		g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
-	for(map<const srd_probe*, shared_ptr<view::LogicSignal> >::
+	for(map<const srd_channel*, shared_ptr<view::LogicSignal> >::
 		const_iterator i = _probes.begin();
 		i != _probes.end(); i++)
 	{
@@ -110,7 +149,7 @@ srd_decoder_inst* Decoder::create_decoder_inst(
 		g_hash_table_insert(probes, (*i).first->id, gvar);
 	}
 
-	srd_inst_probe_set_all(decoder_inst, probes);
+	srd_inst_channel_set_all(decoder_inst, probes, unit_size);
 
 	return decoder_inst;
 }