Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Reworked various API calls for v6 release (Initialize, IsInitialized, SetUnitName, GetVersionXXX) #1841

Merged
merged 8 commits into from
Dec 6, 2024

Conversation

hannemn
Copy link
Contributor

@hannemn hannemn commented Dec 6, 2024

Refers to issue #1832, section ecal_core.h.

Furthermore python and C wrapper signatures has been aligned with C++ API changes.

@hannemn hannemn added the cherry-pick-to-NONE Don't cherry-pick these changes label Dec 6, 2024
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 20 out of 162. Check the log or trigger a new build to see more.

@@ -209,7 +209,7 @@ int main(int argc, char** argv)
}

// initialize eCAL API
eCAL::Initialize(0, nullptr, "eCALMon CLI", eCAL::Init::All);
eCAL::Initialize("eCALMon CLI", eCAL::Init::All);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Init::All" is directly included [misc-include-cleaner]

app/mon/mon_cli/src/ecal_mon_cli.cpp:23:

- #include <atomic>
+ #include "ecal/ecal_init.h"
+ #include <atomic>

@@ -209,7 +209,7 @@
}

// initialize eCAL API
eCAL::Initialize(0, nullptr, "eCALMon CLI", eCAL::Init::All);
eCAL::Initialize("eCALMon CLI", eCAL::Init::All);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Initialize" is directly included [misc-include-cleaner]

app/mon/mon_cli/src/ecal_mon_cli.cpp:23:

- #include <atomic>
+ #include "ecal/ecal_core.h"
+ #include <atomic>

@@ -71,7 +71,7 @@ Ecalmon::Ecalmon(QWidget *parent)
, monitor_error_counter_(0)
{
// Just make sure that eCAL is initialized
eCAL::Initialize(0, nullptr, "eCALMon", eCAL::Init::Default | eCAL::Init::Monitoring);
eCAL::Initialize("eCALMon", eCAL::Init::Default | eCAL::Init::Monitoring);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Init::Default" is directly included [misc-include-cleaner]

app/mon/mon_gui/src/ecalmon.cpp:24:

- #include "widgets/about_dialog/about_dialog.h"
+ #include "ecal/ecal_init.h"
+ #include "widgets/about_dialog/about_dialog.h"

@@ -71,7 +71,7 @@
, monitor_error_counter_(0)
{
// Just make sure that eCAL is initialized
eCAL::Initialize(0, nullptr, "eCALMon", eCAL::Init::Default | eCAL::Init::Monitoring);
eCAL::Initialize("eCALMon", eCAL::Init::Default | eCAL::Init::Monitoring);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Init::Monitoring" is directly included [misc-include-cleaner]

  eCAL::Initialize("eCALMon", eCAL::Init::Default | eCAL::Init::Monitoring);
                                                                ^

@@ -71,7 +71,7 @@
, monitor_error_counter_(0)
{
// Just make sure that eCAL is initialized
eCAL::Initialize(0, nullptr, "eCALMon", eCAL::Init::Default | eCAL::Init::Monitoring);
eCAL::Initialize("eCALMon", eCAL::Init::Default | eCAL::Init::Monitoring);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Initialize" is directly included [misc-include-cleaner]

app/mon/mon_gui/src/ecalmon.cpp:24:

- #include "widgets/about_dialog/about_dialog.h"
+ #include "ecal/ecal_core.h"
+ #include "widgets/about_dialog/about_dialog.h"

@@ -159,7 +159,7 @@
//////////////////////////////////////////////////////////////////////////////

// Just make sure that eCAL is initialized
eCAL::Initialize(0, nullptr, "eCALPlayGUI", eCAL::Init::Default | eCAL::Init::Publisher | eCAL::Init::Service | eCAL::Init::Monitoring);
eCAL::Initialize("eCALPlayGUI", eCAL::Init::Default | eCAL::Init::Publisher | eCAL::Init::Service | eCAL::Init::Monitoring);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Initialize" is directly included [misc-include-cleaner]

app/play/play_gui/src/main.cpp:19:

- #include "ecal_play_gui.h"
+ #include "ecal/ecal_core.h"
+ #include "ecal_play_gui.h"

@@ -32,7 +32,7 @@ AboutDialog::AboutDialog(QWidget *parent)
ui_.version_label->setText("Version: " + QString(EcalPlayGlobals::VERSION_STRING));
ui_.ecalversion_label->setText("eCAL " + QString(ECAL_VERSION) + " (" + QString(ECAL_DATE) + ")");

ui_.ecal_runtime_version_string_label->setText(QString(eCAL::GetVersionString()) + " (" + QString(eCAL::GetVersionDateString()) + ")");
ui_.ecal_runtime_version_string_label->setText(QString::fromStdString(eCAL::GetVersionString()) + " (" + QString::fromStdString(eCAL::GetVersionDateString()) + ")");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::GetVersionDateString" is directly included [misc-include-cleaner]

  ui_.ecal_runtime_version_string_label->setText(QString::fromStdString(eCAL::GetVersionString()) + " (" + QString::fromStdString(eCAL::GetVersionDateString()) + ")");
                                                                                                                                        ^

@@ -32,7 +32,7 @@
ui_.version_label->setText("Version: " + QString(EcalPlayGlobals::VERSION_STRING));
ui_.ecalversion_label->setText("eCAL " + QString(ECAL_VERSION) + " (" + QString(ECAL_DATE) + ")");

ui_.ecal_runtime_version_string_label->setText(QString(eCAL::GetVersionString()) + " (" + QString(eCAL::GetVersionDateString()) + ")");
ui_.ecal_runtime_version_string_label->setText(QString::fromStdString(eCAL::GetVersionString()) + " (" + QString::fromStdString(eCAL::GetVersionDateString()) + ")");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::GetVersionString" is directly included [misc-include-cleaner]

app/play/play_gui/src/widgets/about_dialog/about_dialog.cpp:20:

- #include "ecal_play_globals.h"
+ #include "ecal/ecal_core.h"
+ #include "ecal_play_globals.h"

@@ -36,7 +36,7 @@ namespace eCAL

EcalRec::EcalRec()
{
eCAL::Initialize(0, nullptr, "eCALRecClient", eCAL::Init::Default | eCAL::Init::Monitoring);
eCAL::Initialize("eCALRecClient", eCAL::Init::Default | eCAL::Init::Monitoring);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Init::Default" is directly included [misc-include-cleaner]

app/rec/rec_client_core/src/ecal_rec.cpp:21:

- #include "ecal_rec_impl.h"
+ #include "ecal/ecal_init.h"
+ #include "ecal_rec_impl.h"

@@ -36,7 +36,7 @@

EcalRec::EcalRec()
{
eCAL::Initialize(0, nullptr, "eCALRecClient", eCAL::Init::Default | eCAL::Init::Monitoring);
eCAL::Initialize("eCALRecClient", eCAL::Init::Default | eCAL::Init::Monitoring);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Init::Monitoring" is directly included [misc-include-cleaner]

      eCAL::Initialize("eCALRecClient", eCAL::Init::Default | eCAL::Init::Monitoring);
                                                                          ^

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 20 out of 142. Check the log or trigger a new build to see more.

@@ -36,7 +36,7 @@ namespace eCAL

EcalRec::EcalRec()
{
eCAL::Initialize(0, nullptr, "eCALRecClient", eCAL::Init::Default | eCAL::Init::Monitoring);
eCAL::Initialize("eCALRecClient", eCAL::Init::Default | eCAL::Init::Monitoring);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Initialize" is directly included [misc-include-cleaner]

app/rec/rec_client_core/src/ecal_rec.cpp:21:

- #include "ecal_rec_impl.h"
+ #include "ecal/ecal_core.h"
+ #include "ecal_rec_impl.h"

@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
}

// Just make sure that eCAL is initialized
eCAL::Initialize(0, nullptr, "eCALRecGUI", eCAL::Init::Default | eCAL::Init::Service | eCAL::Init::Monitoring);
eCAL::Initialize("eCALRecGUI", eCAL::Init::Default | eCAL::Init::Service | eCAL::Init::Monitoring);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Init::Default" is directly included [misc-include-cleaner]

app/rec/rec_gui/src/main.cpp:19:

- #include "ecalrec_gui.h"
+ #include "ecal/ecal_init.h"
+ #include "ecalrec_gui.h"

@@ -136,7 +136,7 @@
}

// Just make sure that eCAL is initialized
eCAL::Initialize(0, nullptr, "eCALRecGUI", eCAL::Init::Default | eCAL::Init::Service | eCAL::Init::Monitoring);
eCAL::Initialize("eCALRecGUI", eCAL::Init::Default | eCAL::Init::Service | eCAL::Init::Monitoring);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Init::Monitoring" is directly included [misc-include-cleaner]

  eCAL::Initialize("eCALRecGUI", eCAL::Init::Default | eCAL::Init::Service | eCAL::Init::Monitoring);
                                                                                         ^

@@ -136,7 +136,7 @@
}

// Just make sure that eCAL is initialized
eCAL::Initialize(0, nullptr, "eCALRecGUI", eCAL::Init::Default | eCAL::Init::Service | eCAL::Init::Monitoring);
eCAL::Initialize("eCALRecGUI", eCAL::Init::Default | eCAL::Init::Service | eCAL::Init::Monitoring);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Init::Service" is directly included [misc-include-cleaner]

  eCAL::Initialize("eCALRecGUI", eCAL::Init::Default | eCAL::Init::Service | eCAL::Init::Monitoring);
                                                                   ^

@@ -136,7 +136,7 @@
}

// Just make sure that eCAL is initialized
eCAL::Initialize(0, nullptr, "eCALRecGUI", eCAL::Init::Default | eCAL::Init::Service | eCAL::Init::Monitoring);
eCAL::Initialize("eCALRecGUI", eCAL::Init::Default | eCAL::Init::Service | eCAL::Init::Monitoring);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Initialize" is directly included [misc-include-cleaner]

app/rec/rec_gui/src/main.cpp:19:

- #include "ecalrec_gui.h"
+ #include "ecal/ecal_core.h"
+ #include "ecalrec_gui.h"

@@ -113,7 +113,7 @@
logger->info("eCAL Sys Client was started with " + accept_security_risk_arg.longID() + ". Not displaying security warning.");
}

eCAL::Initialize(argc, argv, "eCALSysClient", eCAL::Init::Default | eCAL::Init::Monitoring);
eCAL::Initialize("eCALSysClient", eCAL::Init::Default | eCAL::Init::Monitoring);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Init::Monitoring" is directly included [misc-include-cleaner]

  eCAL::Initialize("eCALSysClient", eCAL::Init::Default | eCAL::Init::Monitoring);
                                                                      ^

@@ -113,7 +113,7 @@
logger->info("eCAL Sys Client was started with " + accept_security_risk_arg.longID() + ". Not displaying security warning.");
}

eCAL::Initialize(argc, argv, "eCALSysClient", eCAL::Init::Default | eCAL::Init::Monitoring);
eCAL::Initialize("eCALSysClient", eCAL::Init::Default | eCAL::Init::Monitoring);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Initialize" is directly included [misc-include-cleaner]

app/sys/sys_client_cli/src/ecal_sys_client_cli.cpp:31:

- #include "ecal_sys_client_service.h"
+ #include "ecal/ecal_core.h"
+ #include "ecal_sys_client_service.h"

@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
//////////////////////////////////////////////////////////////////////////////

// Just make sure that eCAL is initialized
eCAL::Initialize(argc, argv, "eCALSysGUI", eCAL::Init::All);
eCAL::Initialize("eCALSysGUI", eCAL::Init::All);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Init::All" is directly included [misc-include-cleaner]

app/sys/sys_gui/src/main.cpp:19:

- #include "ecalsys_gui.h"
+ #include "ecal/ecal_init.h"
+ #include "ecalsys_gui.h"

@@ -144,7 +144,7 @@
//////////////////////////////////////////////////////////////////////////////

// Just make sure that eCAL is initialized
eCAL::Initialize(argc, argv, "eCALSysGUI", eCAL::Init::All);
eCAL::Initialize("eCALSysGUI", eCAL::Init::All);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::Initialize" is directly included [misc-include-cleaner]

app/sys/sys_gui/src/main.cpp:19:

- #include "ecalsys_gui.h"
+ #include "ecal/ecal_core.h"
+ #include "ecalsys_gui.h"

@@ -32,7 +32,7 @@ AboutDialog::AboutDialog(QWidget *parent)
ui_.version_label->setText("Version: " + QString(ECAL_SYS_VERSION_STRING));
ui_.ecalversion_label->setText("eCAL " + QString(ECAL_VERSION) + " (" + QString(ECAL_DATE) + ")");

ui_.ecal_runtime_version_string_label->setText(QString(eCAL::GetVersionString()) + " (" + QString(eCAL::GetVersionDateString()) + ")");
ui_.ecal_runtime_version_string_label->setText(QString::fromStdString(eCAL::GetVersionString()) + " (" + QString::fromStdString(eCAL::GetVersionDateString()) + ")");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "eCAL::GetVersionDateString" is directly included [misc-include-cleaner]

  ui_.ecal_runtime_version_string_label->setText(QString::fromStdString(eCAL::GetVersionString()) + " (" + QString::fromStdString(eCAL::GetVersionDateString()) + ")");
                                                                                                                                        ^

@rex-schilasky rex-schilasky merged commit a451039 into master Dec 6, 2024
20 checks passed
@rex-schilasky rex-schilasky deleted the feature/ecal-core-api-v6 branch December 6, 2024 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-to-NONE Don't cherry-pick these changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants