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: 381dbdc381c6
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: 4e647caceb77
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 12, 2020

  1. Copy the full SHA
    8dc9f32 View commit details
  2. Copy the full SHA
    4e647ca View commit details
Showing with 4 additions and 15 deletions.
  1. +3 −14 glscopeclient/OscilloscopeWindow.cpp
  2. +1 −1 glscopeclient/ScopeSyncWizard.cpp
17 changes: 3 additions & 14 deletions glscopeclient/OscilloscopeWindow.cpp
Original file line number Diff line number Diff line change
@@ -124,20 +124,6 @@ OscilloscopeWindow::~OscilloscopeWindow()
LogDebug("VIEW: %10.3f ms\n", m_tView * 1000);
LogDebug("HISTORY: %10.3f ms\n", m_tHistory * 1000);
LogDebug("POLL: %10.3f ms\n", m_tPoll * 1000);

for(auto it : m_historyWindows)
delete it.second;

for(auto a : m_analyzers)
delete a;
for(auto s : m_splitters)
delete s;
for(auto g : m_waveformGroups)
delete g;
for(auto w : m_waveformAreas)
delete w;

//decoders should self-delete when the last reference to them is removed
}

/**
@@ -2029,6 +2015,9 @@ void OscilloscopeWindow::RefreshAllDecoders()

void OscilloscopeWindow::UpdateStatusBar()
{
if(m_scopes.empty())
return;

//TODO: redo this for multiple scopes
auto scope = m_scopes[0];
char tmp[256];
2 changes: 1 addition & 1 deletion glscopeclient/ScopeSyncWizard.cpp
Original file line number Diff line number Diff line change
@@ -414,7 +414,7 @@ bool ScopeSyncWizard::OnTimer()
if(normalizedCorrelation > m_bestCorrelation)
{
m_bestCorrelation = normalizedCorrelation;
m_bestCorrelationOffset = m_delta;
m_bestCorrelationOffset = d;
}
}
m_delta = blockEnd;