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: 1ccb336edad7
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: c4b53cf671b6
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 23, 2020

  1. Copy the full SHA
    c4b53cf View commit details
Showing with 1 addition and 6 deletions.
  1. +1 −6 glscopeclient/Timeline.cpp
7 changes: 1 addition & 6 deletions glscopeclient/Timeline.cpp
Original file line number Diff line number Diff line change
@@ -107,13 +107,8 @@ bool Timeline::on_motion_notify_event(GdkEventMotion* event)
double dx = event->x - m_dragStartX;
double ps = dx / m_group->m_pixelsPerXUnit;

//Update offset, but don't allow scrolling before time zero for time domain waveforms
//Update offset
m_group->m_xAxisOffset = m_originalTimeOffset - ps;
if(m_xAxisUnit == Unit::UNIT_PS)
{
if(m_group->m_xAxisOffset < 0)
m_group->m_xAxisOffset = 0;
}

//Clear persistence and redraw the group (fixes #46)
m_group->GetParent()->ClearPersistence(m_group, false);