[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble/esasocis-2012-eclipse] src/plugins/render/eclipses: EclipsesPlugin: Do consistent variable n
From:       Rene Kuettner <rene () bitkanal ! net>
Date:       2013-01-19 16:24:56
Message-ID: 20130119162456.8A385A6091 () git ! kde ! org
[Download RAW message or body]

Git commit ee260ff7734f567a7ff2935235ee49be9be960ad by Rene Kuettner.
Committed on 19/01/2013 at 16:18.
Pushed by renek into branch 'esasocis-2012-eclipse'.

EclipsesPlugin: Do consistent variable naming

M  +16   -16   src/plugins/render/eclipses/EclipsesItem.cpp
M  +8    -8    src/plugins/render/eclipses/EclipsesItem.h
M  +6    -6    src/plugins/render/eclipses/EclipsesPlugin.cpp

http://commits.kde.org/marble/ee260ff7734f567a7ff2935235ee49be9be960ad

diff --git a/src/plugins/render/eclipses/EclipsesItem.cpp \
b/src/plugins/render/eclipses/EclipsesItem.cpp index b938de7..7a46942 100644
--- a/src/plugins/render/eclipses/EclipsesItem.cpp
+++ b/src/plugins/render/eclipses/EclipsesItem.cpp
@@ -125,22 +125,22 @@ const GeoDataLinearRing& EclipsesItem::umbra()
     return m_umbra;
 }
 
-const GeoDataLineString& EclipsesItem::southernPenUmbra()
+const GeoDataLineString& EclipsesItem::southernPenumbra()
 {
     if( m_calculationsNeedUpdate ) {
         calculate();
     }
 
-    return m_southernPenUmbra;
+    return m_southernPenumbra;
 }
 
-const GeoDataLineString& EclipsesItem::northernPenUmbra()
+const GeoDataLineString& EclipsesItem::northernPenumbra()
 {
     if( m_calculationsNeedUpdate ) {
         calculate();
     }
 
-    return m_northernPenUmbra;
+    return m_northernPenumbra;
 }
 
 const QList<GeoDataCoordinates>& EclipsesItem::shadowConeUmbra()
@@ -152,22 +152,22 @@ const QList<GeoDataCoordinates>& \
EclipsesItem::shadowConeUmbra()  return m_shadowConeUmbra;
 }
 
-const QList<GeoDataCoordinates>& EclipsesItem::shadowConePenUmbra()
+const QList<GeoDataCoordinates>& EclipsesItem::shadowConePenumbra()
 {
     if( m_calculationsNeedUpdate ) {
         calculate();
     }
 
-    return m_shadowConePenUmbra;
+    return m_shadowConePenumbra;
 }
 
-const QList<GeoDataCoordinates>& EclipsesItem::shadowCone60MagPenUmbra()
+const QList<GeoDataCoordinates>& EclipsesItem::shadowCone60MagPenumbra()
 {
     if( m_calculationsNeedUpdate ) {
         calculate();
     }
 
-    return m_shadowCone60MagPenUmbra;
+    return m_shadowCone60MagPenumbra;
 }
 
 const QList<GeoDataLinearRing>& EclipsesItem::sunBoundaries()
@@ -302,8 +302,8 @@ void EclipsesItem::calculate()
 
     // shadow cones
     m_shadowConeUmbra.clear();
-    m_shadowConePenUmbra.clear();
-    m_shadowCone60MagPenUmbra.clear();
+    m_shadowConePenumbra.clear();
+    m_shadowCone60MagPenumbra.clear();
 
     m_ecl->getLocalMax( lat2, lat3, lat4 );
 
@@ -318,7 +318,7 @@ void EclipsesItem::calculate()
     m_ecl->getShadowCone( lat2, false, 60, ltf, lnf );
     for( j = 0; j < 60; j++ ) {
         if( ltf[j] < 100. ) {
-            m_shadowConePenUmbra << GeoDataCoordinates( lnf[j], ltf[j], 0., \
GeoDataCoordinates::Degree ); +            m_shadowConePenumbra << \
GeoDataCoordinates( lnf[j], ltf[j], 0., GeoDataCoordinates::Degree );  }
     }
 
@@ -326,21 +326,21 @@ void EclipsesItem::calculate()
     m_ecl->getShadowCone( lat2, false, 60, ltf, lnf );
     for( j = 0; j < 60; j++ ) {
         if( ltf[j] < 100. ) {
-            m_shadowCone60MagPenUmbra << GeoDataCoordinates( lnf[j], ltf[j], 0., \
GeoDataCoordinates::Degree ); +            m_shadowCone60MagPenumbra << \
GeoDataCoordinates( lnf[j], ltf[j], 0., GeoDataCoordinates::Degree );  }
     }
 
     m_ecl->setPenumbraAngle( 1., 0 );
 
     // eclipse boundaries
-    m_southernPenUmbra.clear();
-    m_northernPenUmbra.clear();
+    m_southernPenumbra.clear();
+    m_northernPenumbra.clear();
 
     np = m_ecl->GNSBound( true, true, lat1, lng2 );
     while( np > 0 ) {
         np = m_ecl->GNSBound( false, true, lat1, lng1 );
         if( ( np > 0 ) && ( lat1 <= 90. ) ) {
-            m_southernPenUmbra << GeoDataCoordinates( lng1, lat1, 0., \
GeoDataCoordinates::Degree ); +            m_southernPenumbra << GeoDataCoordinates( \
lng1, lat1, 0., GeoDataCoordinates::Degree );  }
     }
 
@@ -348,7 +348,7 @@ void EclipsesItem::calculate()
     while( np > 0 ) {
         np = m_ecl->GNSBound( false, false, lat1, lng1 );
         if( ( np > 0 ) && ( lat1 <= 90. ) ) {
-            m_northernPenUmbra << GeoDataCoordinates( lng1, lat1, 0., \
GeoDataCoordinates::Degree ); +            m_northernPenumbra << GeoDataCoordinates( \
lng1, lat1, 0., GeoDataCoordinates::Degree );  }
     }
 
diff --git a/src/plugins/render/eclipses/EclipsesItem.h \
b/src/plugins/render/eclipses/EclipsesItem.h index 91677c7..6541213 100644
--- a/src/plugins/render/eclipses/EclipsesItem.h
+++ b/src/plugins/render/eclipses/EclipsesItem.h
@@ -177,13 +177,13 @@ public:
      * @brief Return the eclipse's southern penumbra
      * @return The eclipse's southern penumbra
      */
-    const GeoDataLineString& southernPenUmbra();
+    const GeoDataLineString& southernPenumbra();
 
     /**
      * @brief Return the eclipse's northern penumbra
      * @return The eclipse's northern umbra
      */
-    const GeoDataLineString& northernPenUmbra();
+    const GeoDataLineString& northernPenumbra();
 
     /**
      * @brief Return the eclipse's sun boundaries
@@ -201,13 +201,13 @@ public:
      * @brief Return the shadow cone of the penumbra
      * @return The shadow cone of the penumbra
      */
-    const QList<GeoDataCoordinates>& shadowConePenUmbra();
+    const QList<GeoDataCoordinates>& shadowConePenumbra();
 
     /**
      * @brief Return the shadow cone of the penumbra at 60 percent magnitude
      * @return The shadow cone of the penumbra at 60 percent magnitude
      */
-    const QList<GeoDataCoordinates>& shadowCone60MagPenUmbra();
+    const QList<GeoDataCoordinates>& shadowCone60MagPenumbra();
 
 private:
     /**
@@ -243,11 +243,11 @@ private:
     GeoDataCoordinates m_maxLocation;
     GeoDataLineString m_centralLine;
     GeoDataLinearRing m_umbra;
-    GeoDataLineString m_southernPenUmbra;
-    GeoDataLineString m_northernPenUmbra;
+    GeoDataLineString m_southernPenumbra;
+    GeoDataLineString m_northernPenumbra;
     QList<GeoDataCoordinates> m_shadowConeUmbra;
-    QList<GeoDataCoordinates> m_shadowConePenUmbra;
-    QList<GeoDataCoordinates> m_shadowCone60MagPenUmbra;
+    QList<GeoDataCoordinates> m_shadowConePenumbra;
+    QList<GeoDataCoordinates> m_shadowCone60MagPenumbra;
     QList<GeoDataLinearRing> m_sunBoundaries;
 };
 
diff --git a/src/plugins/render/eclipses/EclipsesPlugin.cpp \
b/src/plugins/render/eclipses/EclipsesPlugin.cpp index b3a8eea..59efcd8 100644
--- a/src/plugins/render/eclipses/EclipsesPlugin.cpp
+++ b/src/plugins/render/eclipses/EclipsesPlugin.cpp
@@ -284,16 +284,16 @@ bool EclipsesPlugin::renderItem( GeoPainter *painter, \
EclipsesItem *item )  
     if( m_configWidget->checkBoxShowFullPenumbra->isChecked() ) {
         painter->setPen( Qt::blue );
-        ci = item->shadowConePenUmbra().constBegin();
-        for ( ; ci != item->shadowConePenUmbra().constEnd(); ++ci ) {
+        ci = item->shadowConePenumbra().constBegin();
+        for ( ; ci != item->shadowConePenumbra().constEnd(); ++ci ) {
             painter->drawEllipse( *ci, 2, 2 );
         }
     }
 
     if( m_configWidget->checkBoxShow60MagPenumbra->isChecked() ) {
         painter->setPen( Qt::magenta );
-        ci = item->shadowCone60MagPenUmbra().constBegin();
-        for ( ; ci != item->shadowCone60MagPenUmbra().constEnd(); ++ci ) {
+        ci = item->shadowCone60MagPenumbra().constBegin();
+        for ( ; ci != item->shadowCone60MagPenumbra().constEnd(); ++ci ) {
             painter->drawEllipse( *ci, 3, 3 );
         }
     }
@@ -313,13 +313,13 @@ bool EclipsesPlugin::renderItem( GeoPainter *painter, \
EclipsesItem *item )  if( m_configWidget->checkBoxShowSouthernPenumbra->isChecked() ) \
{  // southern boundary
         painter->setPen( Oxygen::brickRed4 );
-        painter->drawPolyline( item->southernPenUmbra() );
+        painter->drawPolyline( item->southernPenumbra() );
     }
 
     if( m_configWidget->checkBoxShowNorthernPenumbra->isChecked() ) {
         // northern boundary
         painter->setPen( Oxygen::brickRed4 );
-        painter->drawPolyline( item->northernPenUmbra() );
+        painter->drawPolyline( item->northernPenumbra() );
     }
 
     if( m_configWidget->checkBoxShowSunBoundaries->isChecked() ) {


[prev in list] [next in list] [prev in thread] [next in thread]