[Gcblue-commits] gcb_wx/include/database tcGenericDBObject.h,1.18,1.19 tcRadarDBObject.h,1.13,1.14 tcSonarDBObject.h,1.4,1.5

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

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

Modified Files:
	tcGenericDBObject.h tcRadarDBObject.h tcSonarDBObject.h 
Log Message:


Index: tcSonarDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSonarDBObject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcSonarDBObject.h	1 Jun 2005 00:13:26 -0000	1.4
--- tcSonarDBObject.h	28 Jun 2005 02:51:19 -0000	1.5
***************
*** 42,48 ****
      public:
          float SL;                   ///< [dB] source level (active only)
!         float DI;                   ///< [dB] receive directivity index
!         float DT;                   ///< [dB] detectability threshold in noise
!         float DTr;                  ///< [dB] detectability threshold with reverberation background
          float minFrequency_Hz;
          float maxFrequency_Hz;
--- 42,46 ----
      public:
          float SL;                   ///< [dB] source level (active only)
!         float DI;                   ///< [dB] receive directivity index (includes processing gain)
          float minFrequency_Hz;
          float maxFrequency_Hz;
***************
*** 52,56 ****
          float maxScope_m;           ///< towed array scope or dipping sonar "scope"
          bool isWakeHoming;          ///< wake homing vs. surface only
-         bool applyScanLoss;
          float bearingResolution_deg;
    
--- 50,53 ----

Index: tcGenericDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcGenericDBObject.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tcGenericDBObject.h	1 Jun 2005 00:13:26 -0000	1.18
--- tcGenericDBObject.h	28 Jun 2005 02:51:19 -0000	1.19
***************
*** 88,91 ****
--- 88,92 ----
          bool IsLeaf() const; ///< returns true if db obj is a leaf obj
  		tcFlightportDBObject* GetFlightport();
+ 		float GetFuelConsumptionConstant() const;
          float GetLauncherAz(unsigned n);
  		tc3DPoint GetLauncherPosition(unsigned n);
***************
*** 105,108 ****
--- 106,113 ----
          tcGenericDBObject(tcGenericDBObject& obj); ///< copy constructor
          virtual ~tcGenericDBObject();
+ 	private:
+ 		float fuelConsumptionConstant; ///< = (fuel rate / max speed)
+ 
+ 		void CalculateParams();
  
      };

Index: tcRadarDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcRadarDBObject.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcRadarDBObject.h	1 Jun 2005 00:13:26 -0000	1.13
--- tcRadarDBObject.h	28 Jun 2005 02:51:19 -0000	1.14
***************
*** 38,44 ****
      {
      public:
!         float mfMinRange_km;       ///< [km] min range
!         float mfERP_dBW;           ///< [dBW] effective radiated power, peak
!         float mfMinRangeRate_mps;  ///< minimum detectable range rate
          unsigned int maxFireControlTracks; ///< max number of simultaneous fire control tracks
          bool isSemiactive;         ///< set true if this is a semiactive radar
--- 38,42 ----
      {
      public:
!         float mfERP_dBW;           ///< [dBW] effective radiated power
          unsigned int maxFireControlTracks; ///< max number of simultaneous fire control tracks
          bool isSemiactive;         ///< set true if this is a semiactive radar