|
From: <jfa...@us...> - 2008-11-07 18:35:06
|
Revision: 6385
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=6385&view=rev
Author: jfaustwg
Date: 2008-11-07 18:35:00 +0000 (Fri, 07 Nov 2008)
Log Message:
-----------
r11755@iad: jfaust | 2008-11-06 18:01:37 -0800
Made pr2_gui use the new pr2 config instead of instantiating the displays directly in code
Modified Paths:
--------------
pkg/trunk/visualization/pr2_gui/src/pr2_gui/visualizer_panel.py
Property Changed:
----------------
pkg/trunk/
Property changes on: pkg/trunk
___________________________________________________________________
Modified: svk:merge
- 920d6130-5740-4ec1-bb1a-45963d5fd813:/frameidpr:7015
920d6130-5740-4ec1-bb1a-45963d5fd813:/users/josh-pr:11754
920d6130-5740-4ec1-bb1a-45963d5fd813:/wgpkgtrunk:5865
f5854215-dd47-0410-b2c4-cdd35faa7885:/pkg/branches/rosbus:261
+ 920d6130-5740-4ec1-bb1a-45963d5fd813:/frameidpr:7015
920d6130-5740-4ec1-bb1a-45963d5fd813:/users/josh-pr:11755
920d6130-5740-4ec1-bb1a-45963d5fd813:/wgpkgtrunk:5865
f5854215-dd47-0410-b2c4-cdd35faa7885:/pkg/branches/rosbus:261
Modified: pkg/trunk/visualization/pr2_gui/src/pr2_gui/visualizer_panel.py
===================================================================
--- pkg/trunk/visualization/pr2_gui/src/pr2_gui/visualizer_panel.py 2008-11-07 18:34:47 UTC (rev 6384)
+++ pkg/trunk/visualization/pr2_gui/src/pr2_gui/visualizer_panel.py 2008-11-07 18:35:00 UTC (rev 6385)
@@ -43,45 +43,7 @@
def createDefaultVisualizers(self):
manager = self.getManager();
- manager.createGridVisualizer( "Grid", True )
- manager.createAxesVisualizer( "Origin Axes", False )
- manager.createMarkerVisualizer( "Visualization Markers", True )
+ config_path = rostools.packspec.get_pkg_dir( "ogre_visualizer" ) + "/configs/pr2.vcg"
+ config = wx.FileConfig(localFilename=config_path)
+ manager.loadConfig(config)
- robot_vis = manager.createRobotModelVisualizer( "Robot Model", False )
- robot_vis.setRobotDescription( "robotdesc/pr2" )
-
- manager.createRobotBase2DPoseVisualizer( "2D Pose: Odom", True )
- localized_pose = manager.createRobotBase2DPoseVisualizer("2D Pose: Localized", True)
- localized_pose.setTopic("localizedpose")
- localized_pose.setColor(ogre_visualizer.Color(0.0, 0.1, 0.8))
-
- manager.createMapVisualizer("Map", True)
-
- planning = manager.createPlanningVisualizer( "Planning", False )
- planning.initialize( "robotdesc/pr2", "display_kinematic_path" )
-
- point_cloud = manager.createPointCloudVisualizer( "Stereo Full Cloud", True )
- point_cloud.setTopic( "videre/cloud" )
- point_cloud.setColor( ogre_visualizer.Color(1.0, 1.0, 1.0) )
-
- point_cloud = manager.createPointCloudVisualizer( "Head Full Cloud", True )
- point_cloud.setTopic( "full_cloud" )
- point_cloud.setColor( ogre_visualizer.Color(1.0, 1.0, 0.0) )
-
- point_cloud = manager.createPointCloudVisualizer( "World 3D Map", True )
- point_cloud.setTopic( "world_3d_map" )
- point_cloud.setColor( ogre_visualizer.Color(1.0, 0.0, 0.0) )
- point_cloud.setBillboardSize( 0.01 )
-
- laser_scan = manager.createLaserScanVisualizer( "Head Scan", True )
- laser_scan.setScanTopic( "tilt_scan" )
- laser_scan.setColor( ogre_visualizer.Color(1.0, 0.0, 0.0) )
- laser_scan.setDecayTime( 30.0 )
-
- laser_scan = manager.createLaserScanVisualizer( "Floor Scan", True )
- laser_scan.setScanTopic( "base_scan" )
- laser_scan.setColor( ogre_visualizer.Color(0.0, 1.0, 0.0) )
- laser_scan.setDecayTime( 0.0 )
-
- manager.createOctreeVisualizer( "Octree", True ).setOctreeTopic( "full_octree" )
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|