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: 202ff55b2e20
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: a0bab26961d4
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 5, 2020

  1. WaveformGroup: now serialize measurements (see #3)

    @azonenberg
    azonenberg committed Mar 5, 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
    a0bab26 View commit details
Showing with 2 additions and 4 deletions.
  1. +2 −4 glscopeclient/WaveformGroup.cpp
6 changes: 2 additions & 4 deletions glscopeclient/WaveformGroup.cpp
View file
Original file line number Diff line number Diff line change
@@ -243,12 +243,10 @@ string WaveformGroup::SerializeConfiguration(std::map<void*, int>& idmap, int& n
//Measurements
if(!m_measurementColumns.empty())
{
config += " measurements: %%\n";
config += " measurements: @\n";

for(auto col : m_measurementColumns)
{

}
config += col->m_measurement->SerializeConfiguration(idmap, nextID, col->m_title);
}

return config;