From fab620a2d1f748de094203f59091e9b2ba475a09 Mon Sep 17 00:00:00 2001 From: jrutgeer Date: Thu, 8 Aug 2024 00:53:11 +0200 Subject: [PATCH 1/2] gui_system_plugin: clarify description in README (#2253) * Clarfied description that was not clear due to rename Ignition to Gazebo. Signed-off-by: Johan Rutgeerts * Slight rephrasing for extra clarity. Signed-off-by: Johan Rutgeerts --------- Signed-off-by: Johan Rutgeerts Co-authored-by: Addisu Z. Taddese Co-authored-by: Ian Chen --- examples/plugin/gui_system_plugin/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/plugin/gui_system_plugin/README.md b/examples/plugin/gui_system_plugin/README.md index ac8e21d9da..e85a0bb769 100644 --- a/examples/plugin/gui_system_plugin/README.md +++ b/examples/plugin/gui_system_plugin/README.md @@ -2,10 +2,10 @@ This example shows how to create a GUI system plugin. -Gazebo supports any kind of Gazebo GUI plugin -(`gz::gui::Plugin`). Gazebo GUI plugins are a special type of Gazebo -GUI plugin which also have access to entity and component updates coming from -the server. +Gazebo supports any kind of GUI plugin +(`gz-gui` library: `gz::gui::Plugin`). However, GuiSystem plugins +(`gz-sim` library: `gz::sim::GuiSystem`) are a special type of GUI plugin, +which also have access to entity and component updates coming from the server. See `GuiSystemPluginPlugin.hh` for more information. From 523b01b390ed9572522c99f792df01f583bb579f Mon Sep 17 00:00:00 2001 From: Michael Carroll Date: Wed, 7 Aug 2024 22:05:07 -0500 Subject: [PATCH 2/2] Fix ResourceSpawner (#2490) * Use new ModelIdentifier::Url method --------- Signed-off-by: Michael Carroll Co-authored-by: Addisu Z. Taddese Co-authored-by: Ian Chen --- src/gui/plugins/resource_spawner/ResourceSpawner.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/plugins/resource_spawner/ResourceSpawner.cc b/src/gui/plugins/resource_spawner/ResourceSpawner.cc index 7e61cc0c4e..e206415218 100644 --- a/src/gui/plugins/resource_spawner/ResourceSpawner.cc +++ b/src/gui/plugins/resource_spawner/ResourceSpawner.cc @@ -553,7 +553,7 @@ void ResourceSpawner::OnDownloadFuelResource(const QString &_path, // Set the waiting cursor while the resource downloads QGuiApplication::setOverrideCursor(Qt::WaitCursor); if (this->dataPtr->fuelClient->DownloadModel( - common::URI(_path.toStdString()), localPath)) + common::URI(_path.toStdString(), true), localPath)) { // Successful download, set thumbnail std::string thumbnailPath = common::joinPaths(localPath, "thumbnails"); @@ -739,7 +739,7 @@ void ResourceSpawner::RunFetchResourceListThread(const std::string &_owner) resource.isFuel = true; resource.isDownloaded = false; resource.owner = id.Owner(); - resource.sdfPath = id.UniqueName(); + resource.sdfPath = id.Url().Str(); QMetaObject::invokeMethod( this, "UpdateOwnerListModel", Qt::QueuedConnection,