[Gcblue-commits] gcb_wx/src/database tcRadarDBObject.cpp,1.9,1.10

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

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

Modified Files:
	tcRadarDBObject.cpp 
Log Message:


Index: tcRadarDBObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcRadarDBObject.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcRadarDBObject.cpp	30 Mar 2004 01:15:21 -0000	1.9
--- tcRadarDBObject.cpp	19 Jul 2004 00:53:01 -0000	1.10
***************
*** 1,6 ****
! /*  
! **  tcRadarDBObject.cpp
! **
! **  Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...)
  **  All rights reserved.
  
--- 1,6 ----
! /** @file tcRadarDBObject.cpp
! */  
! /*
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  
***************
*** 51,57 ****
  int tcRadarDBObject::Serialize(tcFile& file, bool mbLoad, UINT32 anVersion) 
  {
!    if (anVersion <= VERSION_1_0_3) {
        tcDatabaseObject::Serialize(file,mbLoad,anVersion);
!       if (mbLoad) {
           file.Read(&mfMaxRange_km,sizeof(mfMaxRange_km));
           file.Read(&mfMinRange_km,sizeof(mfMinRange_km));
--- 51,59 ----
  int tcRadarDBObject::Serialize(tcFile& file, bool mbLoad, UINT32 anVersion) 
  {
!    if (anVersion <= VERSION_1_0_3) 
!    {
        tcDatabaseObject::Serialize(file,mbLoad,anVersion);
!       if (mbLoad) 
! 	  {
           file.Read(&mfMaxRange_km,sizeof(mfMaxRange_km));
           file.Read(&mfMinRange_km,sizeof(mfMinRange_km));
***************
*** 63,71 ****
           file.Read(&mbDetectsSurface,sizeof(mbDetectsSurface));
           file.Read(&mbDetectsAir,sizeof(mbDetectsAir));
!          for(int i=0;i<8;i++) {
!             file.Read(&mfGrowth[i],sizeof(float));          // growth fields
!          }
        }
!       else {
           file.Write(&mfMaxRange_km,sizeof(mfMaxRange_km));
           file.Write(&mfMinRange_km,sizeof(mfMinRange_km));
--- 65,73 ----
           file.Read(&mbDetectsSurface,sizeof(mbDetectsSurface));
           file.Read(&mbDetectsAir,sizeof(mbDetectsAir));
!          file.Read(&mbDetectsGround,sizeof(mbDetectsGround));
! 
        }
!       else 
! 	  {
           file.Write(&mfMaxRange_km,sizeof(mfMaxRange_km));
           file.Write(&mfMinRange_km,sizeof(mfMinRange_km));
***************
*** 77,89 ****
           file.Write(&mbDetectsSurface,sizeof(mbDetectsSurface));
           file.Write(&mbDetectsAir,sizeof(mbDetectsAir));
!          for(int i=0;i<8;i++) {
!             file.Write(&mfGrowth[i],sizeof(float));          // growth fields
!          }
        }
        return true;
     }
!    else {
        tcSensorDBObject::Serialize(file,mbLoad,anVersion);
!       if (mbLoad) {
           file.Read(&mfMinRange_km,sizeof(mfMinRange_km));
           file.Read(&mfERP_dBW,sizeof(mfERP_dBW));
--- 79,92 ----
           file.Write(&mbDetectsSurface,sizeof(mbDetectsSurface));
           file.Write(&mbDetectsAir,sizeof(mbDetectsAir));
!          file.Write(&mbDetectsGround,sizeof(mbDetectsGround));
! 
        }
        return true;
     }
!    else 
!    {
        tcSensorDBObject::Serialize(file,mbLoad,anVersion);
!       if (mbLoad) 
! 	  {
           file.Read(&mfMinRange_km,sizeof(mfMinRange_km));
           file.Read(&mfERP_dBW,sizeof(mfERP_dBW));
***************
*** 91,96 ****
           file.Read(&mbDetectsSurface,sizeof(mbDetectsSurface));
           file.Read(&mbDetectsAir,sizeof(mbDetectsAir));
        }
!       else {
           file.Write(&mfMinRange_km,sizeof(mfMinRange_km));
           file.Write(&mfERP_dBW,sizeof(mfERP_dBW));
--- 94,101 ----
           file.Read(&mbDetectsSurface,sizeof(mbDetectsSurface));
           file.Read(&mbDetectsAir,sizeof(mbDetectsAir));
+          file.Read(&mbDetectsGround,sizeof(mbDetectsGround));
        }
!       else 
! 	  {
           file.Write(&mfMinRange_km,sizeof(mfMinRange_km));
           file.Write(&mfERP_dBW,sizeof(mfERP_dBW));
***************
*** 98,101 ****
--- 103,107 ----
           file.Write(&mbDetectsSurface,sizeof(mbDetectsSurface));
           file.Write(&mbDetectsAir,sizeof(mbDetectsAir));
+          file.Write(&mbDetectsGround,sizeof(mbDetectsGround));
        }
        return true;
***************
*** 118,121 ****
--- 124,128 ----
          *csv >> val; mbDetectsSurface = val != 0;
          *csv >> val; mbDetectsAir = val != 0;   
+         *csv >> val; mbDetectsGround = val != 0;   
      }
      else 
***************
*** 129,132 ****
--- 136,140 ----
          *csv << (long)mbDetectsSurface;
          *csv << (long)mbDetectsAir;
+         *csv << (long)mbDetectsGround;
          csv->WriteLine();
      }
***************
*** 153,156 ****
--- 161,165 ----
      localNode->SetAttribute("detectsSurface", (int)mbDetectsSurface);
      localNode->SetAttribute("detectsAir", (int)mbDetectsAir);
+     localNode->SetAttribute("detectsGround", (int)mbDetectsGround);
  
      tcSensorDBObject::SerializeXml(node, load);
***************
*** 169,172 ****
--- 178,182 ----
      *csv << "DetectsSurface";
      *csv << "DetectsAir";
+     *csv << "DetectsGround";
  
      csv->WriteLine();
***************
*** 187,190 ****
--- 197,201 ----
     mbDetectsSurface = true;
     mbDetectsAir = true;
+    mbDetectsGround = true;
     isSemiactive = false;
     isCommandReceiver = false;
***************
*** 199,203 ****
      mfMinRangeRate_mps = obj.mfMinRangeRate_mps;  
      mbDetectsSurface = obj.mbDetectsSurface;     
!     mbDetectsAir = obj.mbDetectsAir;     
      isSemiactive = obj.isSemiactive;
      isCommandReceiver = obj.isCommandReceiver;
--- 210,215 ----
      mfMinRangeRate_mps = obj.mfMinRangeRate_mps;  
      mbDetectsSurface = obj.mbDetectsSurface;     
!     mbDetectsAir = obj.mbDetectsAir;   
!     mbDetectsGround = obj.mbDetectsGround;
      isSemiactive = obj.isSemiactive;
      isCommandReceiver = obj.isCommandReceiver;