[Gcblue-commits] gcb_wx/src/database CsvTranslator.cpp,1.5,1.6 tcAirDBObject.cpp,1.11,1.12

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

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

Modified Files:
	CsvTranslator.cpp tcAirDBObject.cpp 
Log Message:
Mods to allow aircraft to load / unload with airbase stores, simplified flight model

Index: tcAirDBObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcAirDBObject.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcAirDBObject.cpp	29 Nov 2004 03:55:04 -0000	1.11
--- tcAirDBObject.cpp	21 May 2005 02:01:04 -0000	1.12
***************
*** 65,70 ****
              *csv >> mfMsupm;
              *csv >> mfKdi;
!             *csv >> mfMaxAoa_rad;
!             *csv >> mfMaxCl;
              *csv >> mfGmax;
          }
--- 65,69 ----
              *csv >> mfMsupm;
              *csv >> mfKdi;
!             *csv >> stallSpeed_mps;
              *csv >> mfGmax;
          }
***************
*** 82,87 ****
              *csv << mfMsupm;
              *csv << mfKdi;
!             *csv << mfMaxAoa_rad;
!             *csv << mfMaxCl;
              *csv << mfGmax;
  
--- 81,85 ----
              *csv << mfMsupm;
              *csv << mfKdi;
!             *csv << stallSpeed_mps;
              *csv << mfGmax;
  
***************
*** 113,118 ****
          localNode->SetAttribute("msupm", mfMsupm);
          localNode->SetAttribute("kdi", mfKdi);
!         localNode->SetAttribute("maxAoa_rad", mfMaxAoa_rad);
!         localNode->SetAttribute("maxCl", mfMaxCl);
          localNode->SetAttribute("gmax", mfGmax);
  
--- 111,115 ----
          localNode->SetAttribute("msupm", mfMsupm);
          localNode->SetAttribute("kdi", mfKdi);
!         localNode->SetAttribute("stallSpeed_mps", stallSpeed_mps);
          localNode->SetAttribute("gmax", mfGmax);
  
***************
*** 137,142 ****
          *csv << "Msupm";
          *csv << "Kdi";
!         *csv << "MaxAoa_rad";
!         *csv << "MaxCl";
          *csv << "Gmax";
  
--- 134,138 ----
          *csv << "Msupm";
          *csv << "Kdi";
!         *csv << "StallSpeed_mps";
          *csv << "Gmax";
  
***************
*** 165,170 ****
          columnString += "Msupm number(8),";
          columnString += "Kdi number(8),";
!         columnString += "MaxAoa_rad number(8),";
!         columnString += "MaxCl number(8),";
          columnString += "Gmax number(8)";
  
--- 161,165 ----
          columnString += "Msupm number(8),";
          columnString += "Kdi number(8),";
!         columnString += "StallSpeed_mps number(8),";;
          columnString += "Gmax number(8)";
  
***************
*** 186,191 ****
          mfMsupm = entry.GetDouble("Msupm");
          mfKdi = entry.GetDouble("Kdi");
!         mfMaxAoa_rad = entry.GetDouble("MaxAoa_rad");
!         mfMaxCl = entry.GetDouble("MaxCl");
          mfGmax = entry.GetDouble("Gmax");
  
--- 181,185 ----
          mfMsupm = entry.GetDouble("Msupm");
          mfKdi = entry.GetDouble("Kdi");
!         stallSpeed_mps = entry.GetDouble("StallSpeed_mps");
          mfGmax = entry.GetDouble("Gmax");
  
***************
*** 210,215 ****
          s << mfMsupm << ",";
          s << mfKdi << ",";
!         s << mfMaxAoa_rad << ",";
!         s << mfMaxCl << ",";
          s << mfGmax;
  
--- 204,208 ----
          s << mfMsupm << ",";
          s << mfKdi << ",";
!         s << stallSpeed_mps << ",";
          s << mfGmax;
  
***************
*** 219,223 ****
  
  
!     tcAirDBObject::tcAirDBObject(void)
      {
          mnClassID = DTYPE_AIR;
--- 212,216 ----
  
  
!     tcAirDBObject::tcAirDBObject()
      {
          mnClassID = DTYPE_AIR;
***************
*** 241,251 ****
          mfMsupm = obj.mfMsupm;
          mfKdi = obj.mfKdi;
!         mfMaxAoa_rad = obj.mfMaxAoa_rad;
!         mfMaxCl = obj.mfMaxCl;
          mfGmax = obj.mfGmax;
      }
  
  
!     tcAirDBObject::~tcAirDBObject(void)
      {
      }
--- 234,243 ----
          mfMsupm = obj.mfMsupm;
          mfKdi = obj.mfKdi;
!         stallSpeed_mps = obj.stallSpeed_mps;
          mfGmax = obj.mfGmax;
      }
  
  
!     tcAirDBObject::~tcAirDBObject()
      {
      }

Index: CsvTranslator.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/CsvTranslator.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CsvTranslator.cpp	8 Aug 2004 00:31:33 -0000	1.5
--- CsvTranslator.cpp	21 May 2005 02:01:04 -0000	1.6
***************
*** 270,273 ****
--- 270,279 ----
  } 
  
+ CsvTranslator& CsvTranslator::operator>>(short& val)
+ {
+     val = (short int)GetFieldAsInt(fieldIdx++);
+     return *this;
+ }
+ 
  CsvTranslator& CsvTranslator::operator>>(unsigned int& val)
  {
***************
*** 276,279 ****
--- 282,291 ----
  } 
  
+ CsvTranslator& CsvTranslator::operator>>(unsigned short& val)
+ {
+ 	val = (unsigned short)GetFieldAsInt(fieldIdx++);
+ 	return *this;
+ }
+ 
  CsvTranslator& CsvTranslator::operator>>(long& val)
  {