Skip to content

Commit

Permalink
port: 8 to main (#581)
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
  • Loading branch information
mjcarroll authored Oct 5, 2023
2 parents 181a0d5 + b3ed6bd commit cfc1bf7
Show file tree
Hide file tree
Showing 6 changed files with 97 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ find_package(gz-cmake3 REQUIRED)
set(CMAKE_CXX_STANDARD 17)

set(CMAKE_CXX_STANDARD_REQUIRED ON)
gz_configure_project(VERSION_SUFFIX pre1)
gz_configure_project(VERSION_SUFFIX)

#============================================================================
# Set project-specific options
Expand Down
78 changes: 77 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,87 @@
## Gazebo GUI 8

### Gazebo GUI 8.0.0 (202X-XX-XX)
### Gazebo GUI 8.0.0 (2023-09-29)

1. Use fully-qualified message names to avoid deprecation warning
* [Pull request #575](https://github.com/gazebosim/gz-gui/pull/575)

1. Fix crash when starting Topic Viewer
* [Pull request #574](https://github.com/gazebosim/gz-gui/pull/574)

1. Add namespace for plugins for doxygen in gz-sim
* [Pull request #571](https://github.com/gazebosim/gz-gui/pull/571)

1. ign -> gz
* [Pull request #570](https://github.com/gazebosim/gz-gui/pull/570)
* [Pull request #556](https://github.com/gazebosim/gz-gui/pull/556)

1. Documentation fixes
* [Pull request #569](https://github.com/gazebosim/gz-gui/pull/569)

1. Suppress new Jammy warnings
* [Pull request #404](https://github.com/gazebosim/gz-gui/pull/404)

1. Fix issue with topic info.
* [Pull request #566](https://github.com/gazebosim/gz-gui/pull/566)

1. Make plugins include message types they use
* [Pull request #563](https://github.com/gazebosim/gz-gui/pull/563)

1. Fix segfaulting tests
* [Pull request #429](https://github.com/gazebosim/gz-gui/pull/429)

1. WorldControl: use event by default
* [Pull request #531](https://github.com/gazebosim/gz-gui/pull/531)

1. Find any major version of Protobuf
* [Pull request #544](https://github.com/gazebosim/gz-gui/pull/544)

1. Fix TopicInfo depcrecation warnings
* [Pull request #543](https://github.com/gazebosim/gz-gui/pull/543)

1. Fix data race issues in CameraTracking plugin
* [Pull request #537](https://github.com/gazebosim/gz-gui/pull/537)

1. Bump msgs and transport version in Harmonic
* [Pull request #517](https://github.com/gazebosim/gz-gui/pull/517)

1. Add Vulkan QML backend
* [Pull request #467](https://github.com/gazebosim/gz-gui/pull/467)

1. Add fallback rendering for other APIs
* [Pull request #357](https://github.com/gazebosim/gz-gui/pull/357)

1. Infrastructure
* [Pull request #560](https://github.com/gazebosim/gz-gui/pull/560)
* [Pull request #559](https://github.com/gazebosim/gz-gui/pull/559)
* [Pull request #555](https://github.com/gazebosim/gz-gui/pull/555)
* [Pull request #536](https://github.com/gazebosim/gz-gui/pull/536)

1. ⬆️ Bump main to 8.0.0~pre1
* [Pull request #456](https://github.com/gazebosim/gz-gui/pull/456)
* [Pull request #512](https://github.com/gazebosim/gz-gui/pull/512)

## Gazebo GUI 7

### Gazebo GUI 7.X.X (202X-XX-XX)

### Gazebo GUI 7.2.1 (2023-09-26)

1. Fix segfaulting tests
* [Pull request #429](https://github.com/gazebosim/gz-gui/pull/429)

1. Find any major version of Protobuf
* [Pull request #544](https://github.com/gazebosim/gz-gui/pull/544)

1. Fix data race issues in CameraTracking plugin
* [Pull request #537](https://github.com/gazebosim/gz-gui/pull/537)

1. Infrastructure
* [Pull request #560](https://github.com/gazebosim/gz-gui/pull/560)
* [Pull request #559](https://github.com/gazebosim/gz-gui/pull/559)
* [Pull request #536](https://github.com/gazebosim/gz-gui/pull/536)


### Gazebo GUI 7.2.0 (2023-05-14)

1. Add support for bayer images to get displayed in gazebo gui
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ which can be used to add custom widgets.

# Install

See the [installation tutorial](https://gazebosim.org/api/gui/5.0/install.html).
See the [installation tutorial](https://gazebosim.org/api/gui/8/install.html).

# Usage

Take a look at the
[tutorials](https://gazebosim.org/api/gui/5.0/tutorials.html)
[tutorials](https://gazebosim.org/api/gui/8/tutorials.html)
for usage instructions and API documentation.

## Known issue of command line tools
Expand All @@ -66,12 +66,12 @@ line tools from `gz-tools` may not work correctly.
A workaround for a single package is to define the environment variable
`GZ_CONFIG_PATH` to point to the location of the Gazebo library installation,
where the YAML file for the package is found, such as
```
```{.sh}
export GZ_CONFIG_PATH=/usr/local/share/gz
```

Multiple paths can be specified using the `:` delimiter. For example,
```
```{.sh}
export GZ_CONFIG_PATH=/user/local/share/gz/:/path/to/some/other/location
```

Expand Down
3 changes: 3 additions & 0 deletions include/gz/gui/Plugin.hh
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ namespace gz
{
namespace gui
{
/// \brief Namespace for all plugins
namespace plugins {}

class PluginPrivate;

/// \brief Base class for Gazebo GUI plugins.
Expand Down
9 changes: 6 additions & 3 deletions src/plugins/topic_viewer/TopicViewer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,11 @@ void TopicViewerPrivate::CreateModel()
std::vector<transport::MessagePublisher> publishers;
std::vector<transport::MessagePublisher> subscribers;
this->node.TopicInfo(topics[i], publishers, subscribers);
std::string msgType = publishers[0].MsgTypeName();
this->AddTopic(topics[i], msgType);
if (!publishers.empty())
{
std::string msgType = publishers[0].MsgTypeName();
this->AddTopic(topics[i], msgType);
}
}
}

Expand Down Expand Up @@ -266,7 +269,7 @@ void TopicViewerPrivate::AddField(QStandardItem *_parentItem,
auto messageType = msgField->message_type();

if (messageType)
this->AddField(msgItem, msgField->name(), messageType->name());
this->AddField(msgItem, msgField->name(), messageType->full_name());

else
{
Expand Down
10 changes: 6 additions & 4 deletions tutorials/01_install.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ The source install instructions should be used if you need the very latest
software improvements, if you need to modify the code, or if you plan to make a
contribution.

**Note:** If the version is 6 or downwards replace `gz-gui<#>` for `ign-gui<#>` in the command line. For more information take a look [here](https://community.gazebosim.org/t/a-new-era-for-gazebo/1356).

## Binary Install

### Ubuntu
Expand Down Expand Up @@ -98,16 +100,16 @@ Build and install as follows:

1. Clone the repository
```
git clone https://github.com/gazebosim/gz-gui -b ign-gui<#>
git clone https://github.com/gazebosim/gz-gui -b gz-gui<#>
```
Be sure to replace `<#>` with a number value, such as 5 or 6, depending on
Be sure to replace `<#>` with a number value, such as 7 or 8, depending on
which version you need.

2. Install dependencies
```
brew install --only-dependencies ignition-gui<#>
brew install --only-dependencies gz-gui<#>
```
Be sure to replace `<#>` with a number value, such as 5 or 6, depending on
Be sure to replace `<#>` with a number value, such as 7 or 8, depending on
which version you need.

3. Configure and build
Expand Down

0 comments on commit cfc1bf7

Please sign in to comment.