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: 973cdeba73c2
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: 8d3308acbeef
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Sep 28, 2020

  1. Copy the full SHA
    8d3308a View commit details
Showing with 6 additions and 5 deletions.
  1. +1 −1 lib
  2. +5 −4 src/glscopeclient/WaveformArea_cairo.cpp
2 changes: 1 addition & 1 deletion lib
Submodule lib updated from bad300 to 9f362a
9 changes: 5 additions & 4 deletions src/glscopeclient/WaveformArea_cairo.cpp
Original file line number Diff line number Diff line change
@@ -1074,11 +1074,12 @@ void WaveformArea::RenderComplexSignal(
void WaveformArea::RenderFFTPeaks(Cairo::RefPtr< Cairo::Context > cr)
{
//Grab input and stop if there's nothing for us to do
auto filter = dynamic_cast<PeakDetectionFilter*>(m_channel.m_channel);
auto chan = m_channel.m_channel;
auto filter = dynamic_cast<PeakDetector*>(chan);
if(!filter)
return;
const vector<Peak>& peaks = filter->GetPeaks();
auto data = filter->GetData(0);
auto data = chan->GetData(0);
if(peaks.empty() || (data == NULL) )
return;

@@ -1091,8 +1092,8 @@ void WaveformArea::RenderFFTPeaks(Cairo::RefPtr< Cairo::Context > cr)
int theight;
int margin = 2;

auto xunit = filter->GetXAxisUnits();
auto yunit = filter->GetYAxisUnits();
auto xunit = chan->GetXAxisUnits();
auto yunit = chan->GetYAxisUnits();

//First pass: get nominal locations of each peak label and discard offscreen ones
float radius = 4;