Revision: 8426
http://playerstage.svn.sourceforge.net/playerstage/?rev=8426&view=rev
Author: natepak
Date: 2009-11-20 14:56:00 +0000 (Fri, 20 Nov 2009)
Log Message:
-----------
Load models to the track choice on creation of frame
Modified Paths:
--------------
code/gazebo/trunk/server/gui/GLFrame.cc
code/gazebo/trunk/worlds/willowgarage.world
Modified: code/gazebo/trunk/server/gui/GLFrame.cc
===================================================================
--- code/gazebo/trunk/server/gui/GLFrame.cc 2009-11-20 04:49:22 UTC (rev
8425)
+++ code/gazebo/trunk/server/gui/GLFrame.cc 2009-11-20 14:56:00 UTC (rev
8426)
@@ -63,6 +63,7 @@
this->viewChoice->value(0);
this->viewChoice->color(BG_COLOR);
+
this->splitChoice = new Fl_Choice(
this->viewChoice->x() + this->viewChoice->w()+2,
this->viewChoice->y(), 150, 26);
@@ -83,6 +84,12 @@
this->trackChoice->value(0);
this->trackChoice->color(BG_COLOR);
+ std::vector<Model*> models = World::Instance()->GetModels();
+ std::vector<Model*>::iterator iter;
+ for (iter = models.begin(); iter != models.end(); iter++)
+ this->EntityAddedSlot(*iter);
+
+
this->headerBar->end();
this->headerBar->resizable(NULL);
Modified: code/gazebo/trunk/worlds/willowgarage.world
===================================================================
--- code/gazebo/trunk/worlds/willowgarage.world 2009-11-20 04:49:22 UTC (rev
8425)
+++ code/gazebo/trunk/worlds/willowgarage.world 2009-11-20 14:56:00 UTC (rev
8426)
@@ -54,7 +54,7 @@
<size>1365 1085</size>
<pos>5 49</pos>
<frames>
- <camera width="1115" height="995" x="250"
+ <camera width="1115" height="965" x="250"
y="60">
<xyz>1.9 -2.53 1.65</xyz>
<rpy>0 14.6 113.70</rpy>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
