Commit f5888225 authored by Robert Schmidt's avatar Robert Schmidt

Merge remote-tracking branch 'origin/imscope-docking' into integration_2024_w48 (!3030)

Imscope updates

- Using imgui docking branch - allows window docking.
- Moved scopes to different windows to allow docking.
- Disabled scatterplot for time domain samples - issues with amount of
  vertices caused segfaults.
- Disabled IQ heatmaps for RX IQ samples on gNB and UE - this was
  incorrect and currently I don't know how to fix it. This will be
  reenabled once it is.
- added a simple menu and disabled demo windows by default.
parents ca3739e8 f64451bd
......@@ -621,7 +621,6 @@ static void rx_rf(RU_t *ru, int *frame, int *slot)
rxp,
samples_per_slot,
ru->nb_rx);
gNBscopeCopy(ru, gNbTimeDomainSamples, rxp[0], sizeof(c16_t), 1, samples_per_slot, 0);
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 0 );
......@@ -692,6 +691,11 @@ static void rx_rf(RU_t *ru, int *frame, int *slot)
*slot = proc->tti_rx;
}
if (!emulate_rf) {
metadata mt = {.slot = *slot, .frame = *frame};
gNBscopeCopyWithMetadata(ru, gNbTimeDomainSamples, rxp[0], sizeof(c16_t), 1, samples_per_slot, 0, &mt);
}
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TS, (proc->timestamp_rx+ru->ts_offset)&0xffffffff );
if (rxs != samples_per_slot) {
......
CPMAddPackage("gh:ocornut/imgui#v1.90.9")
CPMAddPackage("gh:ocornut/imgui#v1.91.3-docking")
add_library(imgui
${imgui_SOURCE_DIR}/imgui_draw.cpp
${imgui_SOURCE_DIR}/imgui.cpp
......@@ -32,3 +32,4 @@ target_include_directories(implot PUBLIC ${implot_SOURCE_DIR})
add_library(imscope MODULE imscope.cpp ../phy_scope_interface.c)
target_link_libraries(imscope PUBLIC imgui_glfw_backend glfw imgui_opengl_renderer OpenGL::OpenGL implot UTIL)
set_target_properties(imscope PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
configure_file(imgui.ini ${CMAKE_BINARY_DIR}/imscope-init.ini COPYONLY)
[Window][Debug##Default]
Pos=60,60
Size=400,400
Collapsed=0
[Window][NR KPI]
Pos=0,19
Size=1133,667
Collapsed=0
DockId=0x00000005,0
[Window][Dear ImGui Demo]
Pos=531,19
Size=529,667
Collapsed=0
DockId=0x00000002,0
[Window][ImPlot Demo]
Pos=531,19
Size=529,667
Collapsed=0
DockId=0x00000002,0
[Window][WindowOverViewport_11111111]
Pos=0,19
Size=1280,701
Collapsed=0
[Window][Status bar]
Pos=0,688
Size=1280,32
Collapsed=0
DockId=0x00000004,0
[Window][Global scope settings]
Pos=1038,19
Size=242,667
Collapsed=0
DockId=0x00000006,0
[Window][UE KPI]
Pos=532,19
Size=528,667
Collapsed=0
DockId=0x00000008,0
[Window][UE PDSCH IQ]
Pos=0,19
Size=530,667
Collapsed=0
DockId=0x00000005,1
[Window][Time domain samples]
Pos=0,19
Size=1036,667
Collapsed=0
DockId=0x00000005,0
[Window][Time domain samples - before sync]
Pos=0,19
Size=530,667
Collapsed=0
DockId=0x00000005,2
[Window][Broadcast channel]
Pos=0,19
Size=530,667
Collapsed=0
DockId=0x00000005,3
[Window][RX IQ]
Pos=532,19
Size=528,667
Collapsed=0
DockId=0x00000008,0
[Window][PUSCH SLOT IQ]
Pos=0,19
Size=1036,667
Collapsed=0
DockId=0x00000005,1
[Window][PUSCH LLRs]
Pos=0,19
Size=1036,667
Collapsed=0
DockId=0x00000005,2
[Docking][Data]
DockSpace ID=0x7C6B3D9B Window=0xA87D555D Pos=0,19 Size=1280,701 Split=Y Selected=0x71C89FCB
DockNode ID=0x00000003 Parent=0x7C6B3D9B SizeRef=1280,667 Split=X
DockNode ID=0x00000001 Parent=0x00000003 SizeRef=1319,720 Split=X Selected=0x6627CA6C
DockNode ID=0x00000007 Parent=0x00000001 SizeRef=530,667 Split=X Selected=0x93FDECFF
DockNode ID=0x00000005 Parent=0x00000007 SizeRef=1036,334 CentralNode=1 Selected=0x93FDECFF
DockNode ID=0x00000006 Parent=0x00000007 SizeRef=242,334 Selected=0xFAA8D9D5
DockNode ID=0x00000008 Parent=0x00000001 SizeRef=528,667 Selected=0x6627CA6C
DockNode ID=0x00000002 Parent=0x00000003 SizeRef=529,720 Selected=0xB903C8C9
DockNode ID=0x00000004 Parent=0x7C6B3D9B SizeRef=1280,32 HiddenTabBar=1 Selected=0xD9B9B9C7
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment