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

Commits on Sep 29, 2020

  1. Copy the full SHA
    1f1aefe View commit details
Showing with 4 additions and 6 deletions.
  1. +1 −1 lib
  2. +3 −2 src/glscopeclient/OscilloscopeWindow.cpp
  3. +0 −3 src/glscopeclient/WaveformArea_events.cpp
2 changes: 1 addition & 1 deletion lib
Submodule lib updated from 9f362a to f39cd4
5 changes: 3 additions & 2 deletions src/glscopeclient/OscilloscopeWindow.cpp
Original file line number Diff line number Diff line change
@@ -1539,9 +1539,9 @@ void OscilloscopeWindow::SerializeWaveforms(IDTable& table)
char cwd[PATH_MAX];
getcwd(cwd, PATH_MAX);
chdir(m_currentDataDirName.c_str());

const auto directories = ::Glob("scope_*", true);

for(const auto& directory: directories)
::RemoveDirectory(directory);

@@ -2206,6 +2206,7 @@ void OscilloscopeWindow::OnAllWaveformsUpdated()
//Map all of the buffers we need to update in each area
for(auto w : m_waveformAreas)
{
w->OnWaveformDataReady();
w->CalculateOverlayPositions();
w->MapAllBuffers(true);
}
3 changes: 0 additions & 3 deletions src/glscopeclient/WaveformArea_events.cpp
Original file line number Diff line number Diff line change
@@ -1076,9 +1076,6 @@ void WaveformArea::OnWaveformDataReady()
m_group->m_timeline.queue_draw();
}
}

//Redraw everything
queue_draw();
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////