From kde-commits Sat Jan 19 16:24:56 2013 From: Rene Kuettner Date: Sat, 19 Jan 2013 16:24:56 +0000 To: kde-commits Subject: [marble/esasocis-2012-eclipse] src/plugins/render/eclipses: EclipsesPlugin: Do consistent variable n Message-Id: <20130119162456.8A385A6091 () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=135861270616995 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/ren= der/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& EclipsesItem::shadowConeUmbra() @@ -152,22 +152,22 @@ const QList& EclipsesItem::shadow= ConeUmbra() return m_shadowConeUmbra; } = -const QList& EclipsesItem::shadowConePenUmbra() +const QList& EclipsesItem::shadowConePenumbra() { if( m_calculationsNeedUpdate ) { calculate(); } = - return m_shadowConePenUmbra; + return m_shadowConePenumbra; } = -const QList& EclipsesItem::shadowCone60MagPenUmbra() +const QList& EclipsesItem::shadowCone60MagPenumbra() { if( m_calculationsNeedUpdate ) { calculate(); } = - return m_shadowCone60MagPenUmbra; + return m_shadowCone60MagPenumbra; } = const QList& 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 =3D 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 =3D 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 =3D m_ecl->GNSBound( true, true, lat1, lng2 ); while( np > 0 ) { np =3D m_ecl->GNSBound( false, true, lat1, lng1 ); if( ( np > 0 ) && ( lat1 <=3D 90. ) ) { - m_southernPenUmbra << GeoDataCoordinates( lng1, lat1, 0., GeoD= ataCoordinates::Degree ); + m_southernPenumbra << GeoDataCoordinates( lng1, lat1, 0., GeoD= ataCoordinates::Degree ); } } = @@ -348,7 +348,7 @@ void EclipsesItem::calculate() while( np > 0 ) { np =3D m_ecl->GNSBound( false, false, lat1, lng1 ); if( ( np > 0 ) && ( lat1 <=3D 90. ) ) { - m_northernPenUmbra << GeoDataCoordinates( lng1, lat1, 0., GeoD= ataCoordinates::Degree ); + m_northernPenumbra << GeoDataCoordinates( lng1, lat1, 0., GeoD= ataCoordinates::Degree ); } } = diff --git a/src/plugins/render/eclipses/EclipsesItem.h b/src/plugins/rende= r/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& shadowConePenUmbra(); + const QList& shadowConePenumbra(); = /** * @brief Return the shadow cone of the penumbra at 60 percent magnitu= de * @return The shadow cone of the penumbra at 60 percent magnitude */ - const QList& shadowCone60MagPenUmbra(); + const QList& 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 m_shadowConeUmbra; - QList m_shadowConePenUmbra; - QList m_shadowCone60MagPenUmbra; + QList m_shadowConePenumbra; + QList m_shadowCone60MagPenumbra; QList m_sunBoundaries; }; = diff --git a/src/plugins/render/eclipses/EclipsesPlugin.cpp b/src/plugins/r= ender/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 =3D item->shadowConePenUmbra().constBegin(); - for ( ; ci !=3D item->shadowConePenUmbra().constEnd(); ++ci ) { + ci =3D item->shadowConePenumbra().constBegin(); + for ( ; ci !=3D item->shadowConePenumbra().constEnd(); ++ci ) { painter->drawEllipse( *ci, 2, 2 ); } } = if( m_configWidget->checkBoxShow60MagPenumbra->isChecked() ) { painter->setPen( Qt::magenta ); - ci =3D item->shadowCone60MagPenUmbra().constBegin(); - for ( ; ci !=3D item->shadowCone60MagPenUmbra().constEnd(); ++ci )= { + ci =3D item->shadowCone60MagPenumbra().constBegin(); + for ( ; ci !=3D 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() ) {