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

Commits on Oct 6, 2020

  1. WaveformArea: use channel's reported RBW for specans rather than just… 

    … the FFT bin size. Fixes #201.
    @azonenberg
    azonenberg committed Oct 6, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a9819f1 View commit details
Showing with 7 additions and 2 deletions.
  1. +1 −1 lib
  2. +6 −1 src/glscopeclient/WaveformArea_cairo.cpp
2 changes: 1 addition & 1 deletion lib
Submodule lib updated 2 files
+12 −1 scopehal/TektronixOscilloscope.cpp
+2 −0 scopehal/TektronixOscilloscope.h
7 changes: 6 additions & 1 deletion src/glscopeclient/WaveformArea_cairo.cpp
View file
Original file line number Diff line number Diff line change
@@ -510,6 +510,7 @@ void WaveformArea::RenderChannelLabel(Cairo::RefPtr< Cairo::Context > cr)
{
string label = m_channel.GetName();
auto data = m_channel.GetData();
auto scope = m_channel.m_channel->GetScope();

auto eye = dynamic_cast<EyeWaveform*>(data);
auto ed = dynamic_cast<EyePattern*>(m_channel.m_channel);
@@ -519,7 +520,11 @@ void WaveformArea::RenderChannelLabel(Cairo::RefPtr< Cairo::Context > cr)
auto xunits = m_channel.m_channel->GetXAxisUnits();
if( (xunits == Unit::UNIT_HZ) && (data != NULL) )
{
snprintf(tmp, sizeof(tmp), "\nRBW: %s", xunits.PrettyPrint(data->m_timescale).c_str());
double rbw = data->m_timescale;
if(scope)
rbw = scope->GetResolutionBandwidth();

snprintf(tmp, sizeof(tmp), "\nRBW: %s", xunits.PrettyPrint(rbw).c_str());
label += tmp;
}