diff --git a/app/mon/mon_gui/src/widgets/ecalmon_tree_widget/process_widget.cpp b/app/mon/mon_gui/src/widgets/ecalmon_tree_widget/process_widget.cpp index f1fcdba3c6..752cb4a667 100644 --- a/app/mon/mon_gui/src/widgets/ecalmon_tree_widget/process_widget.cpp +++ b/app/mon/mon_gui/src/widgets/ecalmon_tree_widget/process_widget.cpp @@ -1,6 +1,6 @@ /* ========================= eCAL LICENSE ================================= * - * Copyright (C) 2016 - 2019 Continental Corporation + * Copyright (C) 2016 - 2025 Continental Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -138,6 +138,7 @@ void ProcessWidget::autoSizeColumns() (int)ProcessTreeModel::Columns::TIMESYNC_MOD_NAME, (int)ProcessTreeModel::Columns::COMPONENT_INIT_INFO, (int)ProcessTreeModel::Columns::ECAL_RUNTIME_VERSION, + (int)ProcessTreeModel::Columns::CONFIG_FILE_PATH, }; for (int column : columns_to_resize) diff --git a/app/mon/mon_gui/src/widgets/models/process_tree_item.cpp b/app/mon/mon_gui/src/widgets/models/process_tree_item.cpp index fce556388f..d502c7abf4 100644 --- a/app/mon/mon_gui/src/widgets/models/process_tree_item.cpp +++ b/app/mon/mon_gui/src/widgets/models/process_tree_item.cpp @@ -1,6 +1,6 @@ /* ========================= eCAL LICENSE ================================= * - * Copyright (C) 2016 - 2019 Continental Corporation + * Copyright (C) 2016 - 2025 Continental Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -105,6 +105,10 @@ QVariant ProcessTreeItem::data(Columns column, Qt::ItemDataRole role) const { return process_.ecal_runtime_version().c_str(); } + else if (column == Columns::CONFIG_FILE_PATH) + { + return process_.config_file_path().c_str(); + } else { return QVariant(); diff --git a/app/mon/mon_gui/src/widgets/models/process_tree_item.h b/app/mon/mon_gui/src/widgets/models/process_tree_item.h index 62aa0642a8..071933dce8 100644 --- a/app/mon/mon_gui/src/widgets/models/process_tree_item.h +++ b/app/mon/mon_gui/src/widgets/models/process_tree_item.h @@ -1,6 +1,6 @@ /* ========================= eCAL LICENSE ================================= * - * Copyright (C) 2016 - 2019 Continental Corporation + * Copyright (C) 2016 - 2025 Continental Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,7 +49,8 @@ class ProcessTreeItem : TSYNC_STATE, TSYNC_MOD_NAME, COMPONENT_INIT_INFO, - ECAL_RUNTIME_VERSION + ECAL_RUNTIME_VERSION, + CONFIG_FILE_PATH }; ProcessTreeItem(); diff --git a/app/mon/mon_gui/src/widgets/models/process_tree_model.h b/app/mon/mon_gui/src/widgets/models/process_tree_model.h index bfd6758aa5..2f9ae88653 100644 --- a/app/mon/mon_gui/src/widgets/models/process_tree_model.h +++ b/app/mon/mon_gui/src/widgets/models/process_tree_model.h @@ -1,6 +1,6 @@ /* ========================= eCAL LICENSE ================================= * - * Copyright (C) 2016 - 2019 Continental Corporation + * Copyright (C) 2016 - 2025 Continental Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,6 +59,7 @@ class ProcessTreeModel : public GroupTreeModel TIMESYNC_MOD_NAME, COMPONENT_INIT_INFO, ECAL_RUNTIME_VERSION, + CONFIG_FILE_PATH, COLUMN_COUNT }; @@ -95,6 +96,7 @@ class ProcessTreeModel : public GroupTreeModel { Columns::TIMESYNC_MOD_NAME, "Timesync Mod Name" }, { Columns::COMPONENT_INIT_INFO, "Component Initialization" }, { Columns::ECAL_RUNTIME_VERSION, "eCAL Runtime Version" }, + { Columns::CONFIG_FILE_PATH, "Loaded configuration file" }, }; std::map column_mapping = @@ -113,6 +115,7 @@ class ProcessTreeModel : public GroupTreeModel { Columns::TIMESYNC_MOD_NAME, (int)ProcessTreeItem::Columns::TSYNC_MOD_NAME }, { Columns::COMPONENT_INIT_INFO, (int)ProcessTreeItem::Columns::COMPONENT_INIT_INFO }, { Columns::ECAL_RUNTIME_VERSION, (int)ProcessTreeItem::Columns::ECAL_RUNTIME_VERSION }, + { Columns::CONFIG_FILE_PATH, (int)ProcessTreeItem::Columns::CONFIG_FILE_PATH }, }; std::map tree_item_map_; diff --git a/ecal/core/include/ecal/config/configuration.h b/ecal/core/include/ecal/config/configuration.h index 3f9e65b371..f6827da3f0 100644 --- a/ecal/core/include/ecal/config/configuration.h +++ b/ecal/core/include/ecal/config/configuration.h @@ -61,6 +61,6 @@ namespace eCAL ECAL_API std::string GetYamlFilePath() const; protected: - std::string ecal_yaml_file_path; + std::string ecal_yaml_file_path = "abc"; }; } diff --git a/ecal/core/include/ecal/types/monitoring.h b/ecal/core/include/ecal/types/monitoring.h index 507da49ffa..ecc6c15bce 100644 --- a/ecal/core/include/ecal/types/monitoring.h +++ b/ecal/core/include/ecal/types/monitoring.h @@ -129,6 +129,7 @@ namespace eCAL std::string component_init_info; //!< like comp_init_state as human readable string (pub|sub|srv|mon|log|time|proc) std::string ecal_runtime_version; //!< loaded / runtime eCAL version of a component + std::string config_file_path; //!< Filepath of the configuration filepath that was loaded }; struct SMethodMon //