StelObjectMgr.cpp   StelObjectMgr.cpp 
skipping to change at line 35 skipping to change at line 35
#include "StelUtils.hpp" #include "StelUtils.hpp"
#include "StelProjector.hpp" #include "StelProjector.hpp"
#include "StelMovementMgr.hpp" #include "StelMovementMgr.hpp"
#include "RefractionExtinction.hpp" #include "RefractionExtinction.hpp"
#include "StelSkyDrawer.hpp" #include "StelSkyDrawer.hpp"
#include <QMouseEvent> #include <QMouseEvent>
#include <QString> #include <QString>
#include <QDebug> #include <QDebug>
#include <QStringList> #include <QStringList>
#include <QSettings>
StelObjectMgr::StelObjectMgr() : searchRadiusPixel(30.f), distanceWeight(1. f) StelObjectMgr::StelObjectMgr() : searchRadiusPixel(30.f), distanceWeight(1. f)
{ {
setObjectName("StelObjectMgr"); setObjectName("StelObjectMgr");
objectPointerVisibility = true; objectPointerVisibility = true;
} }
StelObjectMgr::~StelObjectMgr() StelObjectMgr::~StelObjectMgr()
{ {
} }
skipping to change at line 243 skipping to change at line 244
{ {
// Get matching object for this module // Get matching object for this module
QStringList matchingObj = m->listMatchingObjectsI18n(objPref ix, maxNbItem); QStringList matchingObj = m->listMatchingObjectsI18n(objPref ix, maxNbItem);
result += matchingObj; result += matchingObj;
maxNbItem-=matchingObj.size(); maxNbItem-=matchingObj.size();
} }
result.sort(); result.sort();
return result; return result;
} }
int StelObjectMgr::getCustomInfoString(void)
{
QSettings* conf = StelApp::getInstance().getSettings();
bool Name = conf->value("custom_selected_info/flag_show_name", false
).toBool();
bool CatalogNumber = conf->value("custom_selected_info/flag_show_cat
alognumber", false).toBool();
bool Magnitude = conf->value("custom_selected_info/flag_show_magnitu
de", false).toBool();
bool RaDecJ2000 = conf->value("custom_selected_info/flag_show_radecj
2000", false).toBool();
bool RaDecOfDate = conf->value("custom_selected_info/flag_show_radec
ofdate", false).toBool();
bool AltAz = conf->value("custom_selected_info/flag_show_altaz", fal
se).toBool();
bool Distance = conf->value("custom_selected_info/flag_show_distance
", false).toBool();
bool Size = conf->value("custom_selected_info/flag_show_size", false
).toBool();
bool Extra1 = conf->value("custom_selected_info/flag_show_extra1", f
alse).toBool();
bool Extra2 = conf->value("custom_selected_info/flag_show_extra2", f
alse).toBool();
bool Extra3 = conf->value("custom_selected_info/flag_show_extra3", f
alse).toBool();
bool HourAngle = conf->value("custom_selected_info/flag_show_hourang
le", false).toBool();
bool AbsoluteMagnitude = conf->value("custom_selected_info/flag_show
_absolutemagnitude", false).toBool();
int OctZero = 0x00000000;
int NameOct;
if (Name)
{
NameOct = StelObject::Name;
}
else
{
NameOct = OctZero;
}
int CatalogNumberOct;
if (CatalogNumber)
{
CatalogNumberOct = StelObject::CatalogNumber;
}
else
{
CatalogNumberOct = OctZero;
}
int MagnitudeOct;
if (Magnitude)
{
MagnitudeOct = StelObject::Magnitude;
}
else
{
MagnitudeOct = OctZero;
}
int RaDecJ2000Oct;
if (RaDecJ2000)
{
RaDecJ2000Oct = StelObject::RaDecJ2000;
}
else
{
RaDecJ2000Oct = OctZero;
}
int RaDecOfDateOct;
if (RaDecOfDate)
{
RaDecOfDateOct = StelObject::RaDecOfDate;
}
else
{
RaDecOfDateOct = OctZero;
}
int AltAzOct;
if (AltAz)
{
AltAzOct = StelObject::AltAzi;
}
else
{
AltAzOct = OctZero;
}
int DistanceOct;
if (Distance)
{
DistanceOct = StelObject::Distance;
}
else
{
DistanceOct = OctZero;
}
int SizeOct;
if (Size)
{
SizeOct = StelObject::Size;
}
else
{
SizeOct = OctZero;
}
int Extra1Oct;
if (Extra1)
{
Extra1Oct = StelObject::Extra1;
}
else
{
Extra1Oct = OctZero;
}
int Extra2Oct;
if (Extra2)
{
Extra2Oct = StelObject::Extra2;
}
else
{
Extra2Oct = OctZero;
}
int Extra3Oct;
if (Extra3)
{
Extra3Oct = StelObject::Extra3;
}
else
{
Extra3Oct = OctZero;
}
int HourAngleOct;
if (HourAngle)
{
HourAngleOct = StelObject::HourAngle;
}
else
{
HourAngleOct = OctZero;
}
int AbsoluteMagnitudeOct;
if (AbsoluteMagnitude)
{
AbsoluteMagnitudeOct = StelObject::AbsoluteMagnitude;
}
else
{
AbsoluteMagnitudeOct = OctZero;
}
return (NameOct|CatalogNumberOct|MagnitudeOct|RaDecJ2000Oct|RaDecOfD
ateOct|AltAzOct|DistanceOct|SizeOct|Extra1Oct|Extra2Oct|Extra3Oct|HourAngle
Oct|AbsoluteMagnitudeOct);
}
 End of changes. 2 change blocks. 
0 lines changed or deleted 1 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/