Skip to content

Commit

Permalink
Grid config: set values from startup and improve layout (#324)
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <[email protected]>
  • Loading branch information
chapulina authored Dec 8, 2021
1 parent 3b57ac2 commit 7f047db
Show file tree
Hide file tree
Showing 13 changed files with 429 additions and 1,084 deletions.
7 changes: 7 additions & 0 deletions Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ Deprecated code produces compile-time warnings. These warning serve as
notification to users that their code should be upgraded. The next major
release will remove the deprecated code.

## Ignition GUI 6.1 to 6.2

* All features from `Grid3D` have been incorportated into `GridConfig`. The code
for the original `Grid3D` has been removed and now the installed library is
just a copy of `GridConfig`. Existing `Grid3D` users shouldn't be affected and
may continue to use `Grid3D` as before.

## Ignition GUI 5.x to 6.x

* The `Scene3D` plugin is deprecated, use `MinimalScene` with
Expand Down
45 changes: 45 additions & 0 deletions examples/config/grid_config.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0"?>

<plugin filename="MinimalScene">
<ignition-gui>
<title>View 1</title>
<property type="string" key="state">docked</property>
</ignition-gui>
<engine>ogre2</engine>
<scene>scene</scene>
<ambient_light>1 1 1</ambient_light>
<background_color>0.8 0.8 0.8</background_color>
<camera_pose>-6 3 6 0 0.5 0</camera_pose>
</plugin>
<plugin filename="InteractiveViewControl" name="Interactive view control">
<ignition-gui>
<anchors target="View 1">
<line own="right" target="right"/>
<line own="top" target="top"/>
</anchors>
<property key="resizable" type="bool">false</property>
<property key="width" type="double">5</property>
<property key="height" type="double">5</property>
<property key="state" type="string">floating</property>
<property key="showTitleBar" type="bool">false</property>
</ignition-gui>
</plugin>
<plugin filename="GridConfig" name="Grid config">
<ignition-gui>
<property type="string" key="state">docked</property>
</ignition-gui>
<insert>
<horizontal_cell_count>3</horizontal_cell_count>
<vertical_cell_count>2</vertical_cell_count>
<cell_length>2</cell_length>
<pose>1 2 3 0 0 0</pose>
<color>1 0 0 1</color>
</insert>
<insert>
<horizontal_cell_count>2</horizontal_cell_count>
<vertical_cell_count>0</vertical_cell_count>
<cell_length>1</cell_length>
<pose>0 0 0 0.5 0 0</pose>
<color>0 1 0 1</color>
</insert>
</plugin>
1 change: 0 additions & 1 deletion src/plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ endfunction()

# Plugins
add_subdirectory(camera_tracking)
add_subdirectory(grid_3d)
add_subdirectory(grid_config)
add_subdirectory(image_display)
add_subdirectory(interactive_view_control)
Expand Down
11 changes: 0 additions & 11 deletions src/plugins/grid_3d/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 7f047db

Please sign in to comment.