Revision: 8419
http://playerstage.svn.sourceforge.net/playerstage/?rev=8419&view=rev
Author: natepak
Date: 2009-11-18 20:14:57 +0000 (Wed, 18 Nov 2009)
Log Message:
-----------
Fixed loading camera positions
Modified Paths:
--------------
code/gazebo/trunk/server/gui/GLFrameManager.cc
code/gazebo/trunk/server/gui/Toolbar.cc
code/gazebo/trunk/server/gui/Toolbar.hh
Modified: code/gazebo/trunk/server/gui/GLFrameManager.cc
===================================================================
--- code/gazebo/trunk/server/gui/GLFrameManager.cc 2009-11-18 18:17:29 UTC
(rev 8418)
+++ code/gazebo/trunk/server/gui/GLFrameManager.cc 2009-11-18 20:14:57 UTC
(rev 8419)
@@ -135,12 +135,13 @@
else
{
frame = new GLFrame( x, y, width, height, stream.str() );
- frame->Load(camNode);
this->frames.push_back( frame );
this->insert(*frame, i);
}
+ frame->Load(camNode);
+
i++;
camNode = camNode->GetNext();
this->redraw();
Modified: code/gazebo/trunk/server/gui/Toolbar.cc
===================================================================
--- code/gazebo/trunk/server/gui/Toolbar.cc 2009-11-18 18:17:29 UTC (rev
8418)
+++ code/gazebo/trunk/server/gui/Toolbar.cc 2009-11-18 20:14:57 UTC (rev
8419)
@@ -97,7 +97,7 @@
x += 5;
y += 5;
- this->playButton = new Fl_Button(x, y, 30, 20);
+ this->playButton = new Fl_Button(x, y, 20, 20);
this->playButton->callback( &gazebo::Toolbar::PlayButtonCB, this );
this->playButton->color(BG_COLOR, BG_COLOR);
this->playButton->image(this->playImage[1]);
@@ -105,20 +105,23 @@
this->playButton->deactivate();
x = this->playButton->x() + this->playButton->w() + 10;
- this->pauseButton = new Fl_Button(x, y, 30, 20);
+ this->pauseButton = new Fl_Button(x, y, 20, 20);
this->pauseButton->callback( &gazebo::Toolbar::PauseButtonCB, this );
this->pauseButton->color(BG_COLOR, BG_COLOR);
this->pauseButton->image(this->pauseImage[0]);
this->pauseButton->box(FL_NO_BOX);
x = this->pauseButton->x() + this->pauseButton->w() + 10;
- this->stepButton = new Fl_Button(x, y, 30, 20);
+ this->stepButton = new Fl_Button(x, y, 20, 20);
this->stepButton->callback( &gazebo::Toolbar::StepButtonCB, this );
this->stepButton->color(BG_COLOR, BG_COLOR);
this->stepButton->image(this->stepImage[1]);
this->stepButton->box(FL_NO_BOX);
this->stepButton->deactivate();
+ //x = this->stepButton->x() + this->stepButton->w() + 10;
+ //this->moveButton = new Fl_Button(x,y,20,20);
+
this->end();
this->resizable(NULL);
}
Modified: code/gazebo/trunk/server/gui/Toolbar.hh
===================================================================
--- code/gazebo/trunk/server/gui/Toolbar.hh 2009-11-18 18:17:29 UTC (rev
8418)
+++ code/gazebo/trunk/server/gui/Toolbar.hh 2009-11-18 20:14:57 UTC (rev
8419)
@@ -60,10 +60,12 @@
private: Fl_Button *playButton;
private: Fl_Button *pauseButton;
private: Fl_Button *stepButton;
+ private: Fl_Button *moveButton;
private: Fl_RGB_Image *playImage[2];
private: Fl_RGB_Image *pauseImage[2];
private: Fl_RGB_Image *stepImage[2];
+
};
}
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
