Martino FerrariandClaude Opus 4.6
a92a6b5bf0
The flicker ("no data" at no constant frequency, worse with the measurements
and cursors panes up) was a torn read of the window's first stamp: acquire()
pins the window to the ring's oldest slot, and reading it at paint time races
the producer lapping it, returning a stamp one ring span too new. x0() is the
origin every trace point is reconstructed from, so one torn read produced a
refused neighbours(), a filter that dropped three quarters of the points, and
a polyline shifted off its axis. It is cached by acquire() under the lock now.
EventSeries::neighbours() answered from the (x - x0)/dx grid, whose drift from
the real arrival stamps arrives as a constant offset in seconds -- a doubling
share of the screen per zoom step, which is the "zooming into a held event
clips it more from the left" report. Both series binary-search the stamps now.
The measurements pane went through the LOD pyramid rather than reading its
window raw (19.7 ms per recompute to 1.2 ms, 0.1% of a 2 M-sample window) and
recomputes on a cadence; the math engine lost a per-slot heap allocation, a
per-sample source lookup by name and a fetch_add that cost more than the
arithmetic it counted.
The cursors pane's mix mode drew a line per *named* slot, so a slot holding a
signal that can never produce a channel -- the stream's timestamp -- got a row
that could only read "--", and such names were re-saved every session. It
counts bound traces now and apply_layout() refuses them.
Four toolbar icons are drawn for this app and compiled in as a GResource: the
stock ones were a record dot for the trigger and three magnifiers for cursors,
measurements and math.
New probes and dump lines for all of it (trace ink, measure cost, math cost,
event zoom, toolbar icons); README and CLAUDE.md record what they cure.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
76 lines
3.0 KiB
CMake
76 lines
3.0 KiB
CMake
cmake_minimum_required(VERSION 3.24)
|
|
project(udpscope LANGUAGES C CXX)
|
|
|
|
set(CMAKE_CXX_STANDARD 20)
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
|
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
|
|
|
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
|
|
set(CMAKE_BUILD_TYPE Release CACHE STRING "" FORCE)
|
|
endif()
|
|
|
|
find_package(Threads REQUIRED)
|
|
|
|
# --- deps/plotter: built from the submodule, GTK4 adapter only ----------------
|
|
set(PLOT_BUILD_TESTS OFF CACHE BOOL "" FORCE)
|
|
set(PLOT_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
|
|
set(PLOT_BUILD_GLFW OFF CACHE BOOL "" FORCE)
|
|
set(PLOT_BUILD_IMGUI OFF CACHE BOOL "" FORCE)
|
|
set(PLOT_BUILD_QT6 OFF CACHE BOOL "" FORCE)
|
|
set(PLOT_BUILD_GTK4 ON CACHE BOOL "" FORCE)
|
|
set(PLOT_INSTALL OFF CACHE BOOL "" FORCE)
|
|
add_subdirectory(deps/plotter EXCLUDE_FROM_ALL)
|
|
|
|
# --- deps/udpsclient: vendored C99 receiver ----------------------------------
|
|
add_library(udpsclient STATIC deps/udpsclient/udps_client.c)
|
|
target_include_directories(udpsclient PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/deps/udpsclient)
|
|
set_target_properties(udpsclient PROPERTIES C_STANDARD 99 C_STANDARD_REQUIRED ON)
|
|
if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
|
|
target_compile_options(udpsclient PRIVATE -Wall -Wextra)
|
|
endif()
|
|
|
|
# --- icons: four symbolic SVGs compiled into the binary -----------------------
|
|
# There is no stock icon for an oscilloscope trigger, a pair of cursors or a measurement
|
|
# ruler, so this app draws its own. They go in a GResource rather than beside the binary
|
|
# because udpscope is run straight out of the build tree and has no install step: a
|
|
# search path would have to be located at runtime, and the failure mode of not locating
|
|
# it is a silent missing-image placeholder.
|
|
find_program(GLIB_COMPILE_RESOURCES NAMES glib-compile-resources REQUIRED)
|
|
set(UDPSCOPE_ICON_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/icons)
|
|
file(GLOB UDPSCOPE_ICON_FILES CONFIGURE_DEPENDS
|
|
${UDPSCOPE_ICON_DIR}/scalable/actions/*.svg)
|
|
add_custom_command(
|
|
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/udpscope_resources.c
|
|
COMMAND ${GLIB_COMPILE_RESOURCES}
|
|
--target=${CMAKE_CURRENT_BINARY_DIR}/udpscope_resources.c
|
|
--sourcedir=${UDPSCOPE_ICON_DIR}
|
|
--generate-source
|
|
${UDPSCOPE_ICON_DIR}/udpscope.gresource.xml
|
|
DEPENDS ${UDPSCOPE_ICON_DIR}/udpscope.gresource.xml ${UDPSCOPE_ICON_FILES}
|
|
COMMENT "Compiling udpscope icon resources"
|
|
VERBATIM)
|
|
|
|
# --- the application ----------------------------------------------------------
|
|
add_executable(udpscope
|
|
${CMAKE_CURRENT_BINARY_DIR}/udpscope_resources.c
|
|
src/main.cpp
|
|
src/config.cpp
|
|
src/channel.cpp
|
|
src/model.cpp
|
|
src/trigger.cpp
|
|
src/acquisition.cpp
|
|
src/plot_host.cpp
|
|
src/export.cpp
|
|
src/layout_store.cpp
|
|
src/measure.cpp
|
|
src/math_channel.cpp
|
|
src/ui.cpp
|
|
)
|
|
|
|
target_include_directories(udpscope PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
|
|
target_link_libraries(udpscope PRIVATE plot::gtk4 udpsclient Threads::Threads)
|
|
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
|
|
target_compile_options(udpscope PRIVATE -Wall -Wextra -Wpedantic)
|
|
endif()
|