[Gcblue-commits] gcb_wx/src/database tcLauncherDBObject.cpp,1.13,1.14

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

Update of /cvsroot/gcblue/gcb_wx/src/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24940/src/database

Modified Files:
	tcLauncherDBObject.cpp 
Log Message:
Ground SAM related updates

Index: tcLauncherDBObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcLauncherDBObject.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcLauncherDBObject.cpp	7 Dec 2004 04:00:28 -0000	1.13
--- tcLauncherDBObject.cpp	4 Feb 2005 18:50:35 -0000	1.14
***************
*** 205,208 ****
--- 205,209 ----
  
  		columnString += "CycleTime_s number(5),";
+         columnString += "IsAutoPoint number(1),";
  		columnString += "BasicCap number(4),";
  		columnString += "BasicClass varchar(30),";
***************
*** 226,229 ****
--- 227,231 ----
  
  		cycleTime = entry.GetDouble("CycleTime_s");
+         isAutoPoint = entry.GetInt("IsAutoPoint") != 0;
  		mnCapacity = entry.GetInt("BasicCap");
  		mzChildClass = entry.GetString("BasicClass").c_str();
***************
*** 257,260 ****
--- 259,263 ----
  
  		s << cycleTime << ",";
+         s << isAutoPoint << ",";
  		s << mnCapacity << ",";
  		s << "'" << mzChildClass.mz << "',";
***************
*** 281,293 ****
  
  
! 	tcLauncherDBObject::tcLauncherDBObject() : tcDatabaseObject() 
! 	{
! 		mzClass = "Default Launcher";
  		mnClassID = DTYPE_LAUNCHER;
! 		cycleTime = 0;
! 		mnCapacity = 0;
! 		mzChildClass = "NOCHILDCLASS";
! 		fireControlSensorClass = "";
! 
  		for(unsigned i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++) 
  		{
--- 284,298 ----
  
  
! 	tcLauncherDBObject::tcLauncherDBObject() : tcDatabaseObject(),
!         cycleTime(0),
!         isAutoPoint(false),
! 		mnCapacity(0),
! 		mzChildClass("NOCHILDCLASS"),
! 		fireControlSensorClass(""),
! 		mnConfigurations(0)
! 	{        
!         mzClass = "Default Launcher";
  		mnClassID = DTYPE_LAUNCHER;
! 		
  		for(unsigned i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++) 
  		{
***************
*** 295,308 ****
  			maCapacity[i] = 0;
  		}
! 		mnConfigurations = 0;
  	}
  
  	tcLauncherDBObject::tcLauncherDBObject(tcLauncherDBObject& obj) 
! 		: tcDatabaseObject(obj) 
  	{
  		mnClassID = DTYPE_LAUNCHER;
! 		cycleTime = obj.cycleTime;
! 		mzChildClass = obj.mzChildClass;
! 		mnCapacity = obj.mnCapacity;
  		for(unsigned i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++) 
  		{
--- 300,316 ----
  			maCapacity[i] = 0;
  		}
! 
  	}
  
  	tcLauncherDBObject::tcLauncherDBObject(tcLauncherDBObject& obj) 
! 		: tcDatabaseObject(obj),
!         cycleTime(obj.cycleTime),
! 		mzChildClass(obj.mzChildClass),
! 		mnCapacity(obj.mnCapacity),
! 		mnConfigurations(obj.mnConfigurations),
! 		fireControlSensorClass(obj.fireControlSensorClass)
  	{
  		mnClassID = DTYPE_LAUNCHER;
! 		
  		for(unsigned i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++) 
  		{
***************
*** 310,315 ****
  			maCapacity[i] = obj.maCapacity[i];
  		}
- 		mnConfigurations = obj.mnConfigurations;
- 		fireControlSensorClass = obj.fireControlSensorClass;
  	}
  
--- 318,321 ----