Skip to content

Commit

Permalink
Fold in some unrelated comment changes
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <[email protected]>
  • Loading branch information
methylDragon committed Jun 7, 2022
1 parent 671e746 commit 961cc63
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions include/gz/gui/Conversions.hh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ namespace gz

/// \brief Return the equivalent Gazebo color
/// \param[in] _color Qt color to convert
/// \return Ignition color value
/// \return Gazebo color value
GZ_GUI_VISIBLE
math::Color convert(const QColor &_color);

Expand All @@ -75,7 +75,7 @@ namespace gz

/// \brief Return the equivalent Gazebo vector 3d.
/// \param[in] _vec Qt vector 3d to convert.
/// \return Ignition vector 3d value
/// \return Gazebo vector 3d value
GZ_GUI_VISIBLE
math::Vector3d convert(const QVector3D &_vec);

Expand All @@ -84,22 +84,22 @@ namespace gz
/// Note that there isn't a 1-1 mapping between these types, so fields such
/// as common::MouseEvent::PressPos need to be set afterwards.
/// \param[in] _e Qt mouse event
/// \return Ignition mouse event
/// \return Gazebo mouse event
GZ_GUI_VISIBLE
common::MouseEvent convert(const QMouseEvent &_e);

/// \brief Return the equivalent Gazebo mouse event.
///
/// Note that there isn't a 1-1 mapping between these types.
/// \param[in] _e Qt wheel event
/// \return Ignition mouse event
/// \return Gazebo mouse event
GZ_GUI_VISIBLE
common::MouseEvent convert(const QWheelEvent &_e);

/// \brief Return the equivalent Gazebo key event.
///
/// \param[in] _e Qt key event
/// \return Ignition key event
/// \return Gazebo key event
GZ_GUI_VISIBLE
common::KeyEvent convert(const QKeyEvent &_e);
}
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/marker_manager/MarkerManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ class gz::gui::plugins::MarkerManagerPrivate
public: void SetMarker(const gz::msgs::Marker &_msg,
const rendering::MarkerPtr &_markerPtr);

/// \brief Converts an ignition msg material to ignition rendering
/// \brief Converts an Gazebo msg material to Gazebo Rendering
// material.
// \param[in] _msg The message data.
// \return Converted rendering material, if any.
public: rendering::MaterialPtr MsgToMaterial(
const gz::msgs::Marker &_msg);

/// \brief Converts an ignition msg render type to ignition rendering
/// \brief Converts an Gazebo msg render type to Gazebo Rendering
/// \param[in] _msg The message data
/// \return Converted rendering type, if any.
public: gz::rendering::MarkerType MsgToType(
Expand All @@ -122,7 +122,7 @@ class gz::gui::plugins::MarkerManagerPrivate
public: std::map<std::string,
std::map<uint64_t, gz::rendering::VisualPtr>> visuals;

/// \brief Ignition node
/// \brief Gazebo node
public: gz::transport::Node node;

/// \brief Topic name for the marker service
Expand Down

0 comments on commit 961cc63

Please sign in to comment.