[Gcblue-commits] gcb_wx/scripts Menu.py,1.4,1.5 UnitCommands.py,1.8,1.9

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3228/scripts

Modified Files:
	Menu.py UnitCommands.py 
Log Message:


Index: UnitCommands.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/UnitCommands.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** UnitCommands.py	9 Aug 2004 02:35:14 -0000	1.8
--- UnitCommands.py	16 Aug 2004 01:43:30 -0000	1.9
***************
*** 1,5 ****
--- 1,18 ----
+ def AddWaypointOrderGroup(GI, lon, lat):
+     unit_count = GI.GetUnitCount()
+     for n in range(0, unit_count):
+         UnitInfo = GI.GetPlatformInterface(n)
+         AddWaypointOrder(UnitInfo, lon, lat)
+ 
  def AddWaypointOrder(UI, lon, lat):
      UI.AddNavOrder(lon,lat)
  
+ 
+ def AddPatrolOrderGroup(GI):
+     unit_count = GI.GetUnitCount()
+     for n in range(0, unit_count):
+         UnitInfo = GI.GetPlatformInterface(n)
+         AddPatrolOrder(UnitInfo)
+ 
  def AddPatrolOrder(UI):
      UI.AddOrder('Patrol',0)
***************
*** 12,15 ****
--- 25,34 ----
  
  
+ def ClearOrdersGroup(GI):
+     unit_count = GI.GetUnitCount()
+     for n in range(0, unit_count):
+         UnitInfo = GI.GetPlatformInterface(n)
+         ClearOrders(UnitInfo)
+ 
  def ClearOrders(UI):
      UI.ClearOrders()
***************
*** 51,56 ****
      if UI.IsDatumLaunch(launcher):
          track_info = UI.GetTargetTrackInfo()
!         lat = track_info.Lat
!         lon = track_info.Lon
          UI.HandoffTargetToLauncher(launcher) # so that intended target is set
          LaunchDatum(UI, lon, lat, launcher)
--- 70,77 ----
      if UI.IsDatumLaunch(launcher):
          track_info = UI.GetTargetTrackInfo()
!         tti_s = UI.GetLauncherInterceptTime(launcher, track_info)
!         predicted_track = track_info.PredictAhead(tti_s)
!         lat = predicted_track.Lat
!         lon = predicted_track.Lon
          UI.HandoffTargetToLauncher(launcher) # so that intended target is set
          LaunchDatum(UI, lon, lat, launcher)
***************
*** 110,113 ****
--- 131,140 ----
          UI.SetSpeed(k*max_speed)
  
+ def SetHeadingGroup(GI, h):
+     unit_count = GI.GetUnitCount()
+     for n in range(0, unit_count):
+         UnitInfo = GI.GetPlatformInterface(n)
+         SetHeading(UnitInfo, h)
+ 
  def SetHeading(UI,h):
      UI.SetHeadingRad(h)

Index: Menu.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/Menu.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Menu.py	29 Jan 2004 00:05:21 -0000	1.4
--- Menu.py	16 Aug 2004 01:43:30 -0000	1.5
***************
*** 27,30 ****
--- 27,45 ----
      TrackInfo.DropTrack()
  
+ def BuildGroupMenu(GroupMenu, GroupInfo):
+     GroupMenu.Clear()
+ 
+     unit_count = GroupInfo.GetUnitCount()
+     #GroupMenu.AddItem('Total units: %d' % unit_count, '')
+     GroupMenu.AddItemUI('Change heading','SetHeadingGroup','Heading')
+ 
+     # Group orders 
+     GroupMenu.AddItem('Orders','')
+     GroupMenu.BeginSubMenu() 
+     GroupMenu.AddItem('Add patrol order','AddPatrolOrderGroup')
+     GroupMenu.AddItemUI('Add waypoint order', 'AddWaypointOrderGroup', 'Datum')
+     GroupMenu.AddItem('Clear orders','ClearOrdersGroup')
+     GroupMenu.EndSubMenu() 
+     
  
  ###### Unit menu scripts #####