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-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1e684817ef7f
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3d123c4545b8
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 5, 2020

  1. Fixed regression in digital waveform overlay rendering

    @azonenberg
    azonenberg committed Mar 5, 2020
    Copy the full SHA
    3d123c4 View commit details
Showing with 6 additions and 2 deletions.
  1. +6 −2 glscopeclient/WaveformArea_rendering.cpp
8 changes: 6 additions & 2 deletions glscopeclient/WaveformArea_rendering.cpp
View file
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ void WaveformArea::PrepareGeometry(WaveformRenderData* wdata)

//Overlay
else
ybase = m_height - (m_overlayPositions[dynamic_cast<ProtocolDecoder*>(channel)] + 15);
ybase = m_height - (m_overlayPositions[dynamic_cast<ProtocolDecoder*>(channel)] + 10);
}

//Calculate X/Y coordinate of each sample point
@@ -113,7 +113,11 @@ void WaveformArea::PrepareGeometry(WaveformRenderData* wdata)
size_t realcount = count;
count *= 2;

float digheight = m_height - 5;
float digheight;
if(channel == m_channel)
digheight = m_height - 5;
else
digheight = 20;

traceBuffer.resize(count*2);
indexBuffer.resize(m_width);