StarMgr.cpp   StarMgr.cpp 
skipping to change at line 130 skipping to change at line 130
StarMgr::StarMgr(void) : hipIndex(new HipIndexStruct[NR_OF_HIP+1]) StarMgr::StarMgr(void) : hipIndex(new HipIndexStruct[NR_OF_HIP+1])
{ {
setObjectName("StarMgr"); setObjectName("StarMgr");
if (hipIndex == 0) if (hipIndex == 0)
{ {
qFatal("ERROR: StarMgr::StarMgr: no memory"); qFatal("ERROR: StarMgr::StarMgr: no memory");
} }
maxGeodesicGridLevel = -1; maxGeodesicGridLevel = -1;
lastMaxSearchLevel = -1; lastMaxSearchLevel = -1;
starFont.setPixelSize(13.); starFont.setPixelSize(StelApp::getInstance().getSettings()->value("g ui/base_font_size", 13).toInt());
objectMgr = GETSTELMODULE(StelObjectMgr); objectMgr = GETSTELMODULE(StelObjectMgr);
Q_ASSERT(objectMgr); Q_ASSERT(objectMgr);
} }
/************************************************************************* /*************************************************************************
Reimplementation of the getCallOrder method Reimplementation of the getCallOrder method
*************************************************************************/ *************************************************************************/
double StarMgr::getCallOrder(StelModuleActionName actionName) const double StarMgr::getCallOrder(StelModuleActionName actionName) const
{ {
if (actionName==StelModule::ActionDraw) if (actionName==StelModule::ActionDraw)
skipping to change at line 224 skipping to change at line 224
qWarning() << "Found an old starsConfig.json file, upgrade.. "; qWarning() << "Found an old starsConfig.json file, upgrade.. ";
fic.remove(); fic.remove();
copyDefaultConfigFile(); copyDefaultConfigFile();
QFile fic2(starConfigFileFullPath); QFile fic2(starConfigFileFullPath);
fic2.open(QIODevice::ReadOnly); fic2.open(QIODevice::ReadOnly);
starSettings = StelJsonParser::parse(&fic2).toMap(); starSettings = StelJsonParser::parse(&fic2).toMap();
fic2.close(); fic2.close();
} }
loadData(starSettings); loadData(starSettings);
starFont.setPixelSize(13); starFont.setPixelSize(StelApp::getInstance().getSettings()->value("g ui/base_font_size", 13).toInt());
setFlagStars(conf->value("astro/flag_stars", true).toBool()); setFlagStars(conf->value("astro/flag_stars", true).toBool());
setFlagLabels(conf->value("astro/flag_star_name",true).toBool()); setFlagLabels(conf->value("astro/flag_star_name",true).toBool());
setLabelsAmount(conf->value("stars/labels_amount",3.f).toFloat()); setLabelsAmount(conf->value("stars/labels_amount",3.f).toFloat());
objectMgr->registerStelObjectMgr(this); objectMgr->registerStelObjectMgr(this);
texPointer = StelApp::getInstance().getTextureManager().createTextur e("textures/pointeur2.png"); // Load pointer texture texPointer = StelApp::getInstance().getTextureManager().createTextur e("textures/pointeur2.png"); // Load pointer texture
StelApp::getInstance().getCore()->getGeodesicGrid(maxGeodesicGridLev el)->visitTriangles(maxGeodesicGridLevel,initTriangleFunc,this); StelApp::getInstance().getCore()->getGeodesicGrid(maxGeodesicGridLev el)->visitTriangles(maxGeodesicGridLevel,initTriangleFunc,this);
for (ZoneArrayMap::const_iterator it(zoneArrays.begin()); it!=zoneAr rays.end();it++) for (ZoneArrayMap::const_iterator it(zoneArrays.begin()); it!=zoneAr rays.end();it++)
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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/