Fixes to GUI config and minimal scene example (#1051)

Signed-off-by: Louise Poubel <louise@openrobotics.org>
gazebosim · Sep 25, 2021 · b286a57 · b286a57
1 parent 9baf12d
commit b286a57
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 84 deletions.
diff --git a/examples/worlds/minimal_scene.sdf b/examples/worlds/minimal_scene.sdf
@@ -17,12 +17,8 @@ Features:
 * Spawn entities through GUI
 * View angles
 * View collisions, wireframe, transparent, CoM, etc
-
-Missing for parity with GzScene3D:
-
 * Context menu
 * Drag and drop from Fuel / meshes
-* ...
 
 -->
 <sdf version="1.6">
@@ -56,10 +52,6 @@ Missing for parity with GzScene3D:
       </plugin>
       <plugin filename="GzSceneManager" name="Scene Manager">
         <ignition-gui>
-          <anchors target="3D View">
-            <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>
@@ -69,10 +61,6 @@ Missing for parity with GzScene3D:
       </plugin>
       <plugin filename="InteractiveViewControl" name="Interactive view control">
         <ignition-gui>
-          <anchors target="3D View">
-            <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>
@@ -82,10 +70,6 @@ Missing for parity with GzScene3D:
       </plugin>
       <plugin filename="CameraTracking" name="Camera Tracking">
         <ignition-gui>
-          <anchors target="3D View">
-            <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>
@@ -95,7 +79,16 @@ Missing for parity with GzScene3D:
       </plugin>
       <plugin filename="MarkerManager" name="Marker manager">
         <ignition-gui>
-          <anchors target="3D View">
+          <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="SelectEntities" name="Select Entities">
+        <ignition-gui>
+          <anchors target="Select entities">
             <line own="right" target="right"/>
             <line own="top" target="top"/>
           </anchors>
@@ -106,7 +99,17 @@ Missing for parity with GzScene3D:
           <property key="showTitleBar" type="bool">false</property>
         </ignition-gui>
       </plugin>
-      <plugin filename="SelectEntities" name="Select Entities">
+      <plugin filename="VisualizationCapabilities" name="Visualization Capabilities">
+        <ignition-gui>
+          <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="Spawn" name="Spawn Entities">
         <ignition-gui>
           <anchors target="Select entities">
             <line own="right" target="right"/>
@@ -143,20 +146,6 @@ Missing for parity with GzScene3D:
 
       </plugin>
 
-      <plugin filename="VisualizationCapabilities" name="Visualization Capabilities">
-        <ignition-gui>
-          <anchors target="Select entities">
-            <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>
-
       <!-- World statistics -->
       <plugin filename="WorldStats" name="World stats">
         <ignition-gui>
@@ -180,20 +169,6 @@ Missing for parity with GzScene3D:
         <iterations>true</iterations>
       </plugin>
 
-      <plugin filename="Spawn" name="Spawn Entities">
-        <ignition-gui>
-          <anchors target="Select entities">
-            <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>
-
       <!-- Insert simple shapes -->
       <plugin filename="Shapes" name="Shapes">
         <ignition-gui>

diff --git a/src/gui/gui.config b/src/gui/gui.config
@@ -52,10 +52,6 @@
 </plugin>
 <plugin filename="GzSceneManager" name="Scene Manager">
   <ignition-gui>
-    <anchors target="3D View">
-      <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>
@@ -65,10 +61,6 @@
 </plugin>
 <plugin filename="InteractiveViewControl" name="Interactive view control">
   <ignition-gui>
-    <anchors target="3D View">
-      <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>
@@ -78,10 +70,6 @@
 </plugin>
 <plugin filename="CameraTracking" name="Camera Tracking">
   <ignition-gui>
-    <anchors target="3D View">
-      <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>
@@ -91,10 +79,6 @@
 </plugin>
 <plugin filename="MarkerManager" name="Marker manager">
   <ignition-gui>
-    <anchors target="3D View">
-      <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>
@@ -104,10 +88,6 @@
 </plugin>
 <plugin filename="SelectEntities" name="Select Entities">
   <ignition-gui>
-    <anchors target="Select entities">
-      <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>
@@ -118,10 +98,6 @@
 
 <plugin filename="Spawn" name="Spawn Entities">
   <ignition-gui>
-    <anchors target="Select entities">
-      <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>
@@ -132,10 +108,6 @@
 
 <plugin filename="VisualizationCapabilities" name="Visualization Capabilities">
   <ignition-gui>
-    <anchors target="Select entities">
-      <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>
@@ -264,13 +236,3 @@
     <property type="string" key="state">docked</property>
   </ignition-gui>
 </plugin>
-
-<!-- View angle -->
-<plugin filename="ViewAngle" name="View angle">
-  <ignition-gui>
-    <property type="string" key="state">docked</property>
-  </ignition-gui>
-
-  <!-- disable legacy features used to connect this plugin to GzScene3D -->
-  <legacy>false</legacy>
-</plugin>