Skip to content

Commit

Permalink
Merge branch 'gz-gui8' into jrivero/fix_noble_warning
Browse files Browse the repository at this point in the history
  • Loading branch information
j-rivero authored Apr 10, 2024
2 parents 9c94954 + b252bd0 commit 856501d
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ labels: bug
---

<!-- If you're not sure whether your problem is a bug, please ask a question at
http://answers.gazebosim.org instead.-->
https://robotics.stackexchange.com instead.-->

## Environment
* OS Version: <!-- e.g, Ubuntu 20.04 -->
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ labels: enhancement

<!-- If you're not sure on the specifics of the feature or would like a broader
discussion, please consider posting a proposal to
http://community.gazebosim.org/ instead.-->
https://robotics.stackexchange.com instead.-->

## Desired behavior
<!-- Describe the current problem and the feature you want implemented.-->
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
name: Ubuntu CI

on: [push, pull_request]
on:
pull_request:
push:
branches:
- 'ign-gui[0-9]'
- 'gz-gui[0-9]?'
- 'main'

jobs:
jammy-ci:
runs-on: ubuntu-latest
name: Ubuntu Jammy CI
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Compile and test
id: ci
uses: gazebo-tooling/action-gz-ci@jammy
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(gz-gui8 VERSION 8.0.0)
project(gz-gui8 VERSION 8.1.0)

#============================================================================
# Find gz-cmake
Expand Down
22 changes: 22 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
## Gazebo GUI 8

### Gazebo GUI 8.1.0 (2024-03-14)

1. Update CI badges in README
* [Pull request #603](https://github.com/gazebosim/gz-gui/pull/603)

1. Fix plugin filter on Windows
* [Pull request #567](https://github.com/gazebosim/gz-gui/pull/567)

1. Tidy namespaces
* [Pull request #590](https://github.com/gazebosim/gz-gui/pull/590)

1. Infrastructure
* [Pull request #591](https://github.com/gazebosim/gz-gui/pull/591)
* [Pull request #597](https://github.com/gazebosim/gz-gui/pull/597)
* [Pull request #608](https://github.com/gazebosim/gz-gui/pull/608)

1. Add check for vulkan support in rendering
* [Pull request #589](https://github.com/gazebosim/gz-gui/pull/589)

1. Add optional binary relocatability
* [Pull request #580](https://github.com/gazebosim/gz-gui/pull/580)

### Gazebo GUI 8.0.0 (2023-09-29)

1. Use fully-qualified message names to avoid deprecation warning
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

Build | Status
-- | --
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-gui/branch/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-gui/branch/main)
Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gui-ci-main-focal-amd64)](https://build.osrfoundation.org/job/ignition_gui-ci-main-focal-amd64)
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gui-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_gui-ci-main-homebrew-amd64)
Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ign_gui-ci-win)](https://build.osrfoundation.org/job/ign_gui-ci-win)
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-gui/tree/gz-gui8/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-gui/tree/gz-gui8)
Ubuntu Jammy | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_gui-ci-gz-gui8-jammy-amd64)](https://build.osrfoundation.org/job/gz_gui-ci-gz-gui8-jammy-amd64)
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_gui-ci-gz-gui8-homebrew-amd64)](https://build.osrfoundation.org/job/gz_gui-ci-gz-gui8-homebrew-amd64)
Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_gui-8-win)](https://build.osrfoundation.org/job/gz_gui-8-win)

Gazebo GUI builds on top of [Qt](https://www.qt.io/) to provide widgets which are
useful when developing robotics applications, such as a 3D view, plots, dashboard, etc,
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/image_display/ImageDisplay.cc
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ void ImageDisplay::ProcessImage()
case msgs::PixelFormatType::RGB_INT8:
// copy image data buffer directly to QImage
image = QImage(reinterpret_cast<const uchar *>(
this->dataPtr->imageMsg.data().c_str()), width, height, qFormat);
this->dataPtr->imageMsg.data().c_str()), width, height,
3 * width, qFormat);
break;
// for other cases, convert to RGB common::Image
case msgs::PixelFormatType::R_FLOAT32:
Expand Down

0 comments on commit 856501d

Please sign in to comment.