Update of /cvsroot/playerstage/code/stage/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14686/src
Modified Files:
gui_menus.c model_fiducial.c p_driver.cc p_driver.h
p_gripper.cc
Log Message:
tweaks for better scalability and some bugfixes
Index: p_gripper.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_gripper.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** p_gripper.cc 23 Aug 2007 19:58:49 -0000 1.9
--- p_gripper.cc 11 Sep 2007 01:14:19 -0000 1.10
***************
*** 185,192 ****
pgeom.pose.ppitch = 0.0f;
pgeom.pose.pyaw = pose.a;
! pgeom.outer_size.sw = geom.size.y;
! pgeom.outer_size.sl = geom.size.x;
! pgeom.inner_size.sw = geom.size.y;
! pgeom.inner_size.sl = geom.size.x;
pgeom.num_beams = 2;
pgeom.capacity = 0;
--- 185,192 ----
pgeom.pose.ppitch = 0.0f;
pgeom.pose.pyaw = pose.a;
! pgeom.outer_size.sw = geom.size.x;
! pgeom.outer_size.sl = geom.size.y;
! pgeom.inner_size.sw = geom.size.x;
! pgeom.inner_size.sl = geom.size.y;
pgeom.num_beams = 2;
pgeom.capacity = 0;
Index: p_driver.h
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_driver.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** p_driver.h 23 Aug 2007 19:58:49 -0000 1.24
--- p_driver.h 11 Sep 2007 01:14:19 -0000 1.25
***************
*** 52,55 ****
--- 52,57 ----
/// an array of pointers to Interface objects, defined below
GPtrArray* devices;
+
+ static unsigned int instance_count;
};
Index: gui_menus.c
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/gui_menus.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** gui_menus.c 25 May 2006 21:35:01 -0000 1.71
--- gui_menus.c 11 Sep 2007 01:14:19 -0000 1.72
***************
*** 719,727 ****
entry.callback = G_CALLBACK(toggle_property_callback);
- //override setting with value in worldfile, if one exists
- if( wf_property_exists( mod->world->win->wf_section, name ))
- enabled = wf_read_int( mod->world->win->wf_section,
- name,
- enabled );
entry.is_active = enabled;
--- 719,722 ----
***************
*** 750,753 ****
--- 745,755 ----
else
g_signal_connect( act, "activate", G_CALLBACK(toggle_property_callback),
args );
+
+ //override setting with value in worldfile, if one exists
+ if( wf_property_exists( mod->world->win->wf_section, name ))
+ enabled = wf_read_int( mod->world->win->wf_section,
+ name,
+ enabled );
+
// if we start enabled, attach the 'on' callback
Index: p_driver.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_driver.cc,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** p_driver.cc 23 Aug 2007 19:58:49 -0000 1.40
--- p_driver.cc 11 Sep 2007 01:14:19 -0000 1.41
***************
*** 296,299 ****
--- 296,301 ----
+ // initialize a static member
+ unsigned int StgDriver::instance_count = 0;
// Constructor. Retrieve options from the configuration file and do any
***************
*** 301,305 ****
// configure the underlying driver to queue incoming commands and use a very
long queue.
-
StgDriver::StgDriver(ConfigFile* cf, int section)
: Driver(cf, section, false, 4096 )
--- 303,306 ----
***************
*** 471,474 ****
--- 472,476 ----
int StgDriver::Setup()
{
+ StgDriver::instance_count++;
//puts("stage driver setup");
return(0);
***************
*** 544,548 ****
int StgDriver::Shutdown()
{
! puts("Shutting stage driver down");
// Stop and join the driver thread
--- 546,550 ----
int StgDriver::Shutdown()
{
! //puts("Shutting stage driver down");
// Stop and join the driver thread
***************
*** 556,560 ****
// }
! puts("stage driver has been shutdown");
return(0);
--- 558,563 ----
// }
! if( --StgDriver::instance_count == 0 )
! puts("All Stage drivers have been shutdown.");
return(0);
Index: model_fiducial.c
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/model_fiducial.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** model_fiducial.c 21 Nov 2006 01:30:47 -0000 1.50
--- model_fiducial.c 11 Sep 2007 01:14:19 -0000 1.51
***************
*** 130,135 ****
stg_model_set_cfg( mod, &cfg, sizeof(cfg) );
- stg_model_add_callback( mod, &mod->data, fiducial_render_data, NULL );
-
// adds a menu item and associated on-and-off callbacks
stg_model_add_property_toggles( mod,
--- 130,133 ----
***************
*** 314,318 ****
int fiducial_unrender_data( stg_model_t* mod, void* userp )
{
- //printf( "fid unrender userp %s\n", (char*)userp );
stg_model_fig_clear( mod, "fiducial_data_fig" );
return 1; // cancel callback
--- 312,315 ----
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
