Skip to content

Commit

Permalink
Update ignitionrobotics to gazebosim
Browse files Browse the repository at this point in the history
Signed-off-by: Nate Koenig <nate@openrobotics.org>
  • Loading branch information
Nate Koenig committed Nov 29, 2022
1 parent efafa33 commit 01b006c
Show file tree
Hide file tree
Showing 21 changed files with 166 additions and 166 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
See the [Gazebo Robotics contributing guide](https://ignitionrobotics.org/docs/all/contributing).
See the [Gazebo Robotics contributing guide](https://gazebosim.org/docs/all/contributing).
266 changes: 133 additions & 133 deletions Changelog.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
http://ignitionrobotics.org
http://gazebosim.org
2 changes: 1 addition & 1 deletion src/Application_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ char* g_argv[] =
using namespace gz;
using namespace gui;

// See https://github.com/ignitionrobotics/ign-gui/issues/75
// See https://github.com/gazebosim/gz-gui/issues/75
//////////////////////////////////////////////////
TEST(ApplicationTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(Constructor))
{
Expand Down
4 changes: 2 additions & 2 deletions src/Helpers_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ TEST(HelpersTest, stringTypeFromKey)
}

/////////////////////////////////////////////////
// See https://github.com/ignitionrobotics/ign-gui/issues/75
// See https://github.com/gazebosim/gz-gui/issues/75
TEST(HelpersTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(findFirstByProperty))
{
Application app(gg_argc, gg_argv);
Expand All @@ -146,7 +146,7 @@ TEST(HelpersTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(findFirstByProperty))
}

/////////////////////////////////////////////////
// See https://github.com/ignitionrobotics/ign-gui/issues/75
// See https://github.com/gazebosim/gz-gui/issues/75
TEST(HelpersTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(worldNames))
{
// No app, no window, no names
Expand Down
2 changes: 1 addition & 1 deletion src/MainWindow_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ using namespace gui;
using namespace std::chrono_literals;

/////////////////////////////////////////////////
// See https://github.com/ignitionrobotics/ign-gui/issues/75
// See https://github.com/gazebosim/gz-gui/issues/75
TEST(MainWindowTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(Constructor))
{
common::Console::SetVerbosity(4);
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ char* g_argv[] =
using namespace gz;
using namespace gui;

// See https://github.com/ignitionrobotics/ign-gui/issues/75
// See https://github.com/gazebosim/gz-gui/issues/75
TEST(PluginTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(DeleteLater))
{
common::Console::SetVerbosity(4);
Expand Down
2 changes: 1 addition & 1 deletion src/gz_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class CmdLine : public ::testing::Test
public: std::string realHome;
};

// See https://github.com/ignitionrobotics/ign-gui/issues/75
// See https://github.com/gazebosim/gz-gui/issues/75
TEST_F(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(list))
{
// Clear home if it exists
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/publisher/Publisher_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ using namespace gz;
using namespace gui;

/////////////////////////////////////////////////
// See https://github.com/ignitionrobotics/ign-gui/issues/75
// See https://github.com/gazebosim/gz-gui/issues/75
TEST(PublisherTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load))
{
common::Console::SetVerbosity(4);
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/scene3d/Scene3D.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,7 @@ void TextureNode::PrepareNode()
newId, sz, QQuickWindow::TextureIsOpaque);
#else
// TODO(anyone) Use createTextureFromNativeObject
// https://github.com/ignitionrobotics/ign-gui/issues/113
// https://github.com/gazebosim/gz-gui/issues/113
#ifndef _WIN32
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/shutdown_button/ShutdownButton_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ char* g_argv[] =
using namespace gz;
using namespace gui;

// See https://github.com/ignitionrobotics/ign-gui/issues/75
// See https://github.com/gazebosim/gz-gui/issues/75
/////////////////////////////////////////////////
TEST(ShutdownButtonTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load))
{
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/topic_viewer/TopicViewer_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ using namespace gui;
using namespace plugins;

/////////////////////////////////////////////////
// See https://github.com/ignitionrobotics/ign-gui/issues/75
// See https://github.com/gazebosim/gz-gui/issues/75
TEST(TopicViewerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load))
{
common::Console::SetVerbosity(4);
Expand All @@ -70,7 +70,7 @@ TEST(TopicViewerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load))
}

/////////////////////////////////////////////////
// See https://github.com/ignitionrobotics/ign-gui/issues/75
// See https://github.com/gazebosim/gz-gui/issues/75
TEST(TopicViewerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Model))
{
setenv("IGN_PARTITION", "ign-gazebo-test", 1);
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/world_control/WorldControl_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ char* g_argv[] =
using namespace gz;
using namespace gui;

// See https://github.com/ignitionrobotics/ign-gui/issues/75
// See https://github.com/gazebosim/gz-gui/issues/75
/////////////////////////////////////////////////
TEST(WorldControlTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load))
{
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/world_stats/WorldStats_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ char* g_argv[] =
using namespace gz;
using namespace gui;

// See https://github.com/ignitionrobotics/ign-gui/issues/75
// See https://github.com/gazebosim/gz-gui/issues/75
/////////////////////////////////////////////////
TEST(WorldStatsTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load))
{
Expand Down
4 changes: 2 additions & 2 deletions test/integration/ExamplesBuild_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
using namespace gz;

// Helper functions copied from
// https://github.com/ignitionrobotics/ign-common/raw/ign-common3/src/Filesystem_TEST.cc
// https://github.com/gazebosim/gz-common/raw/ign-common3/src/Filesystem_TEST.cc

#ifndef _WIN32
#include <fcntl.h> // NOLINT(build/include_order)
Expand Down Expand Up @@ -167,7 +167,7 @@ void ExamplesBuild::Build(const std::string &_type)
}

//////////////////////////////////////////////////
// See https://github.com/ignitionrobotics/ign-gui/issues/75
// See https://github.com/gazebosim/gz-gui/issues/75
TEST_P(ExamplesBuild, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Build))
{
Build(GetParam());
Expand Down
2 changes: 1 addition & 1 deletion test/integration/Examples_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ char* g_argv[] =
using namespace gz;
using namespace gui;

// See https://github.com/ignitionrobotics/ign-gui/issues/75
// See https://github.com/gazebosim/gz-gui/issues/75
/////////////////////////////////////////////////
TEST(ExampleTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Configs))
{
Expand Down
16 changes: 8 additions & 8 deletions tutorials/01_install.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Next Tutorial: \ref commandline

These instructions are for installing only Gazebo GUI. If you're interested
in using all the Gazebo libraries, not only Igniton GUI, check out this
[Gazebo installation](https://ignitionrobotics.org/docs/latest/install).
[Gazebo installation](https://gazebosim.org/docs/latest/install).

We recommend following the binary install instructions to get up and running as
quickly and painlessly as possible.
Expand Down Expand Up @@ -74,7 +74,7 @@ Add OSRF packages:
Clone source code:
```
# This checks out the default branch. You can append `-b ign-gui#` (replace # with a number) to checkout a specific version
git clone http://github.com/ignitionrobotics/ign-gui
git clone http://github.com/gazebosim/gz-gui
```

Install dependencies
Expand Down Expand Up @@ -103,7 +103,7 @@ Build and install as follows:

#### Install Prerequisites

First, follow the [ign-cmake](https://github.com/ignitionrobotics/ign-cmake) tutorial for installing Conda, Visual Studio, CMake, etc., prerequisites, and creating a Conda environment.
First, follow the [ign-cmake](https://github.com/gazebosim/gz-cmake) tutorial for installing Conda, Visual Studio, CMake, etc., prerequisites, and creating a Conda environment.

Navigate to `condabin` if necessary to use the `conda` command (i.e., if Conda is not in your `PATH` environment variable. You can find the location of `condabin` in Anaconda Prompt, `where conda`).

Expand All @@ -123,7 +123,7 @@ Install Gazebo dependencies, replacing `<#>` with the desired versions:
conda install libignition-cmake<#> libignition-common<#> libignition-math<#> libignition-transport<#> libignition-msgs<#> libignition-plugin<#> libignition-tools<#> --channel conda-forge
```

Before [ign-rendering](https://github.com/ignitionrobotics/ign-rendering) becomes available on conda-forge, follow its tutorial to build it from source.
Before [ign-rendering](https://github.com/gazebosim/gz-rendering) becomes available on conda-forge, follow its tutorial to build it from source.

#### Build from source

Expand All @@ -135,7 +135,7 @@ Before [ign-rendering](https://github.com/ignitionrobotics/ign-rendering) become
1. Navigate to where you would like to build the library, and clone the repository.
```
# Optionally, append `-b ign-gui#` (replace # with a number) to check out a specific version
git clone https://github.com/ignitionrobotics/ign-gui.git
git clone https://github.com/gazebosim/gz-gui.git
```

1. Configure and build
Expand All @@ -159,7 +159,7 @@ Before [ign-rendering](https://github.com/ignitionrobotics/ign-rendering) become
# Documentation

API documentation and tutorials can be accessed at
[https://ignitionrobotics.org/libs/gui](https://ignitionrobotics.org/libs/gui)
[https://gazebosim.org/libs/gui](https://gazebosim.org/libs/gui)

You can also generate the documentation from a clone of this repository by following these steps.

Expand All @@ -170,7 +170,7 @@ You can also generate the documentation from a clone of this repository by follo

2. Clone the repository
```
git clone https://github.com/ignitionrobotics/ign-gui
git clone https://github.com/gazebosim/gz-gui
```

3. Configure and build the documentation.
Expand Down Expand Up @@ -203,5 +203,5 @@ Follow these steps to run tests and static code analysis in your clone of this r
make codecheck
```

See the [Writing Tests section of the contributor guide](https://ignitionrobotics.org/docs/all/contributing#writing-tests) for help creating or modifying tests.
See the [Writing Tests section of the contributor guide](https://gazebosim.org/docs/all/contributing#writing-tests) for help creating or modifying tests.

2 changes: 1 addition & 1 deletion tutorials/03_plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The plugin contains [QML](https://doc.qt.io/qt-5/qtqml-index.html)
code that specifies what the widget looks like, as well as C++ code
that defines the plugin's behaviour and ties it to other libraries.

See [HelloPlugin](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui3/examples/plugin/hello_plugin/)
See [HelloPlugin](https://github.com/gazebosim/gz-gui/blob/ign-gui3/examples/plugin/hello_plugin/)
for an example.

## Finding plugins
Expand Down
2 changes: 1 addition & 1 deletion tutorials/05_style.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ but it is also possible to use others such as Default and Universal. This tutori
focuses on customizing the Material style.

The default style is hardcoded into the
[qtquickcontrols2.conf](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui3/include/ignition/gui/qtquickcontrols2.conf)
[qtquickcontrols2.conf](https://github.com/gazebosim/gz-gui/blob/ign-gui3/include/ignition/gui/qtquickcontrols2.conf)
file.

There are a few ways to override the default style:
Expand Down
8 changes: 4 additions & 4 deletions tutorials/07_config.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ environment variable `GZ_GUI_RESOURCE_PATH`, like so:
`GZ_GUI_RESOURCE_PATH=/absolute/path/to/ ign gui --config example.config`

From the C++ API, pass the file path to
[Application::LoadConfig](https://ignitionrobotics.org/api/gui/3.0/classignition_1_1gui_1_1Application.html#a03c4c3a1b1e58cc4bff05658f21fff17).
[Application::LoadConfig](https://gazebosim.org/api/gui/3.0/classignition_1_1gui_1_1Application.html#a03c4c3a1b1e58cc4bff05658f21fff17).

### File structure

Expand All @@ -42,12 +42,12 @@ Gazebo GUI accepts the following top-level elements on a config file:
* `filename`: This attribute specifies the plugin library to be loaded.
* `<ignition-gui>`: Gazebo GUI processes this block before passing the
config to the plugin. See
[plugin_params.config](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui2/examples/config/plugin_params.config)
[plugin_params.config](https://github.com/gazebosim/gz-gui/blob/ign-gui2/examples/config/plugin_params.config)
for an example.
* custom elements: Developers can read custom plugin configurations overriding the
[Plugin::LoadConfig](https://ignitionrobotics.org/api/gui/3.0/classignition_1_1gui_1_1Plugin.html#a72064530af4cd247b994b905559fd4ee)
[Plugin::LoadConfig](https://gazebosim.org/api/gui/3.0/classignition_1_1gui_1_1Plugin.html#a72064530af4cd247b994b905559fd4ee)
function, see the
[HelloPlugin](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui2/examples/plugin/hello_plugin/HelloPlugin.cc)
[HelloPlugin](https://github.com/gazebosim/gz-gui/blob/ign-gui2/examples/plugin/hello_plugin/HelloPlugin.cc)
example.

See the example plugin block below:
Expand Down
2 changes: 1 addition & 1 deletion tutorials/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
Gazebo GUI is a component in the Gazebo framework, a set
of libraries designed to rapidly develop robot applications.

[http://ignitionrobotics.org](http://ignitionrobotics.org)
[http://gazebosim.org](http://gazebosim.org)

0 comments on commit 01b006c

Please sign in to comment.