StarMgr.cpp   StarMgr.cpp 
skipping to change at line 46 skipping to change at line 46
#include "StelSkyCultureMgr.hpp" #include "StelSkyCultureMgr.hpp"
#include "StelFileMgr.hpp" #include "StelFileMgr.hpp"
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "StelCore.hpp" #include "StelCore.hpp"
#include "StelIniParser.hpp" #include "StelIniParser.hpp"
#include "StelPainter.hpp" #include "StelPainter.hpp"
#include "StelJsonParser.hpp" #include "StelJsonParser.hpp"
#include "ZoneArray.hpp" #include "ZoneArray.hpp"
#include "StelSkyDrawer.hpp" #include "StelSkyDrawer.hpp"
#include "RefractionExtinction.hpp" #include "RefractionExtinction.hpp"
#include "StelModuleMgr.hpp"
#include "ConstellationMgr.hpp"
#include <QTextStream> #include <QTextStream>
#include <QFile> #include <QFile>
#include <QSettings> #include <QSettings>
#include <QString> #include <QString>
#include <QRegExp> #include <QRegExp>
#include <QDebug> #include <QDebug>
#include <QFileInfo> #include <QFileInfo>
#include <QDir> #include <QDir>
#include <QCryptographicHash> #include <QCryptographicHash>
skipping to change at line 158 skipping to change at line 160
StarMgr::~StarMgr(void) StarMgr::~StarMgr(void)
{ {
foreach(ZoneArray* z, gridLevels) foreach(ZoneArray* z, gridLevels)
delete z; delete z;
gridLevels.clear(); gridLevels.clear();
if (hipIndex) if (hipIndex)
delete[] hipIndex; delete[] hipIndex;
} }
// Allow untranslated name here if set in constellationMgr!
QString StarMgr::getCommonName(int hip) QString StarMgr::getCommonName(int hip)
{ {
ConstellationMgr* cmgr=GETSTELMODULE(ConstellationMgr);
if (cmgr->getConstellationDisplayStyle() == ConstellationMgr::conste
llationsNative)
return getCommonEnglishName(hip);
QHash<int,QString>::const_iterator it(commonNamesMapI18n.find(hip)); QHash<int,QString>::const_iterator it(commonNamesMapI18n.find(hip));
if (it!=commonNamesMapI18n.end()) if (it!=commonNamesMapI18n.end())
return it.value(); return it.value();
return QString(); return QString();
} }
QString StarMgr::getCommonEnglishName(int hip) QString StarMgr::getCommonEnglishName(int hip)
{ {
QHash<int,QString>::const_iterator it(commonNamesMap.find(hip)); QHash<int,QString>::const_iterator it(commonNamesMap.find(hip));
if (it!=commonNamesMap.end()) if (it!=commonNamesMap.end())
skipping to change at line 861 skipping to change at line 868
} }
exit_loop: exit_loop:
// Finish drawing many stars // Finish drawing many stars
skyDrawer->postDrawPointSource(&sPainter); skyDrawer->postDrawPointSource(&sPainter);
if (objectMgr->getFlagSelectedObjectPointer()) if (objectMgr->getFlagSelectedObjectPointer())
drawPointer(sPainter, core); drawPointer(sPainter, core);
} }
// Return a stl vector containing the stars located // Return a QList containing the stars located
// inside the limFov circle around position v // inside the limFov circle around position v
QList<StelObjectP > StarMgr::searchAround(const Vec3d& vv, double limFov, c onst StelCore* core) const QList<StelObjectP > StarMgr::searchAround(const Vec3d& vv, double limFov, c onst StelCore* core) const
{ {
QList<StelObjectP > result; QList<StelObjectP > result;
if (!getFlagStars()) if (!getFlagStars())
return result; return result;
Vec3d v(vv); Vec3d v(vv);
v.normalize(); v.normalize();
 End of changes. 4 change blocks. 
1 lines changed or deleted 9 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/