Revision: 8869
http://playerstage.svn.sourceforge.net/playerstage/?rev=8869&view=rev
Author: hsujohnhsu
Date: 2010-09-02 01:12:51 +0000 (Thu, 02 Sep 2010)
Log Message:
-----------
minor change: member variable updatePeriod should match param name and be
updateRate
Modified Paths:
--------------
code/gazebo/branches/wg/server/controllers/Controller.cc
code/gazebo/branches/wg/server/controllers/Controller.hh
Modified: code/gazebo/branches/wg/server/controllers/Controller.cc
===================================================================
--- code/gazebo/branches/wg/server/controllers/Controller.cc 2010-09-02
01:02:49 UTC (rev 8868)
+++ code/gazebo/branches/wg/server/controllers/Controller.cc 2010-09-02
01:12:51 UTC (rev 8869)
@@ -46,7 +46,7 @@
Param::Begin(&this->parameters);
this->nameP = new ParamT<std::string>("name","",1);
this->alwaysOnP = new ParamT<bool>("alwaysOn", false, 0);
- this->updatePeriodP = new ParamT<double>("updateRate", 10, 0);
+ this->updateRateP = new ParamT<double>("updateRate", 10, 0);
Param::End();
if (!dynamic_cast<Model*>(entity) && !dynamic_cast<Sensor*>(entity))
@@ -63,7 +63,7 @@
{
delete this->nameP;
delete this->alwaysOnP;
- delete this->updatePeriodP;
+ delete this->updateRateP;
}
////////////////////////////////////////////////////////////////////////////////
@@ -81,9 +81,9 @@
this->alwaysOnP->Load(node);
- this->updatePeriodP->Load(node);
+ this->updateRateP->Load(node);
- double updateRate = this->updatePeriodP->GetValue();
+ double updateRate = this->updateRateP->GetValue();
if (updateRate == 0)
this->updatePeriod = 0.0; // no throttling if updateRate is 0
else
@@ -159,7 +159,7 @@
stream << prefix << "<controller:" << this->typeName << " name=\"" <<
this->nameP->GetValue() << "\">\n";
- stream << prefix << " " << *(this->updatePeriodP) << "\n";
+ stream << prefix << " " << *(this->updateRateP) << "\n";
// Ouptut the interfaces
for (iter = this->ifaces.begin(); iter != this->ifaces.end(); iter++)
Modified: code/gazebo/branches/wg/server/controllers/Controller.hh
===================================================================
--- code/gazebo/branches/wg/server/controllers/Controller.hh 2010-09-02
01:02:49 UTC (rev 8868)
+++ code/gazebo/branches/wg/server/controllers/Controller.hh 2010-09-02
01:12:51 UTC (rev 8869)
@@ -123,7 +123,7 @@
/// \brief Update period
protected: double updatePeriod;
- protected: ParamT<double> *updatePeriodP;
+ protected: ParamT<double> *updateRateP;
private: std::string typeName;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit