From: <na...@us...> - 2008-09-24 18:08:23
|
Revision: 7041 http://playerstage.svn.sourceforge.net/playerstage/?rev=7041&view=rev Author: natepak Date: 2008-09-24 18:08:09 +0000 (Wed, 24 Sep 2008) Log Message: ----------- add svn properties Modified Paths: -------------- code/gazebo/trunk/server/gui/GLFrame.cc code/gazebo/trunk/server/gui/GLFrame.hh code/gazebo/trunk/server/gui/GLFrameManager.cc code/gazebo/trunk/server/gui/GLFrameManager.hh code/gazebo/trunk/server/gui/GLWindow.cc code/gazebo/trunk/server/gui/GLWindow.hh code/gazebo/trunk/server/gui/MainMenu.cc code/gazebo/trunk/server/gui/MainMenu.hh code/gazebo/trunk/server/gui/StatusBar.cc code/gazebo/trunk/server/gui/StatusBar.hh code/gazebo/trunk/server/gui/Toolbar.cc code/gazebo/trunk/server/gui/Toolbar.hh Property Changed: ---------------- code/gazebo/trunk/server/gui/ code/gazebo/trunk/server/gui/GLFrame.cc code/gazebo/trunk/server/gui/GLFrame.hh code/gazebo/trunk/server/gui/GLFrameManager.cc code/gazebo/trunk/server/gui/GLFrameManager.hh code/gazebo/trunk/server/gui/GLWindow.cc code/gazebo/trunk/server/gui/GLWindow.hh code/gazebo/trunk/server/gui/Gui.cc code/gazebo/trunk/server/gui/Gui.hh code/gazebo/trunk/server/gui/MainMenu.cc code/gazebo/trunk/server/gui/MainMenu.hh code/gazebo/trunk/server/gui/StatusBar.cc code/gazebo/trunk/server/gui/StatusBar.hh code/gazebo/trunk/server/gui/Toolbar.cc code/gazebo/trunk/server/gui/Toolbar.hh Property changes on: code/gazebo/trunk/server/gui ___________________________________________________________________ Modified: svn:ignore - *.os + .player *.os *.so *.o *.a config.log .scon* Ogre.log gazebo Doxyfile gazeborc *.pc .settings .cproject .project bandit Modified: code/gazebo/trunk/server/gui/GLFrame.cc =================================================================== --- code/gazebo/trunk/server/gui/GLFrame.cc 2008-09-24 18:07:24 UTC (rev 7040) +++ code/gazebo/trunk/server/gui/GLFrame.cc 2008-09-24 18:08:09 UTC (rev 7041) @@ -21,7 +21,7 @@ /* Desc: FLTK GL Frame * Author: Nate Koenig * Date: 18 Jun 2008 - * SVN: $Id:$ + * SVN: $Id$ */ #include <boost/bind.hpp> Property changes on: code/gazebo/trunk/server/gui/GLFrame.cc ___________________________________________________________________ Added: svn:keywords + Id Revision Modified: code/gazebo/trunk/server/gui/GLFrame.hh =================================================================== --- code/gazebo/trunk/server/gui/GLFrame.hh 2008-09-24 18:07:24 UTC (rev 7040) +++ code/gazebo/trunk/server/gui/GLFrame.hh 2008-09-24 18:08:09 UTC (rev 7041) @@ -21,7 +21,7 @@ /* Desc: FLTK GL Frame * Author: Nate Koenig * Date: 18 Jun 2008 - * SVN: $Id:$ + * SVN: $Id$ */ #ifndef GLFRAME_HH Property changes on: code/gazebo/trunk/server/gui/GLFrame.hh ___________________________________________________________________ Added: svn:keywords + Id Revision Modified: code/gazebo/trunk/server/gui/GLFrameManager.cc =================================================================== --- code/gazebo/trunk/server/gui/GLFrameManager.cc 2008-09-24 18:07:24 UTC (rev 7040) +++ code/gazebo/trunk/server/gui/GLFrameManager.cc 2008-09-24 18:08:09 UTC (rev 7041) @@ -21,7 +21,7 @@ /* Desc: FLTK GL Frame manager * Author: Nate Koenig * Date: 18 Jun 2008 - * SVN: $Id:$ + * SVN: $Id$ */ #include "XMLConfig.hh" Property changes on: code/gazebo/trunk/server/gui/GLFrameManager.cc ___________________________________________________________________ Added: svn:keywords + Id Revision Modified: code/gazebo/trunk/server/gui/GLFrameManager.hh =================================================================== --- code/gazebo/trunk/server/gui/GLFrameManager.hh 2008-09-24 18:07:24 UTC (rev 7040) +++ code/gazebo/trunk/server/gui/GLFrameManager.hh 2008-09-24 18:08:09 UTC (rev 7041) @@ -21,7 +21,7 @@ /* Desc: FLTK GL Frame manager * Author: Nate Koenig * Date: 18 Jun 2008 - * SVN: $Id:$ + * SVN: $Id$ */ #ifndef GLFRAMEMANAGER_HH Property changes on: code/gazebo/trunk/server/gui/GLFrameManager.hh ___________________________________________________________________ Added: svn:keywords + Id Revision Modified: code/gazebo/trunk/server/gui/GLWindow.cc =================================================================== --- code/gazebo/trunk/server/gui/GLWindow.cc 2008-09-24 18:07:24 UTC (rev 7040) +++ code/gazebo/trunk/server/gui/GLWindow.cc 2008-09-24 18:08:09 UTC (rev 7041) @@ -21,7 +21,7 @@ /* Desc: GL Window * Author: Nate Koenig * Date: 13 Feb 2006 - * SVN: $Id:$ + * SVN: $Id$ */ #include "Model.hh" Property changes on: code/gazebo/trunk/server/gui/GLWindow.cc ___________________________________________________________________ Added: svn:keywords + Id Revision Modified: code/gazebo/trunk/server/gui/GLWindow.hh =================================================================== --- code/gazebo/trunk/server/gui/GLWindow.hh 2008-09-24 18:07:24 UTC (rev 7040) +++ code/gazebo/trunk/server/gui/GLWindow.hh 2008-09-24 18:08:09 UTC (rev 7041) @@ -21,7 +21,7 @@ /* Desc: GL Window * Author: Nate Koenig * Date: 13 Feb 2006 - * SVN: $Id:$ + * SVN: $Id$ */ #ifndef FLTKGUI_HH Property changes on: code/gazebo/trunk/server/gui/GLWindow.hh ___________________________________________________________________ Added: svn:keywords + Id Revision Property changes on: code/gazebo/trunk/server/gui/Gui.cc ___________________________________________________________________ Modified: svn:keywords - Id + Id Revision Property changes on: code/gazebo/trunk/server/gui/Gui.hh ___________________________________________________________________ Modified: svn:keywords - Id + Id Revision Modified: code/gazebo/trunk/server/gui/MainMenu.cc =================================================================== --- code/gazebo/trunk/server/gui/MainMenu.cc 2008-09-24 18:07:24 UTC (rev 7040) +++ code/gazebo/trunk/server/gui/MainMenu.cc 2008-09-24 18:08:09 UTC (rev 7041) @@ -21,7 +21,7 @@ /* Desc: FLTK main menu * Author: Nate Koenig * Date: 13 Feb 2006 - * SVN: $Id:$ + * SVN: $Id$ */ #include <FL/Fl_File_Chooser.H> Property changes on: code/gazebo/trunk/server/gui/MainMenu.cc ___________________________________________________________________ Added: svn:keywords + Id Revision Modified: code/gazebo/trunk/server/gui/MainMenu.hh =================================================================== --- code/gazebo/trunk/server/gui/MainMenu.hh 2008-09-24 18:07:24 UTC (rev 7040) +++ code/gazebo/trunk/server/gui/MainMenu.hh 2008-09-24 18:08:09 UTC (rev 7041) @@ -21,7 +21,7 @@ /* Desc: FLTK main menu * Author: Nate Koenig * Date: 13 Feb 2006 - * SVN: $Id:$ + * SVN: $Id$ */ #ifndef MAINMENU_HH Property changes on: code/gazebo/trunk/server/gui/MainMenu.hh ___________________________________________________________________ Added: svn:keywords + Id Revision Modified: code/gazebo/trunk/server/gui/StatusBar.cc =================================================================== --- code/gazebo/trunk/server/gui/StatusBar.cc 2008-09-24 18:07:24 UTC (rev 7040) +++ code/gazebo/trunk/server/gui/StatusBar.cc 2008-09-24 18:08:09 UTC (rev 7041) @@ -21,7 +21,7 @@ /* Desc: StatusBar * Author: Nate Koenig * Date: 13 Feb 2006 - * SVN: $Id:$ + * SVN: $Id$ */ #include <stdio.h> Property changes on: code/gazebo/trunk/server/gui/StatusBar.cc ___________________________________________________________________ Added: svn:keywords + Id Revision Modified: code/gazebo/trunk/server/gui/StatusBar.hh =================================================================== --- code/gazebo/trunk/server/gui/StatusBar.hh 2008-09-24 18:07:24 UTC (rev 7040) +++ code/gazebo/trunk/server/gui/StatusBar.hh 2008-09-24 18:08:09 UTC (rev 7041) @@ -21,7 +21,7 @@ /* Desc: StatusBar * Author: Nate Koenig * Date: 13 Feb 2006 - * SVN: $Id:$ + * SVN: $Id$ */ #ifndef STATUSBAR_HH #define STATUSBAR_HH Property changes on: code/gazebo/trunk/server/gui/StatusBar.hh ___________________________________________________________________ Added: svn:keywords + Id Revision Modified: code/gazebo/trunk/server/gui/Toolbar.cc =================================================================== --- code/gazebo/trunk/server/gui/Toolbar.cc 2008-09-24 18:07:24 UTC (rev 7040) +++ code/gazebo/trunk/server/gui/Toolbar.cc 2008-09-24 18:08:09 UTC (rev 7041) @@ -21,7 +21,7 @@ /* Desc: Toolbar * Author: Nate Koenig * Date: 13 Feb 2006 - * SVN: $Id:$ + * SVN: $Id$ */ #include <stdio.h> Property changes on: code/gazebo/trunk/server/gui/Toolbar.cc ___________________________________________________________________ Added: svn:keywords + Id Revision Modified: code/gazebo/trunk/server/gui/Toolbar.hh =================================================================== --- code/gazebo/trunk/server/gui/Toolbar.hh 2008-09-24 18:07:24 UTC (rev 7040) +++ code/gazebo/trunk/server/gui/Toolbar.hh 2008-09-24 18:08:09 UTC (rev 7041) @@ -21,7 +21,7 @@ /* Desc: Toolbar * Author: Nate Koenig * Date: 13 Feb 2006 - * SVN: $Id:$ + * SVN: $Id$ */ #ifndef TOOLBAR_HH Property changes on: code/gazebo/trunk/server/gui/Toolbar.hh ___________________________________________________________________ Added: svn:keywords + Id Revision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <na...@us...> - 2008-09-29 21:00:30
|
Revision: 7053 http://playerstage.svn.sourceforge.net/playerstage/?rev=7053&view=rev Author: natepak Date: 2008-09-29 21:00:01 +0000 (Mon, 29 Sep 2008) Log Message: ----------- Ogre 1.6 requires gui to be visible before ogre windows are created. Modified Paths: -------------- code/gazebo/trunk/server/gui/GLWindow.cc code/gazebo/trunk/server/gui/Gui.cc Modified: code/gazebo/trunk/server/gui/GLWindow.cc =================================================================== --- code/gazebo/trunk/server/gui/GLWindow.cc 2008-09-29 18:43:10 UTC (rev 7052) +++ code/gazebo/trunk/server/gui/GLWindow.cc 2008-09-29 21:00:01 UTC (rev 7053) @@ -92,6 +92,7 @@ void GLWindow::Init() { this->show(); + Fl::check(); this->mouseDrag = false; // Create the default camera. Modified: code/gazebo/trunk/server/gui/Gui.cc =================================================================== --- code/gazebo/trunk/server/gui/Gui.cc 2008-09-29 18:43:10 UTC (rev 7052) +++ code/gazebo/trunk/server/gui/Gui.cc 2008-09-29 21:00:01 UTC (rev 7053) @@ -88,6 +88,7 @@ this->end(); this->show(); + Fl::check(); // Create a dummy rendering window. This creates a context, and allows Ogre // to initialize properly This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hsu...@us...> - 2009-06-03 00:57:16
|
Revision: 7763 http://playerstage.svn.sourceforge.net/playerstage/?rev=7763&view=rev Author: hsujohnhsu Date: 2009-06-03 00:57:10 +0000 (Wed, 03 Jun 2009) Log Message: ----------- - fix time scaling. - output instantaneous speedup rates. Modified Paths: -------------- code/gazebo/trunk/server/gui/StatusBar.cc code/gazebo/trunk/server/gui/StatusBar.hh Modified: code/gazebo/trunk/server/gui/StatusBar.cc =================================================================== --- code/gazebo/trunk/server/gui/StatusBar.cc 2009-06-03 00:56:24 UTC (rev 7762) +++ code/gazebo/trunk/server/gui/StatusBar.cc 2009-06-03 00:57:10 UTC (rev 7763) @@ -110,24 +110,42 @@ void StatusBar::Update() { float avgFPS = 0; - float percent = 0; + //float percent = 0; float sim = 0; float real = 0; - if (Simulator::Instance()->GetRealTime() - this->lastUpdateTime > 0.05) + if (Simulator::Instance()->GetRealTime() - this->lastUpdateTime > this->statusUpdatePeriod) { avgFPS = this->gui->GetAvgFPS(); - percent = (Simulator::Instance()->GetSimTime() / Simulator::Instance()->GetRealTime()); + if (Simulator::Instance()->GetRealTime() < this->statusUpdatePeriod ) + { + this->percent = (Simulator::Instance()->GetSimTime() / Simulator::Instance()->GetRealTime()); + this->percentLastRealTime =0; + this->percentLastSimTime = 0; + } + else + { + this->percent = ((Simulator::Instance()->GetSimTime()-this->percentLastSimTime) + / (Simulator::Instance()->GetRealTime()-this->percentLastRealTime) ); + this->percentLastRealTime =Simulator::Instance()->GetRealTime(); + this->percentLastSimTime = Simulator::Instance()->GetSimTime(); + } + sim = Simulator::Instance()->GetSimTime(); - if (sim > 99999) + if (sim > 31536000) { - sim /= (120*24); + sim /= (31536000); this->simTime->label("(dys) Sim Time"); } - else if (sim > 9999) + else if (sim > 86400) { - sim /= 120; + sim /= (86400); + this->simTime->label("(dys) Sim Time"); + } + else if (sim > 3600) + { + sim /= 3600; this->simTime->label("(hrs) Sim Time"); } else if (sim > 999) @@ -137,14 +155,19 @@ } real = Simulator::Instance()->GetRealTime(); - if (sim > 99999) + if (sim > 31536000) { - real /= (120*24); + real /= (31536000); this->realTime->label("(dys) Real Time"); } - else if (real > 9999) + else if (sim > 86400) { - real /= 120; + real /= (86400); + this->realTime->label("(dys) Real Time"); + } + else if (real > 3600) + { + real /= 3600; this->realTime->label("(hrs) Real Time"); } else if (real > 999) @@ -155,7 +178,7 @@ //this->iterations->value(Simulator::Instance()->GetIterations()); this->fps->value(avgFPS); - this->percentOutput->value(percent); + this->percentOutput->value(this->percent); //if (Simulator::Instance()->GetRealTime() - this->realTime->value() > 0.1) Modified: code/gazebo/trunk/server/gui/StatusBar.hh =================================================================== --- code/gazebo/trunk/server/gui/StatusBar.hh 2009-06-03 00:56:24 UTC (rev 7762) +++ code/gazebo/trunk/server/gui/StatusBar.hh 2009-06-03 00:57:10 UTC (rev 7763) @@ -66,6 +66,10 @@ public: Gui *gui; private: double lastUpdateTime; + + // calculated percent speedup in last percentWindowDuration seconds real time. + private: double percent, percentLastRealTime, percentLastSimTime; + private: static const double statusUpdatePeriod = 0.05; }; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |