DPL GUI: introduce namespace gui for getGUIDebugger

Author: ktf

Framework/Core/include/Framework/FrameworkGUIDebugger.h

@@ -26,10 +26,13 @@ namespace framework
 class DriverInfo;
 class DriverControl;
 
+namespace gui
+{
 std::function<void(void)> getGUIDebugger(const std::vector<DeviceInfo>& infos, const std::vector<DeviceSpec>& devices,
                                          const std::vector<DeviceMetricsInfo>& metricsInfos,
                                          const DriverInfo& driverInfo, std::vector<DeviceControl>& controls,
                                          DriverControl& driverControl);
+} // namespace gui
 } // namespace framework
 } // namespace o2
 #endif // FRAMEWORK_FRAMEWORKGUIDEBUGGER_H

Framework/Core/src/FrameworkDummyDebugger.cxx

@@ -15,7 +15,8 @@ namespace o2
 {
 namespace framework
 {
-
+namespace gui
+{
 // Dummy function in case we want to build without debugger.
 std::function<void(void)> getGUIDebugger(const std::vector<DeviceInfo>& infos, const std::vector<DeviceSpec>& devices,
                                          const std::vector<DeviceMetricsInfo>& metricsInfos,
@@ -27,5 +28,6 @@ std::function<void(void)> getGUIDebugger(const std::vector<DeviceInfo>& infos, c
 
 void showNodeGraph(bool* opened) {}
 
+} // namespace gui
 } // namespace framework
 } // namespace o2

Framework/Core/src/FrameworkGUIDebugger.cxx

@@ -31,6 +31,8 @@ namespace o2
 {
 namespace framework
 {
+namespace gui
+{
 // Type erased information for the plotting
 struct MultiplotData {
   int mod;
@@ -41,10 +43,11 @@ struct MultiplotData {
   MetricType type;
 };
 
+} // namespace gui
 } // namespace framework
 } // namespace o2
 
-template class std::vector<o2::framework::MultiplotData>;
+template class std::vector<o2::framework::gui::MultiplotData>;
 
 namespace o2
 {

Framework/Core/src/runDataProcessing.cxx

@@ -721,7 +721,7 @@ int runStateMachine(DataProcessorSpecs const& workflow, DriverControl& driverCon
   auto resourceManager = std::make_unique<SimpleResourceManager>(driverInfo.startPort, driverInfo.portRange);
 
   void* window = nullptr;
-  decltype(getGUIDebugger(infos, deviceSpecs, metricsInfos, driverInfo, controls, driverControl)) debugGUICallback;
+  decltype(gui::getGUIDebugger(infos, deviceSpecs, metricsInfos, driverInfo, controls, driverControl)) debugGUICallback;
 
   // An empty frameworkId means this is the driver, so we initialise the GUI
   if (driverInfo.batch == false && frameworkId.empty()) {
@@ -823,7 +823,7 @@ int runStateMachine(DataProcessorSpecs const& workflow, DriverControl& driverCon
         // We need to recreate the GUI callback every time we reschedule
         // because getGUIDebugger actually recreates the GUI state.
         if (window) {
-          debugGUICallback = getGUIDebugger(infos, deviceSpecs, metricsInfos, driverInfo, controls, driverControl);
+          debugGUICallback = gui::getGUIDebugger(infos, deviceSpecs, metricsInfos, driverInfo, controls, driverControl);
         }
         break;
       case DriverState::SCHEDULE: