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: d6a4a2f677c0
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: 287410396923
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Feb 14, 2020

  1. Fixed digital protocol decodes being drawn on top of their names. Fixes 

    #50.
    @azonenberg
    azonenberg committed Feb 14, 2020
    Copy the full SHA
    2874103 View commit details
Showing with 2 additions and 4 deletions.
  1. +0 −2 glscopeclient/OscilloscopeWindow.cpp
  2. +2 −2 glscopeclient/WaveformArea_rendering.cpp
2 changes: 0 additions & 2 deletions glscopeclient/OscilloscopeWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -528,14 +528,12 @@ void OscilloscopeWindow::OnAutofitHorizontal()
void OscilloscopeWindow::OnZoomInHorizontal(WaveformGroup* group)
{
group->m_pixelsPerPicosecond *= 1.5;
LogDebug("zoom in\n");
ClearPersistence(group);
}

void OscilloscopeWindow::OnZoomOutHorizontal(WaveformGroup* group)
{
group->m_pixelsPerPicosecond /= 1.5;
LogDebug("zoom out\n");
ClearPersistence(group);
}

4 changes: 2 additions & 2 deletions glscopeclient/WaveformArea_rendering.cpp
View file
Original file line number Diff line number Diff line change
@@ -752,8 +752,8 @@ void WaveformArea::RenderCairoOverlays()

void WaveformArea::DoRenderCairoOverlays(Cairo::RefPtr< Cairo::Context > cr)
{
RenderChannelLabel(cr);
RenderDecodeOverlays(cr);
RenderChannelLabel(cr);
RenderCursors(cr);
}

@@ -875,7 +875,7 @@ void WaveformArea::RenderDecodeOverlays(Cairo::RefPtr< Cairo::Context > cr)
double xs = PicosecondsToXPosition(start);
double xe = PicosecondsToXPosition(end);

if( (xe < 0) || (xs > m_plotRight) )
if( (xe < textright) || (xs > m_plotRight) )
continue;

//Clamp