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: 18b9ec232593
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: 2a7106d2b611
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 11, 2020

  1. Copy the full SHA
    b8d7730 View commit details
  2. Copy the full SHA
    2a7106d View commit details
Showing with 4 additions and 7 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 CMakeLists.txt
  3. +1 −1 lib
  4. +1 −5 src/glscopeclient/WaveformArea_cairo.cpp
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
build
release-build
debug-build
analysis-build
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ endif()
if(ANALYZE)
find_program(CPPCHECK_PATH cppcheck DOC "Path to cppcheck when ANALYZE is enabled")
if(CPPCHECK_PATH)
set(CMAKE_CXX_CPPCHECK "${CPPCHECK_PATH};-DFT_USE_AUTOCONF_SIZEOF_TYPES;--enable=warning,performance,portability;--suppress=*:*sigc*")
set(CMAKE_CXX_CPPCHECK "${CPPCHECK_PATH};-DFT_USE_AUTOCONF_SIZEOF_TYPES;--enable=warning,performance,portability;--suppress=*:*sigc*;--suppress=*:*glibmm*")
message(STATUS "Found CPPCheck: ${CPPCHECK_PATH}")
else()
message(STATUS "CPPCheck not found")
6 changes: 1 addition & 5 deletions src/glscopeclient/WaveformArea_cairo.cpp
Original file line number Diff line number Diff line change
@@ -531,11 +531,7 @@ void WaveformArea::RenderChannelLabel(Cairo::RefPtr< Cairo::Context > cr)
//Add count info to eye channels
else if( (eye != NULL) && (ed != NULL) )
{

size_t uis = eye->GetTotalUIs();
float gbps = 1e3f / eye->GetUIWidth();

label += string("\n") + Unit(Unit::UNIT_UI).PrettyPrint(uis) + "\t" +
label += string("\n") + Unit(Unit::UNIT_UI).PrettyPrint(eye->GetTotalUIs()) + "\t" +
Unit(Unit::UNIT_BITRATE).PrettyPrint(1e12f / eye->GetUIWidth());

auto mask = ed->GetMask();