[Gcblue-commits] gcb_wx/include/sim tcAeroAirObject.h,1.13,1.14 tcGoal.h,1.6,1.7 tcGoalTracker.h,1.4,1.5 tcPlatformObject.h,1.32,1.33 tcStores.h,1.6,1.7

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

Update of /cvsroot/gcblue/gcb_wx/include/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29814/include/sim

Modified Files:
	tcAeroAirObject.h tcGoal.h tcGoalTracker.h tcPlatformObject.h 
	tcStores.h 
Log Message:
Updates to save goals to python scenario

Index: tcGoal.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGoal.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcGoal.h	26 Jul 2005 00:37:03 -0000	1.6
--- tcGoal.h	11 Dec 2005 00:34:28 -0000	1.7
***************
*** 39,42 ****
--- 39,46 ----
      }
  }
+ namespace scriptinterface
+ {
+ 	class tcScenarioLogger;
+ }
  
  void InitGoalPython(boost::python::dict *dictionary);
***************
*** 63,66 ****
--- 67,71 ----
      virtual void Update(); ///< updates goal state using on simState
  	virtual void WriteStatus(std::stringstream& stream, unsigned int level = 0);
+ 	virtual void SaveToPython(scriptinterface::tcScenarioLogger& logger);
  
      virtual tcGoal* Clone();
***************
*** 91,94 ****
--- 96,100 ----
      virtual void Update(); ///< updates goal state using on simState
  	virtual void WriteStatus(std::stringstream& stream, unsigned int level = 0);
+ 	virtual void SaveToPython(scriptinterface::tcScenarioLogger& logger);
  
      virtual tcGoal* Clone();
***************
*** 96,99 ****
--- 102,108 ----
      tcCompoundGoal(const tcCompoundGoal& goal);
      virtual ~tcCompoundGoal();
+ 
+ protected:
+ 	static unsigned pythonWriteCount; ///< used to handle nested compound goas in SaveToPython
  };
  
***************
*** 111,114 ****
--- 120,124 ----
      virtual void Update(); ///< updates goal state using on simState
  	virtual void WriteStatus(std::stringstream& stream, unsigned int level = 0);
+ 	virtual void SaveToPython(scriptinterface::tcScenarioLogger& logger);
  
      virtual tcGoal* Clone();
***************
*** 128,131 ****
--- 138,142 ----
      virtual void Update();
  	virtual void WriteStatus(std::stringstream& stream, unsigned int level = 0);
+ 	virtual void SaveToPython(scriptinterface::tcScenarioLogger& logger);
  
      virtual tcGoal* Clone();
***************
*** 144,147 ****
--- 155,159 ----
      virtual void Update();
  	virtual void WriteStatus(std::stringstream& stream, unsigned int level = 0);
+ 	virtual void SaveToPython(scriptinterface::tcScenarioLogger& logger);
  
      virtual tcGoal* Clone();

Index: tcStores.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcStores.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcStores.h	22 Jun 2005 01:21:27 -0000	1.6
--- tcStores.h	11 Dec 2005 00:34:28 -0000	1.7
***************
*** 35,38 ****
--- 35,42 ----
      class tcStoresDBObject;
  }
+ namespace scriptinterface
+ {
+ 	class tcScenarioLogger;
+ }
  
  using namespace database;
***************
*** 102,109 ****
               tcGameObject* child = 0);
  	bool LoadOther(const std::string& item, tcGameObject* child = 0);
      void SetParent(tcPlatformObject* obj);
      bool UnloadLauncher(unsigned int idx, tcGameObject* child = 0);
      void Update(double t);
!     
      tcCommandStream& operator<<(tcCommandStream& stream);
      tcCreateStream& operator<<(tcCreateStream& stream);
--- 106,114 ----
               tcGameObject* child = 0);
  	bool LoadOther(const std::string& item, tcGameObject* child = 0);
+     virtual void SaveToPython(scriptinterface::tcScenarioLogger& logger);
      void SetParent(tcPlatformObject* obj);
      bool UnloadLauncher(unsigned int idx, tcGameObject* child = 0);
      void Update(double t);
! 
      tcCommandStream& operator<<(tcCommandStream& stream);
      tcCreateStream& operator<<(tcCreateStream& stream);

Index: tcAeroAirObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAeroAirObject.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcAeroAirObject.h	1 Jun 2005 00:13:28 -0000	1.13
--- tcAeroAirObject.h	11 Dec 2005 00:34:28 -0000	1.14
***************
*** 31,34 ****
--- 31,38 ----
      class tcAirDBObject;
  }
+ namespace scriptinterface
+ {
+ 	class tcScenarioLogger;
+ }
  
  class tcCommandStream;
***************
*** 56,59 ****
--- 60,64 ----
      void LoadFromFile(tcFile& file);
      virtual void Serialize(tcFile& file, bool mbLoad);
+ 	virtual void SaveToPython(scriptinterface::tcScenarioLogger& logger);
  
      virtual tcCommandStream& operator<<(tcCommandStream& stream);

Index: tcGoalTracker.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGoalTracker.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcGoalTracker.h	26 Jul 2005 00:37:03 -0000	1.4
--- tcGoalTracker.h	11 Dec 2005 00:34:28 -0000	1.5
***************
*** 32,35 ****
--- 32,36 ----
  	bool HasStatusChanged(int alliance);
  	void LogAllianceGoalStatus(std::string fileName, int alliance);
+ 	tcGoal* GetAllianceGoal(int alliance);
      void SetAllianceGoal(int alliance, tcGoal* goal);
      void Update(double currentTime);

Index: tcPlatformObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPlatformObject.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** tcPlatformObject.h	10 Sep 2005 21:48:06 -0000	1.32
--- tcPlatformObject.h	11 Dec 2005 00:34:28 -0000	1.33
***************
*** 54,57 ****
--- 54,62 ----
  }
  
+ namespace scriptinterface
+ {
+ 	class tcScenarioLogger;
+ }
+ 
  using ai::Brain;
  
***************
*** 131,134 ****
--- 136,140 ----
      void LoadFromFile(tcFile& file);
      virtual void Serialize(tcFile& file, bool mbLoad);
+ 	virtual void SaveToPython(scriptinterface::tcScenarioLogger& logger);
  
      virtual tcCommandStream& operator<<(tcCommandStream& stream);