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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d401cc8cde02
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bb45a1a269d5
Choose a head ref
  • 1 commit
  • 7 files changed
  • 1 contributor

Commits on Jan 1, 2020

  1. Moved graph widget to a new repo so we can use it in other projects

    @azonenberg
    azonenberg committed Jan 1, 2020
    Copy the full SHA
    bb45a1a View commit details
Showing with 6 additions and 556 deletions.
  1. +3 −0 .gitmodules
  2. +1 −0 graphwidget
  3. +1 −3 scopehal/CMakeLists.txt
  4. +0 −371 scopehal/Graph.cpp
  5. +0 −136 scopehal/Graph.h
  6. +0 −42 scopehal/scopehal.cpp
  7. +1 −4 scopehal/scopehal.h
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -4,3 +4,6 @@
[submodule "log"]
path = log
url = https://github.com/azonenberg/logtools.git
[submodule "graphwidget"]
path = graphwidget
url = git@github.com:azonenberg/graphwidget.git
1 change: 1 addition & 0 deletions graphwidget
Submodule graphwidget added at 821587
4 changes: 1 addition & 3 deletions scopehal/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@ set(SCOPEHAL_SOURCES
ChannelRenderer.cpp
DigitalRenderer.cpp
TextRenderer.cpp
Graph.cpp

SCPITransport.cpp
SCPISocketTransport.cpp
@@ -39,8 +38,7 @@ set(SCOPEHAL_SOURCES

add_library(scopehal SHARED
${SCOPEHAL_SOURCES})
target_link_libraries(scopehal ${SIGCXX_LIBRARIES} ${GTKMM_LIBRARIES})
target_link_libraries(scopehal xptools log)
target_link_libraries(scopehal ${SIGCXX_LIBRARIES} ${GTKMM_LIBRARIES} xptools log graphwidget)

target_include_directories(scopehal
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
371 changes: 0 additions & 371 deletions scopehal/Graph.cpp
View file

This file was deleted.

Loading