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

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 592a746..89d19b3 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,6 +52,16 @@ const srd_decoder* Decoder::decoder() const
 	return _decoder;
 }
 
+bool Decoder::shown() const
+{
+	return _shown;
+}
+
+void Decoder::show(bool show)
+{
+	_shown = show;
+}
+
 const map<const srd_probe*, shared_ptr<view::LogicSignal> >&
 Decoder::probes() const
 {
@@ -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 *p = _decoder->probes; p; p = p->next) {
+		const srd_probe *const probe = (const srd_probe*)p->data;
+		assert(probe);
+		if (_probes.find(probe) == _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_probe*, 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);
@@ -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_probe_set_all(decoder_inst, probes, unit_size);
 
 	return decoder_inst;
 }