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: e701d04cda9a
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: 81fa6c6009ad
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 22, 2020

  1. Updated scopehal

    azonenberg committed Dec 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    26a803a View commit details
  2. ProtocolAnalyzerWindow: Fixed bug where RemoveHistory() would trigger…

    … spurious clicks and mess up the cursor position
    azonenberg committed Dec 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    81fa6c6 View commit details
Showing with 5 additions and 1 deletion.
  1. +1 −1 lib
  2. +4 −0 src/glscopeclient/ProtocolAnalyzerWindow.cpp
4 changes: 4 additions & 0 deletions src/glscopeclient/ProtocolAnalyzerWindow.cpp
Original file line number Diff line number Diff line change
@@ -707,6 +707,8 @@ void ProtocolAnalyzerWindow::OnSelectionChanged()
*/
void ProtocolAnalyzerWindow::RemoveHistory(TimePoint timestamp)
{
m_updating = true;

//This always happens from the start of time, so just remove from the beginning of our list
//until we have nothing that matches.
auto children = m_internalmodel->children();
@@ -723,6 +725,8 @@ void ProtocolAnalyzerWindow::RemoveHistory(TimePoint timestamp)
//Remove it
m_internalmodel->erase(it);
}

m_updating = false;
}

void ProtocolAnalyzerWindow::OnApplyFilter()