Revision: 6733
http://playerstage.svn.sourceforge.net/playerstage/?rev=6733&view=rev
Author: jeremy_asher
Date: 2008-07-02 10:57:24 -0700 (Wed, 02 Jul 2008)
Log Message:
-----------
Option cleanup
Modified Paths:
--------------
code/stage/trunk/libstage/canvas.cc
code/stage/trunk/libstage/model.cc
code/stage/trunk/libstage/stage.hh
Modified: code/stage/trunk/libstage/canvas.cc
===================================================================
--- code/stage/trunk/libstage/canvas.cc 2008-07-02 17:55:54 UTC (rev 6732)
+++ code/stage/trunk/libstage/canvas.cc 2008-07-02 17:57:24 UTC (rev 6733)
@@ -44,6 +44,7 @@
showGrid( "Grid", "show_grid", "g", true ),
showOccupancy( "Debug/Occupancy", "show_occupancy", "#O", false ),
showScreenshots( "Save screenshots", "screenshots", "", false ),
+ showStatus( "Status", "show_status", "", true ),
showTrailArrows( "Trails/Rising Arrows", "show_trailarrows", "#a", false ),
showTrailRise( "Trails/Rising blocks", "show_trailrise", "#r", false ),
showTrails( "Trails/Fast", "show_trailfast", "t", false ),
@@ -548,11 +549,11 @@
for( GList* it=world->StgWorld::children; it; it=it->next )
((StgModel*)it->data)->DrawFlagList();
- if( StgModel::ShowBlinken )
+ if( showBlinken )
for( GList* it=world->StgWorld::children; it; it=it->next )
((StgModel*)it->data)->DrawBlinkenlights();
- if ( StgModel::ShowStatus )
+ if ( showStatus )
for( GList* it=world->StgWorld::children; it; it=it->next )
((StgModel*)it->data)->DrawStatusTree( this );
@@ -691,6 +692,7 @@
showFollow.CreateMenuItem( menu, path );
showFootprints.CreateMenuItem( menu, path );
showGrid.CreateMenuItem( menu, path );
+ showStatus.CreateMenuItem( menu, path );
showOccupancy.CreateMenuItem( menu, path );
showTrailArrows.CreateMenuItem( menu, path );
showTrails.CreateMenuItem( menu, path );
Modified: code/stage/trunk/libstage/model.cc
===================================================================
--- code/stage/trunk/libstage/model.cc 2008-07-02 17:55:54 UTC (rev 6732)
+++ code/stage/trunk/libstage/model.cc 2008-07-02 17:57:24 UTC (rev 6733)
@@ -139,9 +139,6 @@
// static members
uint32_t StgModel::count = 0;
-//Option StgModel::ShowVisData( "Sensor Visualizations", false );
-Option StgModel::ShowBlinken( "Show Blinkenlights", "show_blinkenlights", "",
true );
-Option StgModel::ShowStatus( "Show Status", "show_status", "", true );
GHashTable* StgModel::modelsbyid = g_hash_table_new( NULL, NULL );
@@ -236,10 +233,6 @@
// now we can add the basic square shape
this->AddBlockRect( -0.5,-0.5,1,1 );
- //RegisterOption( &ShowVisData );
- RegisterOption( &ShowBlinken );
- //RegisterOption( &ShowStatus );
-
PRINT_DEBUG2( "finished model %s @ %p",
this->token, this );
}
Modified: code/stage/trunk/libstage/stage.hh
===================================================================
--- code/stage/trunk/libstage/stage.hh 2008-07-02 17:55:54 UTC (rev 6732)
+++ code/stage/trunk/libstage/stage.hh 2008-07-02 17:57:24 UTC (rev 6733)
@@ -1168,10 +1168,6 @@
std::vector<Option*> drawOptions;
public:
- // Draw Options
- static Option ShowBlinken;
- static Option ShowStatus;
-
/** Look up a model pointer by a unique model ID */
static StgModel* LookupId( uint32_t id )
{
@@ -1948,6 +1944,7 @@
showGrid,
showOccupancy,
showScreenshots,
+ showStatus,
showTrailArrows,
showTrailRise,
showTrails,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
