SVN commit 1223415 by khudyakov: Change type of SkyPoint::setFromEcliptic. Use const references instead of pointers M +2 -2 skycomponents/ecliptic.cpp M +2 -2 skyobjects/ksplanetbase.cpp M +4 -4 skyobjects/skypoint.cpp M +1 -1 skyobjects/skypoint.h M +1 -1 tools/modcalceclipticcoords.cpp --- trunk/KDE/kdeedu/kstars/kstars/skycomponents/ecliptic.cpp #1223414:1223415 @@ -48,7 +48,7 @@ for(double ra2 = ra; ra2 <= ra + dRa + eps; ra2 += dRa2 ) { elng.setH( ra2 ); SkyPoint* o = new SkyPoint(); - o->setFromEcliptic( num.obliquity(), &elng, &elat ); + o->setFromEcliptic( num.obliquity(), elng, elat ); o->setRA0( o->ra().Hours() ); o->setDec0( o->dec().Degrees() ); o->EquatorialToHorizontal( data->lst(), data->geo()->lat() ); @@ -90,7 +90,7 @@ for( int ra = 0; ra < 23; ra += 6 ) { elng.setH( ra ); SkyPoint o; - o.setFromEcliptic( num.obliquity(), &elng, &elat ); + o.setFromEcliptic( num.obliquity(), elng, elat ); o.setRA0( o.ra() ); o.setDec0( o.dec() ); o.EquatorialToHorizontal( data->lst(), data->geo()->lat() ); --- trunk/KDE/kdeedu/kstars/kstars/skyobjects/ksplanetbase.cpp #1223414:1223415 @@ -100,7 +100,7 @@ } void KSPlanetBase::EclipticToEquatorial( const dms *Obliquity ) { - setFromEcliptic( Obliquity, &ep.longitude, &ep.latitude ); + setFromEcliptic( Obliquity, ep.longitude, ep.latitude ); } void KSPlanetBase::updateCoords( KSNumbers *num, bool includePlanets, const dms *lat, const dms *LST ) @@ -244,7 +244,7 @@ //Displace a point along +Ecliptic Latitude by 1 degree SkyPoint test; dms newELat( ecLat().Degrees() + 1.0 ); - test.setFromEcliptic( num->obliquity(), &ecLong(), &newELat ); + test.setFromEcliptic( num->obliquity(), ecLong(), newELat ); double dx = ra().Degrees() - test.ra().Degrees(); double dy = test.dec().Degrees() - dec().Degrees(); double pa; --- trunk/KDE/kdeedu/kstars/kstars/skyobjects/skypoint.cpp #1223414:1223415 @@ -159,10 +159,10 @@ EcLat.setRadians( asin( sinDec*cosOb - cosDec*sinOb*sinRA ) ); } -void SkyPoint::setFromEcliptic( const dms *Obliquity, const dms *EcLong, const dms *EcLat ) { +void SkyPoint::setFromEcliptic( const dms *Obliquity, const dms& EcLong, const dms& EcLat ) { double sinLong, cosLong, sinLat, cosLat, sinObliq, cosObliq; - EcLong->SinCos( sinLong, cosLong ); - EcLat->SinCos( sinLat, cosLat ); + EcLong.SinCos( sinLong, cosLong ); + EcLat.SinCos( sinLat, cosLat ); Obliquity->SinCos( sinObliq, cosObliq ); double sinDec = sinLat*cosObliq + cosLat*sinObliq*sinLong; @@ -234,7 +234,7 @@ //Add dEcLong to the Ecliptic Longitude dms newLong( EcLong.Degrees() + num->dEcLong() ); - setFromEcliptic( num->obliquity(), &newLong, &EcLat ); + setFromEcliptic( num->obliquity(), newLong, EcLat ); } } --- trunk/KDE/kdeedu/kstars/kstars/skyobjects/skypoint.h #1223414:1223415 @@ -251,7 +251,7 @@ *SkyPoint, given pointers to its Ecliptic (Long, Lat) coordinates, and *to the current obliquity angle (the angle between the equator and ecliptic). */ - void setFromEcliptic( const dms *Obliquity, const dms *EcLong, const dms *EcLat ); + void setFromEcliptic( const dms *Obliquity, const dms& EcLong, const dms& EcLat ); /** Computes galactic coordinates from equatorial coordinates referred to * epoch 1950. RA and Dec are, therefore assumed to be B1950 --- trunk/KDE/kdeedu/kstars/kstars/tools/modcalceclipticcoords.cpp #1223414:1223415 @@ -98,7 +98,7 @@ if ( ok ) elat = EcLat->createDms( true, &ok ); if ( ok ) { SkyPoint sp; - sp.setFromEcliptic( num.obliquity(), &elong, &elat ); + sp.setFromEcliptic( num.obliquity(), elong, elat ); RA->showInHours( sp.ra() ); Dec->showInDegrees( sp.dec() ); }