[Personalrobots-commit] SF.net SVN: personalrobots: [35] pkg/trunk/exploreGraph/src/exploreGraph

[<tf...@us...>]

Revision: 35
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=35&view=rev
Author:   tfoote
Date:     2008-03-26 15:48:08 -0700 (Wed, 26 Mar 2008)

Log Message:
-----------
adding command line options for master URL and port ticket:1 ticket:2

Modified Paths:
--------------
    pkg/trunk/exploreGraph/src/exploreGraph/renderGraph.py
    pkg/trunk/exploreGraph/src/exploreGraph/viewGraph.py

Modified: pkg/trunk/exploreGraph/src/exploreGraph/renderGraph.py
===================================================================
--- pkg/trunk/exploreGraph/src/exploreGraph/renderGraph.py	2008-03-26 20:49:00 UTC (rev 34)
+++ pkg/trunk/exploreGraph/src/exploreGraph/renderGraph.py	2008-03-26 22:48:08 UTC (rev 35)
@@ -59,19 +59,35 @@
     return val
 
 def usage(stdout, progname):
-    print >>stdout, """%s [-h]
+    print >>stdout, """%s [-h] [-s SERVER_ADDRESS] [-p SERVER_PORT]
 
 """%progname+rospy.USAGE_ENV
 
 def renderGraphMain(argv, stdout, env):
+    # default arguments
+    server = "http://localhost"
+    server_port = rospy.DEFAULT_TEST_PORT
+
     #check arguments for a help flag
-    optlist, args = getopt.getopt(argv[1:], "h?", ["help","test"])
+    optlist, args = getopt.getopt(argv[1:], "h?p:s:", ["help","port=","server=","test"])
     for o, a in optlist:
         if o in ("-h","-?","--help"):
             usage(stdout, argv[0])
             return
-        if o == "--test":
-            testMode(NAME)
+        elif o in ("--test"):
+            server_port = rospy.DEFAULT_TEST_PORT
+        elif o in ("-p", "--port"):
+            server_port = a
+        elif o in ("-s", "--server"):
+            server = a
+
+
+    serverUri = '%s:%s/'%(server,server_port)
+    print "Looking for server at %s"%serverUri
+    os.environ[rospy.ROS_MASTER_URI] = serverUri
+    os.environ[rospy.ROS_NODE] = "viewGraph"
+    os.environ[rospy.ROS_PORT] = str(0) # any
+
             
     master = rospy.getMaster()
 

Modified: pkg/trunk/exploreGraph/src/exploreGraph/viewGraph.py
===================================================================
--- pkg/trunk/exploreGraph/src/exploreGraph/viewGraph.py	2008-03-26 20:49:00 UTC (rev 34)
+++ pkg/trunk/exploreGraph/src/exploreGraph/viewGraph.py	2008-03-26 22:48:08 UTC (rev 35)
@@ -45,19 +45,35 @@
 NAME = 'viewGraph'
 
 def usage(stdout, progname):
-    print >>stdout, """%s [-h]
+    print >>stdout, """%s [-h] [-s SERVER_ADDRESS] [-p SERVER_PORT]
 
 """%progname+rospy.USAGE_ENV
 
 def viewGraphMain(argv, stdout, env):
+    # default arguments
+    server = "http://localhost"
+    server_port = rospy.DEFAULT_TEST_PORT
+
     #check arguments for a help flag
-    optlist, args = getopt.getopt(argv[1:], "h?", ["help","test"])
+    optlist, args = getopt.getopt(argv[1:], "h?p:s:", ["help","port=","server=","test"])
     for o, a in optlist:
         if o in ("-h","-?","--help"):
             usage(stdout, argv[0])
             return
-        if o == "--test":
-            testMode(NAME)
+        elif o in ("--test"):
+            server_port = rospy.DEFAULT_TEST_PORT
+        elif o in ("-p", "--port"):
+            server_port = a
+        elif o in ("-s", "--server"):
+            server = a
+
+
+    serverUri = '%s:%s/'%(server,server_port)
+    print "Looking for server at %s"%serverUri
+    os.environ[rospy.ROS_MASTER_URI] = serverUri
+    os.environ[rospy.ROS_NODE] = "viewGraph"
+    os.environ[rospy.ROS_PORT] = str(0) # any
+
             
     master = rospy.getMaster()
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.