ign -> gz Provisional Finale: Source Migration : gz-sensors

.github/ci/packages.apt

@@ -1,9 +1,9 @@
-libignition-cmake3-dev
-libignition-common5-dev
-libignition-math7-dev
-libignition-msgs9-dev
-libignition-rendering7-dev
-libignition-tools2-dev
-libignition-transport12-dev
+libgz-cmake3-dev
+libgz-common5-dev
+libgz-math7-dev
+libgz-msgs9-dev
+libgz-rendering7-dev
+libgz-tools2-dev
+libgz-transport12-dev
 libsdformat13-dev
 xvfb

.github/disabled_workflows/macos.yml

@@ -6,7 +6,7 @@ jobs:
   build:
 
     env:
-      PACKAGE: ignition-sensors7
+      PACKAGE: gz-sensors7
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Compile and test
         id: ci
-        uses: ignition-tooling/action-ignition-ci@focal
+        uses: gazebo-tooling/action-gz-ci@focal
         with:
           codecov-enabled: true
           cppcheck-enabled: true
@@ -24,4 +24,4 @@ jobs:
         uses: actions/checkout@v2
       - name: Compile and test
         id: ci
-        uses: ignition-tooling/action-ignition-ci@jammy
+        uses: gazebo-tooling/action-gz-ci@jammy

.github/workflows/pr-collection-labeler.yml

@@ -8,6 +8,6 @@ jobs:
     steps:
     - name: Add collection labels
       if: github.event.action == 'opened'
-      uses: ignition-tooling/pr-collection-labeler@v1
+      uses: gazebo-tooling/pr-collection-labeler@v1
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}

CMakeLists.txt

@@ -16,9 +16,7 @@ find_package(gz-cmake3 REQUIRED)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-gz_configure_project(
-  REPLACE_IGNITION_INCLUDE_PATH gz/sensors
-  VERSION_SUFFIX pre1)
+gz_configure_project(VERSION_SUFFIX pre1)
 
 #============================================================================
 # Set project-specific options
@@ -41,7 +39,7 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======")
 #--------------------------------------
 # Find Protobuf
 set(REQ_PROTOBUF_VER 3)
-gz_find_package(IgnProtobuf
+gz_find_package(GzProtobuf
                  VERSION ${REQ_PROTOBUF_VER}
                  REQUIRED
                  PRETTY Protobuf)

Migration.md

@@ -89,7 +89,7 @@ release will remove the deprecated code.
 
 ### Additions
 
-1. The core ignition-sensors library no longer depends on ign-rendering. All
+1. The core gz-sensors library no longer depends on gz-rendering. All
 rendering sensors and noise models are now part of the `rendering` component
 
 1. New sensors: thermal camera

README.md

@@ -65,7 +65,7 @@ Refer to the following table for information about important directories and fil
 
 ```
 ├── examples                  Example programs.
-├── include/ignition/sensors  Header files that will be installed.
+├── include/gz/sensors  Header files that will be installed.
 ├── src                       Source files and unit tests.
 ├── test
 │    ├── integration          Integration tests.

api.md.in

@@ -1,6 +1,6 @@
-## Gazebo @IGN_DESIGNATION_CAP@
+## Gazebo @GZ_DESIGNATION_CAP@
 
-Gazebo @IGN_DESIGNATION_CAP@ is a component in Gazebo, a set of libraries
+Gazebo @GZ_DESIGNATION_CAP@ is a component in Gazebo, a set of libraries
 designed to rapidly develop robot and simulation applications. 
 
 ## License

doc/CMakeLists.txt

@@ -1,17 +1,17 @@
 find_package(Doxygen)
 
-set(IGNITION_DOXYGEN_TAGFILES
+set(GZ_DOXYGEN_TAGFILES
   "\"${GZ-MATH_DOXYGEN_TAGFILE} = ${GZ-MATH_API_URL}\" \
    \"${GZ-MSGS_DOXYGEN_TAGFILE} = ${GZ-MSGS_API_URL}\" \
    \"${GZ-TRANSPORT_DOXYGEN_TAGFILE} = ${GZ-TRANSPORT_API_URL}\" \
    \"${GZ-COMMON_DOXYGEN_TAGFILE} = ${GZ-COMMON_API_URL}\""
 )
 
 if (DOXYGEN_FOUND)
-  configure_file(${IGNITION_CMAKE_DOXYGEN_DIR}/api.in
+  configure_file(${GZ_CMAKE_DOXYGEN_DIR}/api.in
                  ${CMAKE_BINARY_DIR}/api.dox @ONLY)
 
-  configure_file(${IGNITION_CMAKE_DOXYGEN_DIR}/tutorials.in
+  configure_file(${GZ_CMAKE_DOXYGEN_DIR}/tutorials.in
                  ${CMAKE_BINARY_DIR}/tutorials.dox @ONLY)
 
   add_custom_target(doc ALL

examples/imu_noise/README.md

@@ -4,7 +4,7 @@ This example creates a sequence of samples for an accelerometer and gyroscope ba
 on the https://www.analog.com/media/en/technical-documentation/data-sheets/adis16448.pdf, a commonly-used MEMS IMU.
 
 The sequence of samples can then be evaluated with Allan Variance to determine that
-the noise generation in ign-sensors is working as expected.
+the noise generation in gz-sensors is working as expected.
 
 To evaluate noise, first build and run.
 

examples/loop_sensor/README.md

@@ -38,7 +38,7 @@ On another terminal, check that the altimeter and odometer are generating
 data on a topic:
 
 ```
-ign topic -l
+gz topic -l
 ```
 
 You should see:
@@ -51,7 +51,7 @@ You should see:
 Then listen to the altimeter data:
 
 ```
-ign topic -e -t /altimeter
+gz topic -e -t /altimeter
 ```
 
 You'll see data like:
@@ -79,7 +79,7 @@ vertical_velocity: 10.596832320931542
 Then listen to the custom sensor:
 
 ```
-ign topic -e -t /odometer
+gz topic -e -t /odometer
 ```
 
 You'll see data like:

examples/save_image/main.cc

@@ -25,7 +25,7 @@
 #include <gz/common/Console.hh>
 #include <gz/math/Helpers.hh>
 
-// TODO(louise) Remove these pragmas once ign-rendering is disabling the
+// TODO(louise) Remove these pragmas once gz-rendering is disabling the
 // warnings
 #ifdef _WIN32
 #pragma warning(push)
@@ -58,7 +58,7 @@ void BuildScene(gz::rendering::ScenePtr _scene);
 
 int main()
 {
-  // Setup ign-rendering with a scene
+  // Setup gz-rendering with a scene
 #ifdef WITH_OGRE
   auto engine = gz::rendering::engine("ogre");
 #else
@@ -82,7 +82,7 @@ int main()
 
   // Create SDF describing a camera sensor
   const std::string name = "ExampleCamera";
-  const std::string topic = "/ignition/sensors/examples/save_image";
+  const std::string topic = "/gz/sensors/examples/save_image";
   const double hz = 30;
   const std::size_t width = 480;
   const std::size_t height = 320;
@@ -133,7 +133,7 @@ int main()
   return 0;
 }
 
-// Copy/paste from an gz-rendering example
+// Copy/paste from a gz-rendering example
 void BuildScene(gz::rendering::ScenePtr _scene)
 {
   // initialize _scene

include/CMakeLists.txt

@@ -1,2 +1,2 @@
 add_subdirectory(gz)
-install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
+install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL})

include/gz/sensors/AltimeterSensor.hh

@@ -41,7 +41,7 @@ namespace gz
     /// \brief Altimeter Sensor Class
     ///
     /// An altimeter sensor that reports vertical position and velocity
-    /// readings over ign transport
+    /// readings over gz transport
     class GZ_SENSORS_ALTIMETER_VISIBLE AltimeterSensor : public Sensor
     {
       /// \brief constructor

include/gz/sensors/CameraSensor.hh

@@ -35,7 +35,7 @@
 #pragma warning(pop)
 #endif
 
-// TODO(louise) Remove these pragmas once ign-rendering is disabling the
+// TODO(louise) Remove these pragmas once gz-rendering is disabling the
 // warnings
 #ifdef _WIN32
 #pragma warning(push)
@@ -65,7 +65,7 @@ namespace gz
     ///
     ///   This class creates images from a Gazebo Rendering scene. The scene
     ///   must be created in advance and given to Manager::Init().
-    ///   It offers both an ignition-transport interface and a direct C++ API
+    ///   It offers both a gz-transport interface and a direct C++ API
     ///   to access the image data. The API works by setting a callback to be
     ///   called with image data.
     class GZ_SENSORS_CAMERA_VISIBLE CameraSensor : public RenderingSensor

include/gz/sensors/DepthCameraSensor.hh

@@ -36,7 +36,7 @@
 #pragma warning(pop)
 #endif
 
-// TODO(louise) Remove these pragmas once ign-rendering is disabling the
+// TODO(louise) Remove these pragmas once gz-rendering is disabling the
 // warnings
 #ifdef _WIN32
 #pragma warning(push)
@@ -65,7 +65,7 @@ namespace gz
     ///
     /// This class creates depth image from a Gazebo Rendering scene.
     /// The scene  must be created in advance and given to Manager::Init().
-    /// It offers both an ignition-transport interface and a direct C++ API
+    /// It offers both a gz-transport interface and a direct C++ API
     /// to access the image data. The API works by setting a callback to be
     /// called with image data.
     class GZ_SENSORS_DEPTH_CAMERA_VISIBLE DepthCameraSensor

include/gz/sensors/GpuLidarSensor.hh

@@ -24,7 +24,7 @@
 
 #include <gz/utils/SuppressWarning.hh>
 
-// TODO(louise) Remove these pragmas once ign-rendering is disabling the
+// TODO(louise) Remove these pragmas once gz-rendering is disabling the
 // warnings
 #ifdef _WIN32
 #pragma warning(push)
@@ -55,7 +55,7 @@ namespace gz
     ///   from the origin of the center to points on the visual geometry in the
     ///   scene.
     ///
-    ///   It offers both an ignition-transport interface and a direct C++ API
+    ///   It offers both a gz-transport interface and a direct C++ API
     ///   to access the image data. The API works by setting a callback to be
     ///   called with image data.
     class GZ_SENSORS_GPU_LIDAR_VISIBLE GpuLidarSensor : public Lidar

include/gz/sensors/ImageBrownDistortionModel.hh

@@ -20,7 +20,7 @@
 
 #include <sdf/sdf.hh>
 
-// TODO(WilliamLewww): Remove these pragmas once ign-rendering is disabling the
+// TODO(WilliamLewww): Remove these pragmas once gz-rendering is disabling the
 // warnings
 #ifdef _WIN32
 #pragma warning(push)

include/gz/sensors/ImageGaussianNoiseModel.hh

@@ -20,7 +20,7 @@
 
 #include <sdf/sdf.hh>
 
-// TODO(louise) Remove these pragmas once ign-rendering is disabling the
+// TODO(louise) Remove these pragmas once gz-rendering is disabling the
 // warnings
 #ifdef _WIN32
 #pragma warning(push)

include/gz/sensors/Lidar.hh

@@ -43,7 +43,7 @@ namespace gz
     ///   from the origin of the center to points on the visual geometry in the
     ///   scene.
     ///
-    ///   It offers both an ignition-transport interface and a direct C++ API
+    ///   It offers both a gz-transport interface and a direct C++ API
     ///   to access the image data. The API works by setting a callback to be
     ///   called with image data.
     class GZ_SENSORS_LIDAR_VISIBLE Lidar : public RenderingSensor

include/gz/sensors/RenderingEvents.hh

@@ -21,7 +21,7 @@
 #include <gz/common/Event.hh>
 #include <gz/utils/SuppressWarning.hh>
 
-// TODO(louise) Remove these pragmas once ign-rendering is disabling the
+// TODO(louise) Remove these pragmas once gz-rendering is disabling the
 // warnings
 #ifdef _WIN32
 #pragma warning(push)

include/gz/sensors/RenderingSensor.hh

@@ -21,7 +21,7 @@
 
 #include <gz/utils/SuppressWarning.hh>
 
-// TODO(louise) Remove these pragmas once ign-rendering is disabling the
+// TODO(louise) Remove these pragmas once gz-rendering is disabling the
 // warnings
 #ifdef _WIN32
 #pragma warning(push)

include/gz/sensors/RgbdCameraSensor.hh

@@ -45,7 +45,7 @@ namespace gz
     /// * Depth image (same as DepthCamera)
     /// * (future / todo) Color point cloud
     /// The scene  must be created in advance and given to Manager::Init().
-    /// It offers both an ignition-transport interface and a direct C++ API
+    /// It offers both a gz-transport interface and a direct C++ API
     /// to access the image data. The API works by setting a callback to be
     /// called with image data.
     class GZ_SENSORS_RGBD_CAMERA_VISIBLE RgbdCameraSensor

include/gz/sensors/SegmentationCameraSensor.hh

@@ -47,7 +47,7 @@ namespace gz
     ///
     /// This class creates segmentation images from a Gazebo Rendering scene.
     /// The scene must be created in advance and given to Manager::Init().
-    /// It offers both an ignition-transport interface and a direct C++ API
+    /// It offers both a gz-transport interface and a direct C++ API
     /// to access the image data. The API works by setting a callback to be
     /// called with image data.
     class GZ_SENSORS_SEGMENTATION_CAMERA_VISIBLE

include/gz/sensors/Sensor.hh

@@ -187,7 +187,7 @@ namespace gz
       /// information for this sensor.
       public: sdf::ElementPtr SDF() const;
 
-      /// \brief Add a sequence number to an gz::msgs::Header. This
+      /// \brief Add a sequence number to a gz::msgs::Header. This
       /// function can be called by a sensor that wants to add a sequence
       /// number to a sensor message in order to have improved
       /// accountability for generated sensor data.

include/gz/sensors/SensorFactory.hh

@@ -171,7 +171,7 @@ namespace gz
       ///
       ///   This creates sensors by looking at the given SDF Sensor DOM
       ///   object.
-      ///   Sensors created with this API offer an ignition-transport interface.
+      ///   Sensors created with this API offer a gz-transport interface.
       ///   If you need a direct C++ interface to the data, you must get the
       ///   sensor pointer and cast to the correct type.
       ///

include/gz/sensors/ThermalCameraSensor.hh

@@ -36,7 +36,7 @@
 #pragma warning(pop)
 #endif
 
-// TODO(louise) Remove these pragmas once ign-rendering is disabling the
+// TODO(louise) Remove these pragmas once gz-rendering is disabling the
 // warnings
 #ifdef _WIN32
 #pragma warning(push)
@@ -65,7 +65,7 @@ namespace gz
     ///
     /// This class creates thermal image from a Gazebo Rendering scene.
     /// The scene must be created in advance and given to Manager::Init().
-    /// It offers both an ignition-transport interface and a direct C++ API
+    /// It offers both a gz-transport interface and a direct C++ API
     /// to access the image data. The API works by setting a callback to be
     /// called with image data.
     class GZ_SENSORS_THERMAL_CAMERA_VISIBLE ThermalCameraSensor

include/gz/sensors/WideAngleCameraSensor.hh

@@ -36,7 +36,7 @@
 #pragma warning(pop)
 #endif
 
-// TODO(louise) Remove these pragmas once ign-rendering is disabling the
+// TODO(louise) Remove these pragmas once gz-rendering is disabling the
 // warnings
 #ifdef _WIN32
 #pragma warning(push)
@@ -65,7 +65,7 @@ namespace gz
     ///
     /// This class creates wide angle camera image from a Gazebo Rendering
     /// scene. The scene must be created in advance and given to Manager::Init()
-    /// It offers both an ignition-transport interface and a direct C++ API
+    /// It offers both a gz-transport interface and a direct C++ API
     /// to access the image data. The API works by setting a callback to be
     /// called with image data.
     class GZ_SENSORS_WIDE_ANGLE_CAMERA_VISIBLE WideAngleCameraSensor

include/gz/sensors/sensors.hh.in

@@ -1,3 +1,3 @@
 // Automatically generated
 #include <gz/sensors/config.hh>
-${ign_headers}
+${gz_headers}

src/CMakeLists.txt

@@ -28,7 +28,7 @@ set (gtest_sources
 )
 
 if (MSVC)
-  # TODO(louise) Remove this once warnings are suppressed in ign-rendering
+  # TODO(louise) Remove this once warnings are suppressed in gz-rendering
   set_source_files_properties(
       ${rendering_sources}
       SegmentationCameraSensor.cc