Merge branch 'rolling' into ahcorde/rolling/qt6

ros-visualization · Jul 10, 2024 · 04f1d5d · 04f1d5d
2 parents 978dce2 + 93dc7e3
commit 04f1d5d
Show file tree

Hide file tree

Showing 57 changed files with 1,425 additions and 892 deletions.
diff --git a/qt_dotgraph/CHANGELOG.rst b/qt_dotgraph/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package qt_dotgraph
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.8.1 (2024-06-25)
+------------------
+* Skip running the tests on Windows Debug. (`#292 <https://github.com/ros-visualization/qt_gui_core/issues/292>`_)
+* Contributors: Chris Lalancette
+
 2.8.0 (2024-04-26)
 ------------------
 

diff --git a/qt_dotgraph/package.xml b/qt_dotgraph/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>qt_dotgraph</name>
-  <version>2.8.0</version>
+  <version>2.8.1</version>
   <description>
     qt_dotgraph provides helpers to work with dot graphs.
   </description>

diff --git a/qt_gui/CHANGELOG.rst b/qt_gui/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package qt_gui
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.8.1 (2024-06-25)
+------------------
+
 2.8.0 (2024-04-26)
 ------------------
 

diff --git a/qt_gui/package.xml b/qt_gui/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>qt_gui</name>
-  <version>2.8.0</version>
+  <version>2.8.1</version>
   <description>
     qt_gui provides the infrastructure for an integrated graphical user interface based on Qt.
     It is extensible with Python- and C++-based plugins (implemented in separate packages) which can contribute arbitrary widgets.

diff --git a/qt_gui_app/CHANGELOG.rst b/qt_gui_app/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package qt_gui_app
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.8.1 (2024-06-25)
+------------------
+
 2.8.0 (2024-04-26)
 ------------------
 

diff --git a/qt_gui_app/package.xml b/qt_gui_app/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>qt_gui_app</name>
-  <version>2.8.0</version>
+  <version>2.8.1</version>
   <description>
     qt_gui_app provides the main to start an instance of the integrated graphical user interface provided by qt_gui.
   </description>

diff --git a/qt_gui_core/CHANGELOG.rst b/qt_gui_core/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package qt_gui_core
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.8.1 (2024-06-25)
+------------------
+
 2.8.0 (2024-04-26)
 ------------------
 

diff --git a/qt_gui_core/package.xml b/qt_gui_core/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>qt_gui_core</name>
-  <version>2.8.0</version>
+  <version>2.8.1</version>
   <description>
     Integration of the ROS package system and ROS-specific plugins for a Qt-based GUI.
   </description>

diff --git a/qt_gui_cpp/CHANGELOG.rst b/qt_gui_cpp/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package qt_gui_cpp
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.8.1 (2024-06-25)
+------------------
+
 2.8.0 (2024-04-26)
 ------------------
 

diff --git a/qt_gui_cpp/CMakeLists.txt b/qt_gui_cpp/CMakeLists.txt
@@ -48,9 +48,9 @@ set(qt_gui_cpp_SRCS
 )
 
 set(qt_gui_cpp_HDRS
-  include/qt_gui_cpp/plugin.h
-  include/qt_gui_cpp/plugin_bridge.h
-  include/qt_gui_cpp/plugin_context.h
+  include/qt_gui_cpp/plugin.hpp
+  include/qt_gui_cpp/plugin_bridge.hpp
+  include/qt_gui_cpp/plugin_context.hpp
 )
 
 if (${QT_VERSION_MAJOR} GREATER "5")
@@ -97,9 +97,6 @@ install(TARGETS ${PROJECT_NAME}
   LIBRARY DESTINATION lib
   RUNTIME DESTINATION bin)
 
-# TODO(brawner) add ament_lint_auto tests here. Much of the c++ code needs to
-# be updated for ROS2 style
-
 if(BUILD_TESTING)
   find_package(ament_cmake_pytest REQUIRED)
 

diff --git a/qt_gui_cpp/include/qt_gui_cpp/composite_plugin_provider.h b/qt_gui_cpp/include/qt_gui_cpp/composite_plugin_provider.h
@@ -33,52 +33,10 @@
 #ifndef qt_gui_cpp__CompositePluginProvider_H
 #define qt_gui_cpp__CompositePluginProvider_H
 
-#include "plugin_descriptor.h"
-#include "plugin_provider.h"
-
-#include <QList>
-#include <QMap>
-#include <QSet>
-#include <QString>
-
-namespace qt_gui_cpp
-{
-
-class CompositePluginProvider
-  : public PluginProvider
-{
-
-public:
-
-  CompositePluginProvider(const QList<PluginProvider*>& plugin_providers = QList<PluginProvider*>());
-
-  virtual ~CompositePluginProvider();
-
-  /**
-   * @note The ownership of the plugin providers is transferred to the callee.
-   */
-  virtual void set_plugin_providers(const QList<PluginProvider*>& plugin_providers);
-
-  virtual QList<PluginDescriptor*> discover_descriptors(QObject* discovery_data);
-
-  virtual void* load(const QString& plugin_id, PluginContext* plugin_context);
-
-  virtual Plugin* load_plugin(const QString& plugin_id, PluginContext* plugin_context);
-
-  virtual void unload(void* plugin_instance);
-
-  virtual void shutdown();
-
-private:
-
-  QList<PluginProvider*> plugin_providers_;
-
-  QMap<PluginProvider*, QSet<QString> > discovered_plugins_;
-
-  QMap<void*, PluginProvider*> running_plugins_;
-
-};
-
-} // namespace
+// *INDENT-OFF* (prevent uncrustify from adding indention below)
+#warning Including header <qt_gui_cpp/composite_plugin_provider.h> is deprecated, \
+include <qt_gui_cpp/composite_plugin_provider.hpp> instead.
+// *INDENT-ON*
+#include "./composite_plugin_provider.hpp"
 
 #endif // qt_gui_cpp__CompositePluginProvider_H
diff --git a/qt_gui_cpp/include/qt_gui_cpp/composite_plugin_provider.hpp b/qt_gui_cpp/include/qt_gui_cpp/composite_plugin_provider.hpp
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2011, Dirk Thomas, TU Darmstadt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the following
+ *     disclaimer in the documentation and/or other materials provided
+ *     with the distribution.
+ *   * Neither the name of the TU Darmstadt nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef qt_gui_cpp__CompositePluginProvider_HPP
+#define qt_gui_cpp__CompositePluginProvider_HPP
+
+#include "plugin_descriptor.hpp"
+#include "plugin_provider.hpp"
+
+#include <QList>
+#include <QMap>
+#include <QSet>
+#include <QString>
+
+namespace qt_gui_cpp
+{
+
+class CompositePluginProvider
+  : public PluginProvider
+{
+
+public:
+
+  CompositePluginProvider(const QList<PluginProvider*>& plugin_providers = QList<PluginProvider*>());
+
+  virtual ~CompositePluginProvider();
+
+  /**
+   * @note The ownership of the plugin providers is transferred to the callee.
+   */
+  virtual void set_plugin_providers(const QList<PluginProvider*>& plugin_providers);
+
+  virtual QList<PluginDescriptor*> discover_descriptors(QObject* discovery_data);
+
+  virtual void* load(const QString& plugin_id, PluginContext* plugin_context);
+
+  virtual Plugin* load_plugin(const QString& plugin_id, PluginContext* plugin_context);
+
+  virtual void unload(void* plugin_instance);
+
+  virtual void shutdown();
+
+private:
+
+  QList<PluginProvider*> plugin_providers_;
+
+  QMap<PluginProvider*, QSet<QString> > discovered_plugins_;
+
+  QMap<void*, PluginProvider*> running_plugins_;
+
+};
+
+} // namespace
+
+#endif // qt_gui_cpp__CompositePluginProvider_HPP
diff --git a/qt_gui_cpp/include/qt_gui_cpp/generic_proxy.h b/qt_gui_cpp/include/qt_gui_cpp/generic_proxy.h
@@ -33,32 +33,11 @@
 #ifndef qt_gui_cpp__GenericProxy_H
 #define qt_gui_cpp__GenericProxy_H
 
-#include <QObject>
+// *INDENT-OFF* (prevent uncrustify from adding indention below)
+#warning Including header <qt_gui_cpp/generic_proxy.h> is deprecated, \
+include <qt_gui_cpp/generic_proxy.hpp> instead.
+// *INDENT-ON*
 
-namespace qt_gui_cpp
-{
-
-class GenericProxy
-{
-
-public:
-
-  GenericProxy(QObject* obj = 0);
-
-  QObject* proxiedObject();
-
-  void setProxiedObject(QObject* obj);
-
-  bool invokeMethod(const char* member, QGenericArgument val0 = QGenericArgument(), QGenericArgument val1 = QGenericArgument(), QGenericArgument val2 = QGenericArgument(), QGenericArgument val3 = QGenericArgument(), QGenericArgument val4 = QGenericArgument(), QGenericArgument val5 = QGenericArgument(), QGenericArgument val6 = QGenericArgument(), QGenericArgument val7 = QGenericArgument(), QGenericArgument val8 = QGenericArgument(), QGenericArgument val9 = QGenericArgument());
-
-  bool invokeMethodWithReturn(const char* member, QGenericReturnArgument ret = QGenericReturnArgument(0, 0), QGenericArgument val0 = QGenericArgument(), QGenericArgument val1 = QGenericArgument(), QGenericArgument val2 = QGenericArgument(), QGenericArgument val3 = QGenericArgument(), QGenericArgument val4 = QGenericArgument(), QGenericArgument val5 = QGenericArgument(), QGenericArgument val6 = QGenericArgument(), QGenericArgument val7 = QGenericArgument(), QGenericArgument val8 = QGenericArgument(), QGenericArgument val9 = QGenericArgument());
-
-private:
-
-  QObject* object_;
-
-};
-
-} // namespace
+#include "./generic_proxy.hpp"
 
 #endif // qt_gui_cpp__GenericProxy_H
diff --git a/qt_gui_cpp/include/qt_gui_cpp/generic_proxy.hpp b/qt_gui_cpp/include/qt_gui_cpp/generic_proxy.hpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2011, Dirk Thomas, TU Darmstadt
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the following
+ *     disclaimer in the documentation and/or other materials provided
+ *     with the distribution.
+ *   * Neither the name of the TU Darmstadt nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef qt_gui_cpp__GenericProxy_HPP
+#define qt_gui_cpp__GenericProxy_HPP
+
+#include <QObject>
+
+namespace qt_gui_cpp
+{
+
+class GenericProxy
+{
+
+public:
+
+  GenericProxy(QObject* obj = 0);
+
+  QObject* proxiedObject();
+
+  void setProxiedObject(QObject* obj);
+
+  bool invokeMethod(const char* member, QGenericArgument val0 = QGenericArgument(), QGenericArgument val1 = QGenericArgument(), QGenericArgument val2 = QGenericArgument(), QGenericArgument val3 = QGenericArgument(), QGenericArgument val4 = QGenericArgument(), QGenericArgument val5 = QGenericArgument(), QGenericArgument val6 = QGenericArgument(), QGenericArgument val7 = QGenericArgument(), QGenericArgument val8 = QGenericArgument(), QGenericArgument val9 = QGenericArgument());
+
+  bool invokeMethodWithReturn(const char* member, QGenericReturnArgument ret = QGenericReturnArgument(0, 0), QGenericArgument val0 = QGenericArgument(), QGenericArgument val1 = QGenericArgument(), QGenericArgument val2 = QGenericArgument(), QGenericArgument val3 = QGenericArgument(), QGenericArgument val4 = QGenericArgument(), QGenericArgument val5 = QGenericArgument(), QGenericArgument val6 = QGenericArgument(), QGenericArgument val7 = QGenericArgument(), QGenericArgument val8 = QGenericArgument(), QGenericArgument val9 = QGenericArgument());
+
+private:
+
+  QObject* object_;
+
+};
+
+} // namespace
+
+#endif // qt_gui_cpp__GenericProxy_HPP