Skip to content

Commit 673b58c

Browse files
authored
o2-data-dump: use AliceO2::DebugGUI (#581)
This replaces the internal version with the common one, so that we can merge alisw/alidist#2728 with the Metal support.
1 parent ac6c143 commit 673b58c

22 files changed

Lines changed: 7 additions & 42684 deletions

Framework/CMakeLists.txt

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -196,26 +196,16 @@ endforeach()
196196
# ---- Gui ----
197197

198198
set(DATADUMP "")
199-
if(GLFW_FOUND)
199+
if(TARGET AliceO2::DebugGUI)
200200
set(DATADUMP "o2-qc-data-dump")
201201

202-
set(IMGUI_SRCS
203-
src/imgui/imgui.cpp
204-
src/imgui/imgui_draw.cpp
205-
src/imgui/imgui_impl_glfw_gl3.cpp
206-
src/imgui/gl3w.c
207-
src/imgui/imgui_widgets.cpp
208-
src/imgui/imgui_demo.cpp
209-
src/imgui/BaseGui.cxx)
210-
set_source_files_properties(${IMGUI_SRCS} PROPERTIES COMPILE_FLAGS -w)
211-
212202
set(GUI_SRCS src/DataDumpGui.cxx src/runDataDump.cxx)
213203

214-
add_executable(${DATADUMP} ${GUI_SRCS} ${IMGUI_SRCS})
204+
add_executable(${DATADUMP} ${GUI_SRCS})
215205

216-
target_link_libraries(${DATADUMP} PRIVATE QualityControl glfw)
206+
target_link_libraries(${DATADUMP} PRIVATE QualityControl AliceO2::DebugGUI)
217207
else()
218-
message(STATUS "GLFW not found, ${DATADUMP} will not be built")
208+
message(STATUS "DebugGUI not found, ${DATADUMP} will not be built")
219209
endif()
220210

221211
# ---- Tests ----

Framework/src/DataDumpGui.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#include "QualityControl/DataDumpGui.h"
1818
#include "QualityControl/QcInfoLogger.h"
1919
#include "QualityControl/stringUtils.h"
20-
#include "imgui/BaseGui.h"
21-
#include "imgui/imgui.h"
20+
#include <DebugGUI/DebugGUI.h>
21+
#include <DebugGUI/imgui.h>
2222
#include <Headers/DataHeader.h>
2323
#include <iomanip>
2424

@@ -253,4 +253,4 @@ void DataDumpGui::assignDataToChunk(void* data, size_t size, Chunk& chunk)
253253
chunk.data = copy;
254254
chunk.size = size;
255255
}
256-
} // namespace o2::quality_control::core
256+
} // namespace o2::quality_control::core

Framework/src/imgui/BaseGui.cxx

Lines changed: 0 additions & 98 deletions
This file was deleted.

Framework/src/imgui/BaseGui.h

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)