Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9fae0f2dd8ac
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0530460959b5
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Feb 14, 2020

  1. Copy the full SHA
    0530460 View commit details
Showing with 17 additions and 0 deletions.
  1. +5 −0 scopehal/PacketDecoder.cpp
  2. +1 −0 scopehal/PacketDecoder.h
  3. +6 −0 scopeprotocols/DVIDecoder.cpp
  4. +5 −0 scopeprotocols/DVIDecoder.h
5 changes: 5 additions & 0 deletions scopehal/PacketDecoder.cpp
Original file line number Diff line number Diff line change
@@ -58,3 +58,8 @@ bool PacketDecoder::GetShowDataColumn()
{
return true;
}

bool PacketDecoder::GetShowImageColumn()
{
return false;
}
1 change: 1 addition & 0 deletions scopehal/PacketDecoder.h
Original file line number Diff line number Diff line change
@@ -70,6 +70,7 @@ class PacketDecoder : public ProtocolDecoder
virtual std::vector<std::string> GetHeaders() =0;

virtual bool GetShowDataColumn();
virtual bool GetShowImageColumn();

protected:
void ClearPackets();
6 changes: 6 additions & 0 deletions scopeprotocols/DVIDecoder.cpp
Original file line number Diff line number Diff line change
@@ -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)
{
5 changes: 5 additions & 0 deletions scopeprotocols/DVIDecoder.h
Original file line number Diff line number Diff line change
@@ -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);