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

Commits on Oct 31, 2020

  1. Added usage comment to OscilloscopeChannel::SetDefaultDisplayName()

    @azonenberg
    azonenberg committed Oct 31, 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
    38e4ffd View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 scopehal/OscilloscopeChannel.cpp
5 changes: 5 additions & 0 deletions scopehal/OscilloscopeChannel.cpp
View file
Original file line number Diff line number Diff line change
@@ -97,6 +97,11 @@ void OscilloscopeChannel::SharedCtorInit()
AddStream("data");
}

/**
@brief Gives a channel a default display name if there's not one already.
MUST NOT be called until the channel has been added to its parent scope.
*/
void OscilloscopeChannel::SetDefaultDisplayName()
{
//If we have a scope, m_displayname is ignored.