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: 47fa6ca60a3c
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: ceeaaf5480e1
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Sep 30, 2020

  1. Copy the full SHA
    ceeaaf5 View commit details
Showing with 3 additions and 2 deletions.
  1. +1 −1 lib
  2. +2 −1 src/glscopeclient/WaveformArea_rendering.cpp
3 changes: 2 additions & 1 deletion src/glscopeclient/WaveformArea_rendering.cpp
Original file line number Diff line number Diff line change
@@ -189,7 +189,8 @@ void WaveformArea::PrepareGeometry(WaveformRenderData* wdata, bool update_wavefo

//Scale alpha by zoom.
//As we zoom out more, reduce alpha to get proper intensity grading
float samplesPerPixel = 1.0f / (group->m_pixelsPerXUnit * pdat->m_timescale);
//First order approximation of average sample length: use first sample's duration
float samplesPerPixel = 1.0f / (group->m_pixelsPerXUnit * pdat->m_timescale * pdat->m_durations[0]);
float alpha_scaled = alpha * 2 / samplesPerPixel;

//Config stuff