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: 28ba5ef533a6
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: 6e078d9de563
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 24, 2020

  1. Verified

    This commit was signed with the committer’s verified signature.
    lukekarrys Luke Karrys
    Copy the full SHA
    4d71436 View commit details
  2. Updated submodules

    azonenberg committed Sep 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    lukekarrys Luke Karrys
    Copy the full SHA
    6e078d9 View commit details
Showing with 8 additions and 6 deletions.
  1. +1 −1 lib
  2. +4 −2 src/glscopeclient/WaveformArea_events.cpp
  3. +3 −3 src/glscopeclient/WaveformArea_rendering.cpp
2 changes: 1 addition & 1 deletion lib
Submodule lib updated from 7219fe to 6a5d67
6 changes: 4 additions & 2 deletions src/glscopeclient/WaveformArea_events.cpp
Original file line number Diff line number Diff line change
@@ -83,8 +83,6 @@ void WaveformArea::on_resize(int width, int height)
ResetTextureFiltering();
}

SetGeometryDirty();

err = glGetError();
if(err != 0)
LogNotice("resize 3, err = %x\n", err);
@@ -106,6 +104,10 @@ void WaveformArea::on_resize(int width, int height)
waterfall->SetWidth(m_width);
waterfall->SetHeight(m_height);
}

SetGeometryDirty();
SetPositionDirty();
queue_draw();
}

bool WaveformArea::on_scroll_event (GdkEventScroll* ev)
6 changes: 3 additions & 3 deletions src/glscopeclient/WaveformArea_rendering.cpp
Original file line number Diff line number Diff line change
@@ -333,6 +333,9 @@ bool WaveformArea::on_render(const Glib::RefPtr<Gdk::GLContext>& /*context*/)
//since scaling data is pushed to the GPU at this time
CalculateOverlayPositions();

//Pull vertical size from the scope early on no matter how we're rendering
m_pixelsPerVolt = m_height / m_channel.m_channel->GetVoltageRange();

//Update geometry if needed
if(m_geometryDirty || m_positionDirty)
{
@@ -364,9 +367,6 @@ bool WaveformArea::on_render(const Glib::RefPtr<Gdk::GLContext>& /*context*/)
m_firstFrame = false;
}

//Pull vertical size from the scope early on no matter how we're rendering
m_pixelsPerVolt = m_height / m_channel.m_channel->GetVoltageRange();

//TODO: Do persistence processing

/*