ngscopeclient · Feb 14, 2020
Showing with 17 additions and 0 deletions.

+5 −0 scopehal/PacketDecoder.cpp

+1 −0 scopehal/PacketDecoder.h

+6 −0 scopeprotocols/DVIDecoder.cpp

+5 −0 scopeprotocols/DVIDecoder.h
diff --git a/scopehal/PacketDecoder.cpp b/scopehal/PacketDecoder.cpp
@@ -58,3 +58,8 @@ bool PacketDecoder::GetShowDataColumn()
 {
 	return true;
 }
+
+bool PacketDecoder::GetShowImageColumn()
+{
+	return false;
+}
diff --git a/scopehal/PacketDecoder.h b/scopehal/PacketDecoder.h
@@ -70,6 +70,7 @@ class PacketDecoder : public ProtocolDecoder
 	virtual std::vector<std::string> GetHeaders() =0;
 
 	virtual bool GetShowDataColumn();
+	virtual bool GetShowImageColumn();
 
 protected:
 	void ClearPackets();

diff --git a/scopeprotocols/DVIDecoder.cpp b/scopeprotocols/DVIDecoder.cpp
@@ -111,6 +111,11 @@ vector<string> DVIDecoder::GetHeaders()
 	return ret;
 }
 
+bool DVIDecoder::GetShowImageColumn()
+{
+	return true;
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Actual decoder logic
 
@@ -263,6 +268,7 @@ void DVIDecoder::Refresh()
 				sgreen.m_sample.m_data,
 				sblue.m_sample.m_data)));
 
+			//In-memory packet data is RGB order for compatibility with Gdk::Pixbuf
 			//may be null if waveform starts halfway through a scan line. Don't make a packet for that.
 			if(current_packet != NULL)
 			{

diff --git a/scopeprotocols/DVIDecoder.h b/scopeprotocols/DVIDecoder.h
@@ -72,6 +72,9 @@ class VideoScanlinePacket : public Packet
 {
 public:
 	virtual ~VideoScanlinePacket();
+
+	//scanline data stretched to be several pixels high
+	std::vector<uint8_t>	m_image;
 };
 
 typedef OscilloscopeSample<DVISymbol> DVISample;
@@ -89,6 +92,8 @@ class DVIDecoder : public PacketDecoder
 	static std::string GetProtocolName();
 	virtual void SetDefaultName();
 
+	virtual bool GetShowImageColumn();
+
 	virtual std::vector<std::string> GetHeaders();
 
 	virtual bool ValidateChannel(size_t i, OscilloscopeChannel* channel);