Skip to content

Commit

Permalink
Merged in pchorak/gazebo/joint_control_menu_read_current_values (pull…
Browse files Browse the repository at this point in the history
… request #2730)

Joint control menu read current values

Approved-by: Steven Peters <scpeters@osrfoundation.org>
Approved-by: Louise Poubel <lupoubel@hotmail.com>
  • Loading branch information
chapulina committed Jul 13, 2017
2 parents db882ae + 1d72832 commit a863b42
Show file tree
Hide file tree
Showing 17 changed files with 908 additions and 51 deletions.
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Gazebo 8.x.x (2017-xx-xx)

1. Added and improved communications between the JointControlWidget and JointController
* [Pull request #2730](https://bitbucket.org/osrf/gazebo/pull-request/2730)
* [Issue #295](https://bitbucket.org/osrf/gazebo/issues/295)

1. Add the option --gui-client-plugin to load GUI plugins. Leave -g to load System Plugins.
* [Pull request #2716](https://bitbucket.org/osrf/gazebo/pull-requests/2716)
* [Issue 2279](https://bitbucket.org/osrf/gazebo/issues/2279)
Expand Down
12 changes: 12 additions & 0 deletions Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,18 @@ release will remove the deprecated code.
plugins. The `--gui-client-plugin` argument introduced in gazebo 8.2 load GUI
plugins and will remain the exactly the same.

### Modifications

1. **gazebo/gui/JointControlWidget.hh**
+ ***Removed:*** gazebo::transport::Publisher for topic(s) `~/.../joint_cmd`
+ ***Replacement:*** ignition::transport::Publisher for topic(s) `/.../joint_cmd`

### Deprecations

1. **gazebo/physics/JointController.hh**
+ ***Deprecation:*** private: void OnJointCmd(ConstJointCmdPtr &_msg);
+ ***Replacement:*** private: void OnJointCommand(const ignition::msgs::JointCmd &_msg);

## Gazebo 7.X to 8.X

### Build system
Expand Down
8 changes: 8 additions & 0 deletions gazebo/gui/GuiIface.cc
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ Q_DECLARE_METATYPE(std::string)
// qRegisterMetaType is also required, see below.
Q_DECLARE_METATYPE(std::set<std::string>)

// This makes it possible to use ignition::msgs::JointCmd in signals and slots.
// qRegisterMetaType is also required, see below.
Q_DECLARE_METATYPE(ignition::msgs::JointCmd)

//////////////////////////////////////////////////
// QT message handler that pipes qt messages into gazebo's console system.
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Expand Down Expand Up @@ -471,6 +475,10 @@ bool gui::register_metatypes()
// slots. Q_DECLARE_METATYPE is also required, see above.
qRegisterMetaType< std::set<std::string> >();

// Register ignition::msgs::JointCmd as a type that can be used in signals and
// slots. Q_DECLARE_METATYPE is also required, see above.
qRegisterMetaType<ignition::msgs::JointCmd>();

return true;
}

Expand Down
Loading

0 comments on commit a863b42

Please sign in to comment.