Merge remote-tracking branch 'origin/master' into string_improvements

# Conflicts:
#	src/rig_reconfigure.cpp

.github/workflows/ci.yml

@@ -9,6 +9,8 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
       - name: Install depdendencies
         run: |
           . /opt/ros/$ROS_DISTRO/setup.sh

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "external/imspinner"]
 	path = external/imspinner
 	url = https://github.com/dalerank/imspinner.git
+[submodule "external/lodepng"]
+	path = external/lodepng
+	url = https://github.com/lvandeve/lodepng.git

CMakeLists.txt

@@ -11,7 +11,7 @@ find_package(rclcpp REQUIRED)
 include(FetchContent)
 FetchContent_Declare(imgui
         GIT_REPOSITORY https://github.com/ocornut/imgui.git
-        GIT_TAG 3ea0fad204e994d669f79ed29dcaf61cd5cb571d # latest docking branch at time of writing
+        GIT_TAG v1.89.8-docking
         CONFIGURE_COMMAND ""
         BUILD_COMMAND ""
         )
@@ -33,18 +33,30 @@ set(OpenGL_GL_PREFERENCE GLVND)
 find_package(OpenGL REQUIRED)
 target_link_libraries(imgui PUBLIC glfw OpenGL::GL)
 
-add_executable(${PROJECT_NAME} src/rig_reconfigure.cpp src/service_wrapper.cpp src/parameter_tree.cpp)
+add_executable(${PROJECT_NAME} src/rig_reconfigure.cpp src/service_wrapper.cpp src/parameter_tree.cpp external/lodepng/lodepng.cpp)
 
 # uncomment for checking the executable with tsan
 #target_compile_options(${PROJECT_NAME} PRIVATE -g -fsanitize=thread)
 #target_link_options(${PROJECT_NAME} PRIVATE -fsanitize=thread)
 
-target_include_directories(${PROJECT_NAME} PRIVATE include external/imspinner)
+target_include_directories(${PROJECT_NAME} PRIVATE include external/imspinner external/lodepng)
 target_link_libraries(${PROJECT_NAME} imgui)
 ament_target_dependencies(${PROJECT_NAME} rclcpp)
 
 install(TARGETS ${PROJECT_NAME}
         DESTINATION lib/${PROJECT_NAME}
 )
 
+install(FILES resource/rig_reconfigure.png
+        DESTINATION share/${PROJECT_NAME}/resource
+)
+
+install(FILES resource/rig_reconfigure.svg
+        DESTINATION share/icons/hicolor/scalable/apps
+)
+
+install(FILES resource/rig_reconfigure.desktop
+        DESTINATION share/applications
+)
+
 ament_package()

package.xml

@@ -12,6 +12,7 @@
     <buildtool_depend>git</buildtool_depend>
     <depend>libglfw3-dev</depend>
     <depend>rclcpp</depend>
+    <depend>ament_index_cpp</depend>
 
     <export>
         <build_type>ament_cmake</build_type>

resource/rig_reconfigure.desktop

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=RIG Reconfigure
+Comment=GUI tool for editing ROS 2 parameters at runtime
+Exec=bash -c "ros2 run rig_reconfigure rig_reconfigure"
+Icon=rig_reconfigure
+Terminal=false