Skip to content

Commit 83d4f2a

Browse files
authored
Edifice tutorial updates (#204)
Removed <window> elements that don't work Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
1 parent c72f4f7 commit 83d4f2a

File tree

7 files changed

+15
-37
lines changed

7 files changed

+15
-37
lines changed

README.md

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,23 +70,11 @@ where the YAML file for the package is found, such as
7070
export IGN_CONFIG_PATH=/usr/local/share/ignition
7171
```
7272

73-
However, that environment variable only takes a single path, which means if the
74-
installations from source are in different locations, only one can be specified.
75-
76-
Another workaround for working with multiple Ignition libraries on the command
77-
line is using symbolic links to each library's YAML file.
73+
Multiple paths can be specified using the `:` delimiter. For example,
7874
```
79-
mkdir ~/.ignition/tools/configs -p
80-
cd ~/.ignition/tools/configs/
81-
ln -s /usr/local/share/ignition/fuel6.yaml .
82-
ln -s /usr/local/share/ignition/transport10.yaml .
83-
ln -s /usr/local/share/ignition/transportlog10.yaml .
84-
...
85-
export IGN_CONFIG_PATH=$HOME/.ignition/tools/configs
75+
export IGN_CONFIG_PATH=/user/local/share/ignition/:/path/to/some/other/location
8676
```
8777

88-
This issue is tracked [here](https://github.com/ignitionrobotics/ign-tools/issues/8).
89-
9078
# Folder Structure
9179

9280
* `include/ignition/gui`: Contains all the files which will be installed, such as
@@ -107,9 +95,9 @@ This issue is tracked [here](https://github.com/ignitionrobotics/ign-tools/issue
10795
`ign gui -c <path to file>`
10896

10997
* `examples/plugin`: Example plugins which can be compiled and loaded as explained
110-
in [this tutorial](https://ignitionrobotics.org/api/gui/1.0/plugins.html).
98+
in [this tutorial](https://ignitionrobotics.org/api/gui/5.0/plugins.html).
11199

112-
* `tutorials`: Markdown files for the [tutorials](https://ignitionrobotics.org/api/gui/1.0/tutorials.html).
100+
* `tutorials`: Markdown files for the [tutorials](https://ignitionrobotics.org/api/gui/5.0/tutorials.html).
113101

114102
* `conf`: Files needed by [ign-tools](https://github.com/ignitionrobotics/ign-tools).
115103

examples/config/layout.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?xml version="1.0"?>
22

33
<window>
4-
<position_x>873</position_x>
5-
<position_y>230</position_y>
64
<width>550</width>
75
<height>551</height>
86
</window>

examples/config/scene3d.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?xml version="1.0"?>
22

33
<window>
4-
<position_x>815</position_x>
5-
<position_y>341</position_y>
64
<width>1216</width>
75
<height>894</height>
86
</window>

tutorials/03_plugins.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Previous Tutorial: \ref commandline
88
An Ignition GUI plugin is a shared library that defines a widget.
99
The plugin contains [QML](https://doc.qt.io/qt-5/qtqml-index.html)
1010
code that specifies what the widget looks like, as well as C++ code
11-
that defines the plugin's behaviour and ties it to other libraries.
11+
that defines the plugin's behavior and ties it to other libraries.
1212

13-
See [HelloPlugin](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui3/examples/plugin/hello_plugin/)
13+
See [HelloPlugin](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui5/examples/plugin/hello_plugin/)
1414
for an example.
1515

1616
## Finding plugins
@@ -20,7 +20,7 @@ Ignition GUI will look for plugins on the following paths, in this order:
2020
1. All paths set on the `IGN_GUI_PLUGIN_PATH` environment variable
2121
2. All paths added by calling `ignition::gui::addPluginPath`
2222
3. `~/.ignition/gui/plugins`
23-
4. [Plugins which are installed with Ignition GUI](https://ignitionrobotics.org/api/gui/3.3/namespaceignition_1_1gui_1_1plugins.html)
23+
4. [Plugins which are installed with Ignition GUI](https://ignitionrobotics.org/api/gui/5.0/namespaceignition_1_1gui_1_1plugins.html)
2424

2525
## Configuring plugins
2626

tutorials/04_layout.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,9 @@ Previous Tutorial: \ref plugins
88
It's possible to define the layout of various plugins loaded to the main window
99
by adding a `<window>` element to the config file. The child elements are:
1010

11-
* `<position_x>`: **v0** Horizontal position of window's top-left corner in pixels.
12-
* `<position_y>`: **v0** Vertical position of window's top-left corner in pixels.
1311
* `<width>`: Window's width in pixels
1412
* `<height>`: Window's height in pixels
15-
* `<state>`: **v0** The state of the widow's docks and tabs, described as a Base64
16-
encoded `QByteArray`. More information
17-
[here](http://doc.qt.io/qt-5/qmainwindow.html#saveState).
18-
* `<menus>`: **v0** Configure menu options
13+
* `<menus>`: Configure menu options
1914
* `<drawer>`: Side drawer configuration.
2015
* `visible`: Set to false to hide the drawer and the button to trigger it.
2116
* `<plugins>`: Plugins menu configuration.

tutorials/05_style.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ but it is also possible to use others such as Default and Universal. This tutori
1212
focuses on customizing the Material style.
1313

1414
The default style is hardcoded into the
15-
[qtquickcontrols2.conf](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui4/include/ignition/gui/qtquickcontrols2.conf)
15+
[qtquickcontrols2.conf](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui5/include/ignition/gui/qtquickcontrols2.conf)
1616
file.
1717

1818
There are a few ways to override the default style:
@@ -21,7 +21,7 @@ There are a few ways to override the default style:
2121
* Setting environment variables (env)
2222
* Through Ignition GUI config files (config)
2323

24-
If styles are set from multiple sources, this is the order in which they take precendence:
24+
If styles are set from multiple sources, this is the order in which they take precedence:
2525

2626
**GUI > config > env**
2727

@@ -45,7 +45,7 @@ On top of those, Ignition GUI also offers a few variables specific to customizin
4545
the top toolbar.
4646

4747
By default, the top toolbar will use the primary color, while the plugin toolbars will
48-
use the accent color, according to the current theme. Users can override this behaviour
48+
use the accent color, according to the current theme. Users can override this behavior
4949
and decouple the toolbar colors from the rest of the controls with the following
5050
variables:
5151

tutorials/07_config.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ From the command line, use the `--config` / `-c` option, for example:
2020
`ign gui -c path/to/example.config`
2121

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

2525
### File structure
2626

@@ -32,12 +32,12 @@ Ignition GUI accepts the following top-level elements on a config file:
3232
* `filename`: This attribute specifies the plugin library to be loaded.
3333
* `<ignition-gui>`: Ignition GUI processes this block before passing the
3434
config to the plugin. See
35-
[plugin_params.config](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui2/examples/config/plugin_params.config)
35+
[plugin_params.config](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui5/examples/config/plugin_params.config)
3636
for an example.
3737
* custom elements: Developers can read custom plugin configurations overriding the
38-
[Plugin::LoadConfig](https://ignitionrobotics.org/api/gui/3.0/classignition_1_1gui_1_1Plugin.html#a72064530af4cd247b994b905559fd4ee)
38+
[Plugin::LoadConfig](https://ignitionrobotics.org/api/gui/5.0/classignition_1_1gui_1_1Plugin.html#a72064530af4cd247b994b905559fd4ee)
3939
function, see the
40-
[HelloPlugin](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui2/examples/plugin/hello_plugin/HelloPlugin.cc)
40+
[HelloPlugin](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui5/examples/plugin/hello_plugin/HelloPlugin.cc)
4141
example.
4242

4343
See the example plugin block below:
@@ -52,4 +52,3 @@ See the example plugin block below:
5252
This will load the `libImageDisplay.so` plugin, Ignition GUI will set its
5353
`height` to `120` pixels, and the plugin-specific `<topic>` parameter will be
5454
handled within `ImageDisplay::LoadConfig`.
55-

0 commit comments

Comments
 (0)