StarWrapper.hpp   StarWrapper.hpp 
skipping to change at line 17 skipping to change at line 17
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#ifndef _STARWRAPPER_HPP_ #ifndef _STARWRAPPER_HPP_
#define _STARWRAPPER_HPP_ #define _STARWRAPPER_HPP_
#include <QString> #include <QString>
#include "StelObject.hpp" #include "StelObject.hpp"
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelCore.hpp" #include "StelCore.hpp"
#include "StarMgr.hpp" #include "StarMgr.hpp"
skipping to change at line 87 skipping to change at line 87
{ {
static const double d2000 = 2451545.0; static const double d2000 = 2451545.0;
Vec3f v; Vec3f v;
s->getJ2000Pos(z, (M_PI/180.)*(0.0001/3600.) * ((core->getJD ay()-d2000)/365.25) / a->star_position_scale, v); s->getJ2000Pos(z, (M_PI/180.)*(0.0001/3600.) * ((core->getJD ay()-d2000)/365.25) / a->star_position_scale, v);
return Vec3d(v[0], v[1], v[2]); return Vec3d(v[0], v[1], v[2]);
} }
Vec3f getInfoColor(void) const Vec3f getInfoColor(void) const
{ {
return StelApp::getInstance().getVisionModeNight() ? Vec3f(0 .8, 0.2, 0.2) : StelSkyDrawer::indexToColor(s->bV); return StelApp::getInstance().getVisionModeNight() ? Vec3f(0 .8, 0.2, 0.2) : StelSkyDrawer::indexToColor(s->bV);
} }
float getVMagnitude(const StelCore*) const float getVMagnitude(const StelCore* core, bool withExtinction=false) const
{ {
return 0.001f*a->mag_min + s->mag*(0.001f*a->mag_range)/a->m float extinctionMag=0.0; // track magnitude loss
ag_steps; if (withExtinction && core->getSkyDrawer()->getFlagHasAtmosphere
())
{
double alt=getAltAzPosApparent(core)[2];
core->getSkyDrawer()->getExtinction().forward(&alt, &extinct
ionMag);
}
return 0.001f*a->mag_min + s->mag*(0.001f*a->mag_range)/a->m
ag_steps + extinctionMag;
} }
float getSelectPriority(const StelCore* core) const {return getVMagn itude(core);} float getSelectPriority(const StelCore* core) const {return getVMagn itude(core, false);}
float getBV(void) const {return s->getBV();} float getBV(void) const {return s->getBV();}
QString getEnglishName(void) const {return QString();} QString getEnglishName(void) const {return QString();}
QString getNameI18n(void) const {return s->getNameI18n();} QString getNameI18n(void) const {return s->getNameI18n();}
virtual double getAngularSize(const StelCore*) const {return 0.;} virtual double getAngularSize(const StelCore*) const {return 0.;}
protected: protected:
const SpecialZoneArray<Star> *const a; const SpecialZoneArray<Star> *const a;
const SpecialZoneData<Star> *const z; const SpecialZoneData<Star> *const z;
const Star *const s; const Star *const s;
}; };
 End of changes. 4 change blocks. 
5 lines changed or deleted 14 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/