Revision 6ee555a3 scout/scoutsim/GUI.py

View differences:

scout/scoutsim/GUI.py
5 5
# shell subprocess libs
6 6
import subprocess
7 7
import shlex  #for converting string commands to tokens
8
import sys
8 9

  
9 10
# GUI libs
10 11
import wx
......
33 34
    # this takes advantage of the fact that our behavior list start at 1    
34 35
    behaviors = ["Pause", "CW Circle", "CCW Circle", "Odometry",
35 36
                          "Navigation Map", "Scheduler", "Warehouse",
36
                          "Line Follow", "WL Test"]
37
                          "Line Follow", "WL Test", "Maze Solve"]
37 38
    @classmethod
38 39
    def getNumber(self, behaviorName):
39 40
        if (behaviorName in Behaviors.behaviors):
......
178 179
            style=wx.DEFAULT_FRAME_STYLE ^ wx.RESIZE_BORDER, size=(600, 600))
179 180
        
180 181
        # open up scoutsim race
181
        command = shlex.split("rosrun scoutsim scoutsim_node race")
182
        if len(sys.argv) > 1:
183
            map_name = sys.argv[1]
184
        else:
185
            map_name = "race"
186
        command = shlex.split("rosrun scoutsim scoutsim_node " + map_name)
182 187
        self.simWindowProcess = subprocess.Popen(command, shell=False)
183 188
        #rospy.wait_for_service('/spawn') #don't know why this is here
184 189
        

Also available in: Unified diff