STYLE: rename french variables

Utilities/otbossimplugins/ossim/otb/CivilDateTime.cpp

@@ -388,7 +388,7 @@ int CivilDateTime::AsJSDDateTime(JSDDateTime* JSDdate)
 
 int CivilDateTime::AsGMSTDateTime(GMSTDateTime* GMST)
 {
-  const double DEUXPI      = 6.28318530717958647693 ;
+  const double TWOPI      = 6.28318530717958647693 ;
   const double OMEGATERRE  = 6.28318530717958647693 / 86164.09054 ;
   int etat ;
   JulianDate jourJulien;
@@ -405,7 +405,7 @@ int CivilDateTime::AsGMSTDateTime(GMSTDateTime* GMST)
     {
       t = (jourJulien.get_julianDate() - 2415020.0) / 36525.0 ;
       tsm0hTU = 23925.836 + t * (8640184.542 + t * 0.0929) ;
-      tsm0hTU = tsm0hTU * DEUXPI / JOURCIVIL_LENGTH ;
+      tsm0hTU = tsm0hTU * TWOPI / JOURCIVIL_LENGTH ;
     }
     else if (GMST->get_origine() == GMSTDateTime::AN1950)
     {
@@ -416,14 +416,14 @@ int CivilDateTime::AsGMSTDateTime(GMSTDateTime* GMST)
     {
       t = (jourJulien.get_julianDate() - 2451545.0) / 36525.0 ;
       tsm0hTU =   24110.54841 + t * (8640184.812866 + t * (0.093103 - t * 6.210e-6)) ;
-      tsm0hTU = tsm0hTU * DEUXPI / JOURCIVIL_LENGTH ;
+      tsm0hTU = tsm0hTU * TWOPI / JOURCIVIL_LENGTH ;
     }
     t = tsm0hTU + ((double)_second + _decimal) * OMEGATERRE ;
-    tsm = fmod (t, DEUXPI) ;
+    tsm = fmod (t, TWOPI) ;
 
     if (tsm < 0.0)
     {
-      tsm = tsm + DEUXPI ;
+      tsm = tsm + TWOPI ;
     }
     GMST->set_tms(tsm);
   }

Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.cpp

@@ -123,7 +123,7 @@ int GalileanEphemeris::p2nutt(int newcmb, double greenwich, double day,
             double p[], double pd[] )
 {
   const double PI          = 3.14159265358979323846 ;
-  const double DEUXPI      = 6.28318530717958647693 ;
+  const double TWOPI      = 6.28318530717958647693 ;
   // const double MU          = 3.9860047e+14 ;
   // const double JOURCIVIL_LENGTH   = 86400.0 ;
   // const double JOURSIDERAL = 86164.09054 ;
@@ -194,20 +194,20 @@ int GalileanEphemeris::p2nutt(int newcmb, double greenwich, double day,
   t = day-2451540. - 0.5 ;
 
   /*  L = MEAN ANOMALY OF THE MOON */
-  arg[6] = fmod( 0.2355548394e+01 + t*( 0.2280271437e+00 + t* 0.1137830e-12 ),DEUXPI);
+  arg[6] = fmod( 0.2355548394e+01 + t*( 0.2280271437e+00 + t* 0.1137830e-12 ),TWOPI);
 
   /*C  L-PRIME = MEAN ANOMALY OF THE SUN (EARTH) */
-  arg[5] = fmod( 0.6240035939e+01 + t*( 0.1720197005e-01 - t* 0.2096864e-14 ),DEUXPI);
+  arg[5] = fmod( 0.6240035939e+01 + t*( 0.1720197005e-01 - t* 0.2096864e-14 ),TWOPI);
 
   /*  F = L - OMEGA (SEE ABOVE AND BELOW) */
-  ff = fmod( 0.1627901934e+01 + t*( 0.2308957196e+00 - t* 0.4817699e-13 ),DEUXPI);
+  ff = fmod( 0.1627901934e+01 + t*( 0.2308957196e+00 - t* 0.4817699e-13 ),TWOPI);
 
   /*  D = MEAN ELONGATION OF THE MOON FROM THE SUN */
-  dd = fmod( 0.5198469514e+01 + t*( 0.2127687104e+00 - t* 0.2504244e-13 ),DEUXPI);
+  dd = fmod( 0.5198469514e+01 + t*( 0.2127687104e+00 - t* 0.2504244e-13 ),TWOPI);
 
   /*  OMEGA = LONGITUDE OF MOON'S ASCENDING NODE FROM MEAN EQUINOX OF DATE */
   arg[0]=0.e0;
-  arg[1] = fmod( 0.2182438624e+01 - t*( 0.9242175478e-03 - t* 0.2709206e-13 ),DEUXPI);
+  arg[1] = fmod( 0.2182438624e+01 - t*( 0.9242175478e-03 - t* 0.2709206e-13 ),TWOPI);
 
     arg[3] = 2.e0*(ff + arg[1]);
     arg[2] = arg[3] - 2.e0*dd ;
@@ -248,12 +248,12 @@ int GalileanEphemeris::p2nutt(int newcmb, double greenwich, double day,
   else if ( newcmb == 1 )
   {
     /*  SIDEREAL ANGLE, FROM 'COOT20' WITH NEWCOMB'S FORMULA:*/
-    /*srang = fmod(STD20R+(OMT20R+OMQ20R*day)*day,DEUXPI);*/
+    /*srang = fmod(STD20R+(OMT20R+OMQ20R*day)*day,TWOPI);*/
   }
   else if ( newcmb == 2 )
   {
     /*  SIDEREAL ANGLE, FROM INPUT */
-    srang = fmod(greenwich*PI/180.e0,DEUXPI) ;
+    srang = fmod(greenwich*PI/180.e0,TWOPI) ;
     /*printf("srang dans p2nutt %g",greenwich);*/
   }
   else

Utilities/otbossimplugins/ossim/otb/JSDDateTime.cpp

@@ -104,7 +104,7 @@ int JSDDateTime::AsJulianDate(JulianDate* julian)
 
 int JSDDateTime::AsGMSTDateTime(GMSTDateTime* GMST)
 {
-  const double DEUXPI      = 6.28318530717958647693 ;
+  const double TWOPI      = 6.28318530717958647693 ;
   const double OMEGATERRE  = 6.28318530717958647693 / 86164.09054 ;
 
   int etat ;
@@ -127,7 +127,7 @@ int JSDDateTime::AsGMSTDateTime(GMSTDateTime* GMST)
     {
       t       = (jourJulien.get_julianDate() - 2415020.0) / 36525.0 ;
       tsm0hTU = 23925.836 + t * (8640184.542 + t * 0.0929) ;
-      tsm0hTU = tsm0hTU * DEUXPI / CivilDateTime::JOURCIVIL_LENGTH ;
+      tsm0hTU = tsm0hTU * TWOPI / CivilDateTime::JOURCIVIL_LENGTH ;
     }
     else if (GMST->get_origine() == GMSTDateTime::AN1950)
     {
@@ -139,13 +139,13 @@ int JSDDateTime::AsGMSTDateTime(GMSTDateTime* GMST)
       t       = (jourJulien.get_julianDate() - 2451545.0) / 36525.0 ;
       tsm0hTU =   24110.54841 + t * (8640184.812866
                 + t * (0.093103 - t * 6.210e-6)) ;
-      tsm0hTU = tsm0hTU * DEUXPI / CivilDateTime::JOURCIVIL_LENGTH ;
+      tsm0hTU = tsm0hTU * TWOPI / CivilDateTime::JOURCIVIL_LENGTH ;
     }
     t = tsm0hTU + (_second + _decimal) * OMEGATERRE ;
-    tsm = fmod (t,DEUXPI) ;
+    tsm = fmod (t,TWOPI) ;
     if (tsm < 0.0)
     {
-      tsm = tsm + DEUXPI ;
+      tsm = tsm + TWOPI ;
     }
 
     GMST->set_tms(tsm);

Utilities/otbossimplugins/ossim/otb/JulianDate.cpp

@@ -83,7 +83,7 @@ int JulianDate::AsJSDDateTime(JSDDateTime* JSDdate)
 
 int JulianDate::AsGMSTDateTime(GMSTDateTime* GMST)
 {
-  const double DEUXPI      = 6.28318530717958647693 ;
+  const double TWOPI      = 6.28318530717958647693 ;
   const double OMEGATERRE  = 6.28318530717958647693 / 86164.09054 ;
 
   int etat=0 , n ;
@@ -104,7 +104,7 @@ int JulianDate::AsGMSTDateTime(GMSTDateTime* GMST)
     {
       t       = (j0hTU - 2415020.0) / 36525.0 ;
       tsm0hTU = 23925.836 + t * (8640184.542 + t * 0.0929) ;
-      tsm0hTU = tsm0hTU * DEUXPI / CivilDateTime::JOURCIVIL_LENGTH ;
+      tsm0hTU = tsm0hTU * TWOPI / CivilDateTime::JOURCIVIL_LENGTH ;
     }
     else if (GMST->get_origine() == GMSTDateTime::AN1950)
     {
@@ -115,13 +115,13 @@ int JulianDate::AsGMSTDateTime(GMSTDateTime* GMST)
     {
       t       = (j0hTU - 2451545.0) / 36525.0 ;
       tsm0hTU =   24110.54841 + t * (8640184.812866 + t * (0.093103 - t * 6.210e-6)) ;
-      tsm0hTU = tsm0hTU * DEUXPI / CivilDateTime::JOURCIVIL_LENGTH ;
+      tsm0hTU = tsm0hTU * TWOPI / CivilDateTime::JOURCIVIL_LENGTH ;
     }
     t = tsm0hTU + d * CivilDateTime::JOURCIVIL_LENGTH * OMEGATERRE ;
-    tsm = fmod (t,DEUXPI) ;
+    tsm = fmod (t,TWOPI) ;
     if (tsm < 0.0)
     {
-      tsm = tsm + DEUXPI ;
+      tsm = tsm + TWOPI ;
     }
 
     GMST->set_tms(tsm);

Utilities/otbossimplugins/ossim/otb/SarSensor.cpp

@@ -36,7 +36,7 @@ SarSensor::~SarSensor()
 
 int SarSensor::ImageToWorld(double distance, JSDDateTime time, double height, double& lon, double& lat)
 {
-  const double DEUXPI      = 6.28318530717958647693 ;
+  const double TWOPI      = 6.28318530717958647693 ;
 
   double semiMajorAxis = _params->get_semiMajorAxis() ;  // default : WGS84
   double semiMinorAxis = _params->get_semiMinorAxis() ; // default : WGS84
@@ -64,8 +64,8 @@ int SarSensor::ImageToWorld(double distance, JSDDateTime time, double height, do
 
   GeodesicCoordinate geo;
   cart.AsGeodesicCoordinates(semiMajorAxis , semiMinorAxis, &geo);
-  lon = (geo.get_x())*360.0/DEUXPI;
-  lat = (geo.get_y())*360.0/DEUXPI;
+  lon = (geo.get_x())*360.0/TWOPI;
+  lat = (geo.get_y())*360.0/TWOPI;
 
   delete satPosition;