Skip to content
New issue

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

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

Already on GitHub? # to your account

Remove deprecated Pose(), PoseFrame() functions from sdf10 #308

Merged
merged 4 commits into from
Jun 30, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,20 @@ but with improved human-readability..
1. + Minimum/maximum values specified in SDFormat description files are now enforced
+ [Pull request 303](https://github.com/osrf/sdformat/pull/303)

1. + Parsing of bad values generates an error
+ [Pull request 244](https://github.com/osrf/sdformat/pull/244)

### Deletions

1. + Removed the `parser_urdf.hh` header file and its `URDF2SDF` class
+ [Pull request 276](https://github.com/osrf/sdformat/pull/276)

1. + Removed the deprecated `Pose()`, `SetPose(), and `*PoseFrame()` API's in all DOM classes:
+ const ignition::math::Pose3d &Pose()
+ void SetPose(const ignition::math::Pose3d &)
+ const std::string &PoseFrame()
+ void SetPoseFrame(const std::string &)

### Additions

1. **sdf/Element.hh**
Expand Down
32 changes: 0 additions & 32 deletions include/sdf/Actor.hh
Original file line number Diff line number Diff line change
Expand Up @@ -320,22 +320,6 @@ namespace sdf
/// \param[in] _name Name of the actor.
public: void SetName(const std::string &_name);

/// \brief Get the pose of the actor. This is the pose of the actor
/// as specified in SDF (<actor> <pose> ... </pose></actor>), and is
/// typically used to express the position and rotation of an actor in a
/// global coordinate frame.
/// \return The pose of the actor.
/// \deprecated See RawPose.
public: const ignition::math::Pose3d &Pose() const
SDF_DEPRECATED(9.0);

/// \brief Set the pose of the actor.
/// \sa const ignition::math::Pose3d &Pose() const
/// \param[in] _pose The new actor pose.
/// \deprecated See SetRawPose.
public: void SetPose(const ignition::math::Pose3d &_pose)
SDF_DEPRECATED(9.0);

/// \brief Get the pose of the actor. This is the pose of the actor
/// as specified in SDF (<actor> <pose> ... </pose></actor>), and is
/// typically used to express the position and rotation of an actor in a
Expand All @@ -360,22 +344,6 @@ namespace sdf
/// \param[in] _frame The name of the pose relative-to frame.
public: void SetPoseRelativeTo(const std::string &_frame);

/// \brief Get the name of the coordinate frame in which this actor's
/// pose is expressed. A empty value indicates that the frame is the
/// global/world coordinate frame.
/// \return The name of the pose frame.
/// \deprecated See PoseRelativeTo.
public: const std::string &PoseFrame() const
SDF_DEPRECATED(9.0);

/// \brief Set the name of the coordinate frame in which this actor's
/// pose is expressed. A empty value indicates that the frame is the
/// global/world coordinate frame.
/// \param[in] _frame The name of the pose frame.
/// \deprecated See SetPoseRelativeTo.
public: void SetPoseFrame(const std::string &_frame)
SDF_DEPRECATED(9.0);

/// \brief The path to the file where this element was loaded from.
/// \return Full path to the file on disk.
public: const std::string &FilePath() const;
Expand Down
30 changes: 0 additions & 30 deletions include/sdf/Camera.hh
Original file line number Diff line number Diff line change
Expand Up @@ -293,20 +293,6 @@ namespace sdf
public: void SetDistortionCenter(
const ignition::math::Vector2d &_center) const;

/// \brief Get the pose of the camer. This is the pose of the camera
/// as specified in SDF (<camera> <pose> ... </pose></camera>).
/// \return The pose of the link.
/// \deprecated See RawPose.
public: const ignition::math::Pose3d &Pose() const
SDF_DEPRECATED(9.0);

/// \brief Set the pose of the camera.
/// \sa const ignition::math::Pose3d &Pose() const
/// \param[in] _pose The new camera pose.
/// \deprecated See SetRawPose.
public: void SetPose(const ignition::math::Pose3d &_pose)
SDF_DEPRECATED(9.0);

/// \brief Get the pose of the camer. This is the pose of the camera
/// as specified in SDF (<camera> <pose> ... </pose></camera>).
/// \return The pose of the link.
Expand All @@ -329,22 +315,6 @@ namespace sdf
/// \param[in] _frame The name of the pose relative-to frame.
public: void SetPoseRelativeTo(const std::string &_frame);

/// \brief Get the name of the coordinate frame in which this camera's
/// pose is expressed. A empty value indicates that the frame is the
/// parent link.
/// \return The name of the pose frame.
/// \deprecated See PoseRelativeTo.
public: const std::string &PoseFrame() const
SDF_DEPRECATED(9.0);

/// \brief Set the name of the coordinate frame in which this camera's
/// pose is expressed. A empty value indicates that the frame is the
/// parent link.
/// \param[in] _frame The name of the pose frame.
/// \deprecated See SetPoseRelativeTo.
public: void SetPoseFrame(const std::string &_frame)
SDF_DEPRECATED(9.0);

/// \brief Get the lens type. This is the type of the lens mapping.
/// Supported values are gnomonical, stereographic, equidistant,
/// equisolid_angle, orthographic, custom. For gnomonical (perspective)
Expand Down
31 changes: 0 additions & 31 deletions include/sdf/Collision.hh
Original file line number Diff line number Diff line change
Expand Up @@ -101,21 +101,6 @@ namespace sdf
/// \param[in] _surface The surface parameters of the collision object
public: void SetSurface(const sdf::Surface &_surface);

/// \brief Get the pose of the collision object. This is the pose of the
/// collision as specified in SDF
/// (<collision><pose> ... </pose></collision>).
/// \return The pose of the collision object.
/// \deprecated See RawPose.
public: const ignition::math::Pose3d &Pose() const
SDF_DEPRECATED(9.0);

/// \brief Set the pose of the collision object.
/// \sa const ignition::math::Pose3d &Pose() const
/// \param[in] _pose The pose of the collision object.
/// \deprecated See SetRawPose.
public: void SetPose(const ignition::math::Pose3d &_pose)
SDF_DEPRECATED(9.0);

/// \brief Get the pose of the collision object. This is the pose of the
/// collison as specified in SDF
/// (<collision><pose> ... </pose></collision>).
Expand All @@ -139,22 +124,6 @@ namespace sdf
/// \param[in] _frame The name of the pose relative-to frame.
public: void SetPoseRelativeTo(const std::string &_frame);

/// \brief Get the name of the coordinate frame in which this collision
/// object's pose is expressed. A empty value indicates that the frame is
/// the parent link.
/// \return The name of the pose frame.
/// \deprecated See PoseRelativeTo.
public: const std::string &PoseFrame() const
SDF_DEPRECATED(9.0);

/// \brief Set the name of the coordinate frame in which this collision
/// object's pose is expressed. A empty value indicates that the frame is
/// the parent link.
/// \param[in] _frame The name of the pose frame.
/// \deprecated See SetPoseRelativeTo.
public: void SetPoseFrame(const std::string &_frame)
SDF_DEPRECATED(9.0);

/// \brief Get SemanticPose object of this object to aid in resolving
/// poses.
/// \return SemanticPose object for this link.
Expand Down
32 changes: 0 additions & 32 deletions include/sdf/Joint.hh
Original file line number Diff line number Diff line change
Expand Up @@ -165,22 +165,6 @@ namespace sdf
/// \param[in] _axis The JointAxis of the joint
public: void SetAxis(const unsigned int _index, const JointAxis &_axis);

/// \brief Get the pose of the joint. This is the pose of the joint
/// as specified in SDF (<joint> <pose> ... </pose></joint>).
/// Transformations have not been applied to the return value.
/// \return The pose of the joint. This is the raw pose value, as set in
/// the SDF file.
/// \deprecated See RawPose.
public: const ignition::math::Pose3d &Pose() const
SDF_DEPRECATED(9.0);

/// \brief Set the pose of the joint.
/// \sa const ignition::math::Pose3d &Pose() const;
/// \param[in] _pose The pose of the joint.
/// \deprecated See SetRawPose.
public: void SetPose(const ignition::math::Pose3d &_pose)
SDF_DEPRECATED(9.0);

/// \brief Get the pose of the joint. This is the pose of the joint
/// as specified in SDF (<joint> <pose> ... </pose></joint>).
/// Transformations have not been applied to the return value.
Expand All @@ -205,22 +189,6 @@ namespace sdf
/// \param[in] _frame The name of the pose relative-to frame.
public: void SetPoseRelativeTo(const std::string &_frame);

/// \brief Get the name of the coordinate frame in which this joint's
/// pose is expressed. A empty value indicates that the frame is the
/// child link frame.
/// \return The name of the pose frame.
/// \deprecated See PoseRelativeTo.
public: const std::string &PoseFrame() const
SDF_DEPRECATED(9.0);

/// \brief Set the name of the coordinate frame in which this joint's
/// pose is expressed. A empty value indicates that the frame is the
/// child link frame.
/// \param[in] _frame The name of the pose frame.
/// \deprecated See SetPoseRelativeTo.
public: void SetPoseFrame(const std::string &_frame)
SDF_DEPRECATED(9.0);

/// \brief Get the thread pitch (only valid for screw joints)
/// \return The thread pitch
public: double ThreadPitch() const;
Expand Down
32 changes: 0 additions & 32 deletions include/sdf/Light.hh
Original file line number Diff line number Diff line change
Expand Up @@ -109,22 +109,6 @@ namespace sdf
/// \param[in] _name Name of the light.
public: void SetName(const std::string &_name) const;

/// \brief Get the pose of the light. This is the pose of the light
/// as specified in SDF (<light> <pose> ... </pose></light>), and is
/// typically used to express the position and rotation of a light in a
/// global coordinate frame.
/// \return The pose of the light.
/// \deprecated See RawPose.
public: const ignition::math::Pose3d &Pose() const
SDF_DEPRECATED(9.0);

/// \brief Set the pose of the light.
/// \sa const ignition::math::Pose3d &Pose() const
/// \param[in] _pose The new light pose.
/// \deprecated See SetRawPose.
public: void SetPose(const ignition::math::Pose3d &_pose)
SDF_DEPRECATED(9.0);

/// \brief Get the pose of the light. This is the pose of the light
/// as specified in SDF (<light> <pose> ... </pose></light>), and is
/// typically used to express the position and rotation of a light in a
Expand All @@ -149,22 +133,6 @@ namespace sdf
/// \param[in] _frame The name of the pose relative-to frame.
public: void SetPoseRelativeTo(const std::string &_frame);

/// \brief Get the name of the coordinate frame in which this light's
/// pose is expressed. A empty value indicates that the frame is the
/// global/world coordinate frame.
/// \return The name of the pose frame.
/// \deprecated See PoseRelativeTo.
public: const std::string &PoseFrame() const
SDF_DEPRECATED(9.0);

/// \brief Set the name of the coordinate frame in which this light's
/// pose is expressed. A empty value indicates that the frame is the
/// global/world coordinate frame.
/// \param[in] _frame The name of the pose frame.
/// \deprecated See SetPoseRelativeTo.
public: void SetPoseFrame(const std::string &_frame)
SDF_DEPRECATED(9.0);

/// \brief Get SemanticPose object of this object to aid in resolving
/// poses.
/// \return SemanticPose object for this link.
Expand Down
30 changes: 0 additions & 30 deletions include/sdf/Link.hh
Original file line number Diff line number Diff line change
Expand Up @@ -192,20 +192,6 @@ namespace sdf
/// \sa const ignition::math::Inertiald &Inertial() const
public: bool SetInertial(const ignition::math::Inertiald &_inertial);

/// \brief Get the pose of the link. This is the pose of the link
/// as specified in SDF (<link> <pose> ... </pose></link>).
/// \return The pose of the link.
/// \deprecated See RawPose.
public: const ignition::math::Pose3d &Pose() const
SDF_DEPRECATED(9.0);

/// \brief Set the pose of the link.
/// \sa const ignition::math::Pose3d &Pose() const
/// \param[in] _pose The new link pose.
/// \deprecated See SetRawPose.
public: void SetPose(const ignition::math::Pose3d &_pose)
SDF_DEPRECATED(9.0);

/// \brief Get the pose of the link. This is the pose of the link
/// as specified in SDF (<link> <pose> ... </pose></link>).
/// \return The pose of the link.
Expand All @@ -228,22 +214,6 @@ namespace sdf
/// \param[in] _frame The name of the pose relative-to frame.
public: void SetPoseRelativeTo(const std::string &_frame);

/// \brief Get the name of the coordinate frame in which this link's
/// pose is expressed. A empty value indicates that the frame is the
/// parent model.
/// \return The name of the pose frame.
/// \deprecated See PoseRelativeTo.
public: const std::string &PoseFrame() const
SDF_DEPRECATED(9.0);

/// \brief Set the name of the coordinate frame in which this link's
/// pose is expressed. A empty value indicates that the frame is the
/// parent model.
/// \param[in] _frame The name of the pose frame.
/// \deprecated See SetPoseRelativeTo.
public: void SetPoseFrame(const std::string &_frame)
SDF_DEPRECATED(9.0);

/// \brief Get a pointer to the SDF element that was used during
/// load.
/// \return SDF element pointer. The value will be nullptr if Load has
Expand Down
32 changes: 0 additions & 32 deletions include/sdf/Model.hh
Original file line number Diff line number Diff line change
Expand Up @@ -198,22 +198,6 @@ namespace sdf
/// \return True if there exists an explicit frame with the given name.
public: bool FrameNameExists(const std::string &_name) const;

/// \brief Get the pose of the model. This is the pose of the model
/// as specified in SDF (<model> <pose> ... </pose></model>), and is
/// typically used to express the position and rotation of a model in a
/// global coordinate frame.
/// \return The pose of the model.
/// \deprecated See RawPose.
public: const ignition::math::Pose3d &Pose() const
SDF_DEPRECATED(9.0);

/// \brief Set the pose of the model.
/// \sa const ignition::math::Pose3d &Pose() const
/// \param[in] _pose The new model pose.
/// \deprecated See SetRawPose.
public: void SetPose(const ignition::math::Pose3d &_pose)
SDF_DEPRECATED(9.0);

/// \brief Get the pose of the model. This is the pose of the model
/// as specified in SDF (<model> <pose> ... </pose></model>), and is
/// typically used to express the position and rotation of a model in a
Expand Down Expand Up @@ -252,22 +236,6 @@ namespace sdf
/// \param[in] _frame The name of the pose relative-to frame.
public: void SetPoseRelativeTo(const std::string &_frame);

/// \brief Get the name of the coordinate frame in which this model's
/// pose is expressed. A empty value indicates that the frame is the
/// global/world coordinate frame.
/// \return The name of the pose frame.
/// \deprecated See PoseRelativeTo.
public: const std::string &PoseFrame() const
SDF_DEPRECATED(9.0);

/// \brief Set the name of the coordinate frame in which this model's
/// pose is expressed. A empty value indicates that the frame is the
/// global/world coordinate frame.
/// \param[in] _frame The name of the pose frame.
/// \deprecated See SetPoseRelativeTo.
public: void SetPoseFrame(const std::string &_frame)
SDF_DEPRECATED(9.0);

/// \brief Get a pointer to the SDF element that was used during
/// load.
/// \return SDF element pointer. The value will be nullptr if Load has
Expand Down
32 changes: 0 additions & 32 deletions include/sdf/Sensor.hh
Original file line number Diff line number Diff line change
Expand Up @@ -155,22 +155,6 @@ namespace sdf
/// \param[in] _topic Topic for this sensor's data.
public: void SetTopic(const std::string &_topic);

/// \brief Get the pose of the sensor. This is the pose of the sensor
/// as specified in SDF (<sensor> <pose> ... </pose></sensor>), and is
/// typically used to express the position and rotation of a sensor in a
/// global coordinate frame.
/// \return The pose of the sensor.
/// \deprecated See RawPose.
public: const ignition::math::Pose3d &Pose() const
SDF_DEPRECATED(9.0);

/// \brief Set the pose of the sensor.
/// \sa const ignition::math::Pose3d &Pose() const
/// \param[in] _pose The new sensor pose.
/// \deprecated See SetRawPose.
public: void SetPose(const ignition::math::Pose3d &_pose)
SDF_DEPRECATED(9.0);

/// \brief Get the pose of the sensor. This is the pose of the sensor
/// as specified in SDF (<sensor> <pose> ... </pose></sensor>), and is
/// typically used to express the position and rotation of a sensor in a
Expand All @@ -195,22 +179,6 @@ namespace sdf
/// \param[in] _frame The name of the pose relative-to frame.
public: void SetPoseRelativeTo(const std::string &_frame);

/// \brief Get the name of the coordinate frame in which this sensor's
/// pose is expressed. A empty value indicates that the frame is the
/// global/world coordinate frame.
/// \return The name of the pose frame.
/// \deprecated See PoseRelativeTo.
public: const std::string &PoseFrame() const
SDF_DEPRECATED(9.0);

/// \brief Set the name of the coordinate frame in which this sensor's
/// pose is expressed. A empty value indicates that the frame is the
/// global/world coordinate frame.
/// \param[in] _frame The name of the pose frame.
/// \deprecated See SetPoseRelativeTo.
public: void SetPoseFrame(const std::string &_frame)
SDF_DEPRECATED(9.0);

/// \brief Get SemanticPose object of this object to aid in resolving
/// poses.
/// \return SemanticPose object for this link.
Expand Down
Loading