Skip to content

Commit

Permalink
Additional renames.
Browse files Browse the repository at this point in the history
  • Loading branch information
Peguen committed Jan 24, 2025
1 parent 034d685 commit 6c0e6eb
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ ProcessWidget::ProcessWidget(QWidget *parent)
host.name = "Host";
preconfigured_group_by_settings.push_back(host);

EcalmonTreeWidget::GroupSetting host_group;
host_group.group_by_columns = { (int)ProcessTreeModel::Columns::HOST_GROUP_NAME };
host_group.auto_expand = 0;
host_group.name = "Host Group";
preconfigured_group_by_settings.push_back(host_group);
EcalmonTreeWidget::GroupSetting shm_transport_domain;
shm_transport_domain.group_by_columns = { (int)ProcessTreeModel::Columns::SHM_TRANSPORT_DOMAIN };
shm_transport_domain.auto_expand = 0;
shm_transport_domain.name = "SHM Transport Domain";
preconfigured_group_by_settings.push_back(shm_transport_domain);

setGroupSettings(preconfigured_group_by_settings, group_by_enabled_columns);

Expand Down
10 changes: 5 additions & 5 deletions app/mon/mon_gui/src/widgets/models/process_tree_item.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ QVariant ProcessTreeItem::data(Columns column, Qt::ItemDataRole role) const
{
return process_.hname().c_str();
}
else if (column == Columns::HGNAME)
else if (column == Columns::SHM_TRANSPORT_DOMAIN)
{
return process_.hgname().c_str();
return process_.shm_transport_domain().c_str();
}
else if (column == Columns::PID)
{
Expand Down Expand Up @@ -118,7 +118,7 @@ QVariant ProcessTreeItem::data(Columns column, Qt::ItemDataRole role) const
else if ((role == Qt::ItemDataRole::DisplayRole) || (role == Qt::ItemDataRole::ToolTipRole))
{
if ((column == Columns::HNAME)
|| (column == Columns::HGNAME)
|| (column == Columns::SHM_TRANSPORT_DOMAIN)
|| (column == Columns::PNAME)
|| (column == Columns::UNAME))
{
Expand Down Expand Up @@ -157,7 +157,7 @@ QVariant ProcessTreeItem::data(Columns column, Qt::ItemDataRole role) const
else if (role == (Qt::ItemDataRole)ItemDataRoles::FilterRole) //-V1016 //-V547
{
if ((column == Columns::HNAME)
|| (column == Columns::HGNAME)
|| (column == Columns::SHM_TRANSPORT_DOMAIN)
|| (column == Columns::PNAME)
|| (column == Columns::UNAME))
{
Expand Down Expand Up @@ -243,7 +243,7 @@ QVariant ProcessTreeItem::data(Columns column, Qt::ItemDataRole role) const
else if (role == Qt::ItemDataRole::FontRole)
{
if ((column == Columns::HNAME)
|| (column == Columns::HGNAME)
|| (column == Columns::SHM_TRANSPORT_DOMAIN)
|| (column == Columns::PNAME)
|| (column == Columns::UNAME))
{
Expand Down
4 changes: 2 additions & 2 deletions app/mon/mon_gui/src/widgets/models/process_tree_model.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class ProcessTreeModel : public GroupTreeModel
{ Columns::GROUP, "Group" },
{ Columns::UNIT_NAME, "Process" },
{ Columns::HOST_NAME, "Host" },
{ Columns::HOST_GROUP_NAME, "Host Group" },
{ Columns::SHM_TRANSPORT_DOMAIN, "Host Group" },
{ Columns::PID, "PID" },
{ Columns::PROCESS_NAME, "Process Path" },
{ Columns::PARAMETERS, "Command line" },
Expand All @@ -104,7 +104,7 @@ class ProcessTreeModel : public GroupTreeModel
{ Columns::GROUP, -1 },
{ Columns::UNIT_NAME, (int)ProcessTreeItem::Columns::UNAME },
{ Columns::HOST_NAME, (int)ProcessTreeItem::Columns::HNAME },
{ Columns::HOST_GROUP_NAME, (int)ProcessTreeItem::Columns::SHM_TRANSPORT_DOMAIN},
{ Columns::SHM_TRANSPORT_DOMAIN, (int)ProcessTreeItem::Columns::SHM_TRANSPORT_DOMAIN},
{ Columns::PID, (int)ProcessTreeItem::Columns::PID },
{ Columns::PROCESS_NAME, (int)ProcessTreeItem::Columns::PNAME },
{ Columns::PARAMETERS, (int)ProcessTreeItem::Columns::PPARAM },
Expand Down
10 changes: 5 additions & 5 deletions app/mon/mon_gui/src/widgets/models/topic_tree_item.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ========================= eCAL LICENSE =================================
*
* Copyright (C) 2016 - 2024 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.
Expand Down Expand Up @@ -52,9 +52,9 @@ QVariant TopicTreeItem::data(Columns column, Qt::ItemDataRole role) const
{
return topic_.hname().c_str();
}
else if (column == Columns::HGNAME)
else if (column == Columns::SHM_TRANSPORT_DOMAIN)
{
return topic_.hgname().c_str();
return topic_.shm_transport_domain().c_str();
}
else if (column == Columns::PID)
{
Expand Down Expand Up @@ -234,7 +234,7 @@ QVariant TopicTreeItem::data(Columns column, Qt::ItemDataRole role) const
else if (role == (Qt::ItemDataRole)ItemDataRoles::FilterRole) //-V1016 //-V547
{
if ((column == Columns::HNAME)
|| (column == Columns::HGNAME)
|| (column == Columns::SHM_TRANSPORT_DOMAIN)
|| (column == Columns::PNAME)
|| (column == Columns::UNAME)
|| (column == Columns::TNAME)
Expand Down Expand Up @@ -299,7 +299,7 @@ QVariant TopicTreeItem::data(Columns column, Qt::ItemDataRole role) const
{

if ((column == Columns::HNAME)
|| (column == Columns::HGNAME)
|| (column == Columns::SHM_TRANSPORT_DOMAIN)
|| (column == Columns::PNAME)
|| (column == Columns::UNAME)
|| (column == Columns::TNAME)
Expand Down
4 changes: 2 additions & 2 deletions doc/rst/configuration/options.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ Registration settings are listed in the section ``registration``

enable to receive registration information on the same local machine

.. option:: host_group_name
.. option:: shm_transport_domain

``<hostname>``, default ``""``

host group name that enables interprocess mechanisms across (virtual) host borders (e.g. Docker);
shm transport domain that enables interprocess mechanisms across (virtual) host borders (e.g. Docker);
by default equivalent to local host name

.. option:: network_enabled
Expand Down
4 changes: 2 additions & 2 deletions ecal/tests/cpp/config_test/src/ini_file.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ const std::string ini_file_as_string_yaml = R"(# _____ _ _
registration_timeout: 60000
# Enable to receive registration information on the same local machine
loopback: true
# Host group name that enables interprocess mechanisms across (virtual)
# Shm transport domain that enables interprocess mechanisms across (virtual)
# host borders (e.g, Docker); by default equivalent to local host name
host_group_name: ""
shm_transport_domain: ""
# true = all eCAL components communicate over network boundaries
# false = local host only communication (Default: false)
network_enabled: false
Expand Down
8 changes: 4 additions & 4 deletions lang/python/core/src/ecal_wrap.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -948,8 +948,8 @@ namespace
val = Py_BuildValue("s", topic.hname.c_str());
PyDict_SetItemString(topicDict, "hname", val); Py_DECREF(val);

val = Py_BuildValue("s", topic.hgname.c_str());
PyDict_SetItemString(topicDict, "hgname", val); Py_DECREF(val);
val = Py_BuildValue("s", topic.shm_transport_domain.c_str());
PyDict_SetItemString(topicDict, "shm_transport_domain", val); Py_DECREF(val);

val = Py_BuildValue("i", topic.pid);
PyDict_SetItemString(topicDict, "pid", val); Py_DECREF(val);
Expand Down Expand Up @@ -1060,8 +1060,8 @@ PyObject* mon_monitoring(PyObject* /*self*/, PyObject* /*args*/)
val = Py_BuildValue("s", process.hname.c_str());
PyDict_SetItemString(processDict, "hname", val); Py_DECREF(val);

val = Py_BuildValue("s", process.hgname.c_str());
PyDict_SetItemString(processDict, "hgname", val); Py_DECREF(val);
val = Py_BuildValue("s", process.shm_transport_domain.c_str());
PyDict_SetItemString(processDict, "shm_transport_domain", val); Py_DECREF(val);

val = Py_BuildValue("i", process.pid);
PyDict_SetItemString(processDict, "pid", val); Py_DECREF(val);
Expand Down

0 comments on commit 6c0e6eb

Please sign in to comment.