Revision: 7355
http://playerstage.svn.sourceforge.net/playerstage/?rev=7355&view=rev
Author: rtv
Date: 2009-02-24 23:17:20 +0000 (Tue, 24 Feb 2009)
Log Message:
-----------
fixed gripper bug reported by Pante a
Modified Paths:
--------------
code/stage/trunk/examples/ctrl/CMakeLists.txt
code/stage/trunk/libstage/model_gripper.cc
code/stage/trunk/libstage/option.cc
Modified: code/stage/trunk/examples/ctrl/CMakeLists.txt
===================================================================
--- code/stage/trunk/examples/ctrl/CMakeLists.txt 2009-02-24 09:49:34 UTC
(rev 7354)
+++ code/stage/trunk/examples/ctrl/CMakeLists.txt 2009-02-24 23:17:20 UTC
(rev 7355)
@@ -5,6 +5,7 @@
sink
source
wander
+ justATest
)
Modified: code/stage/trunk/libstage/model_gripper.cc
===================================================================
--- code/stage/trunk/libstage/model_gripper.cc 2009-02-24 09:49:34 UTC (rev
7354)
+++ code/stage/trunk/libstage/model_gripper.cc 2009-02-24 23:17:20 UTC (rev
7355)
@@ -257,7 +257,7 @@
}
// // move the paddles
- if( cfg.paddles == PADDLE_OPENING && !cfg.paddles_stalled )
+ if( cfg.paddles == PADDLE_OPENING )// && !cfg.paddles_stalled )
{
cfg.paddle_position -= 0.05;
@@ -281,7 +281,7 @@
}
}
- else if( cfg.paddles == PADDLE_CLOSING && !cfg.paddles_stalled )
+ else if( cfg.paddles == PADDLE_CLOSING ) //&& !cfg.paddles_stalled )
{
cfg.paddle_position += 0.05;
//printf( "paddle position %.2f\n", cfg.paddle_position );
Modified: code/stage/trunk/libstage/option.cc
===================================================================
--- code/stage/trunk/libstage/option.cc 2009-02-24 09:49:34 UTC (rev 7354)
+++ code/stage/trunk/libstage/option.cc 2009-02-24 23:17:20 UTC (rev 7355)
@@ -6,20 +6,27 @@
using namespace Stg;
-Option::Option( std::string n, std::string tok, std::string key, bool v,
World* world ) :
-optName( n ),
-value( v ),
-wf_token( tok ),
-shortcut( key ),
-menu( NULL ),
-menuCb( NULL ),
-_world( world ),
-htname( strdup(n.c_str()) )
-{ }
+Option::Option( std::string n,
+ std::string tok,
+ std::string key,
+ bool v,
+ World* world ) :
+ optName( n ),
+ value( v ),
+ wf_token( tok ),
+ shortcut( key ),
+ menu( NULL ),
+ menuCb( NULL ),
+ _world( world ),
+ htname( strdup(n.c_str()) )
+{
+ /* do nothing */
+}
-Fl_Menu_Item* getMenuItem( Fl_Menu_* menu, int i ) {
- const Fl_Menu_Item* mArr = menu->menu();
- return const_cast<Fl_Menu_Item*>( &mArr[ i ] );
+Fl_Menu_Item* getMenuItem( Fl_Menu_* menu, int i )
+{
+ const Fl_Menu_Item* mArr = menu->menu();
+ return const_cast<Fl_Menu_Item*>( &mArr[ i ] );
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
