ConstellationMgr.hpp   ConstellationMgr.hpp 
skipping to change at line 130 skipping to change at line 130
//! Return the value defining the order of call for the given action //! Return the value defining the order of call for the given action
//! @param actionName the name of the action for which we want the c all order //! @param actionName the name of the action for which we want the c all order
//! @return the value defining the order. The closer to 0 the earlie r the module's action will be called //! @return the value defining the order. The closer to 0 the earlie r the module's action will be called
virtual double getCallOrder(StelModuleActionName actionName) const; virtual double getCallOrder(StelModuleActionName actionName) const;
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in StelObjectManager class // Methods defined in StelObjectManager class
virtual QList<StelObjectP> searchAround(const Vec3d& v, double limit Fov, const StelCore* core) const; virtual QList<StelObjectP> searchAround(const Vec3d& v, double limit Fov, const StelCore* core) const;
//! Return the matching constellation object's pointer if exists or NULL //! Return the matching constellation object's pointer if exists or Q_NULLPTR
//! @param nameI18n The case in-sensistive constellation name //! @param nameI18n The case in-sensistive constellation name
virtual StelObjectP searchByNameI18n(const QString& nameI18n) const; virtual StelObjectP searchByNameI18n(const QString& nameI18n) const;
//! Return the matching constellation if exists or NULL //! Return the matching constellation if exists or Q_NULLPTR
//! @param name The case in-sensitive standard program name (three l etter abbreviation) //! @param name The case in-sensitive standard program name (three l etter abbreviation)
virtual StelObjectP searchByName(const QString& name) const; virtual StelObjectP searchByName(const QString& name) const;
virtual StelObjectP searchByID(const QString &id) const;
// GZ: I see dubious descriptions and non-fitting var names: objPref ix should just be "string" or "obj", // GZ: I see dubious descriptions and non-fitting var names: objPref ix should just be "string" or "obj",
// and useStartOfWord likely should be described as "decide if start of word is searched" (2x) // and useStartOfWord likely should be described as "decide if start of word is searched" (2x)
//! Find and return the list of at most maxNbItem objects auto-compl eting the passed object name. //! Find and return the list of at most maxNbItem objects auto-compl eting the passed object name.
//! @param objPrefix the case insensitive first letters of the searc hed object //! @param objPrefix the case insensitive first letters of the searc hed object
//! @param maxNbItem the maximum number of returned object names //! @param maxNbItem the maximum number of returned object names
//! @param useStartOfWords the autofill mode for returned objects na mes //! @param useStartOfWords the autofill mode for returned objects na mes
//! @return a vector of matching object name by order of relevance, or an empty vector if nothing matches //! @return a vector of matching object name by order of relevance, or an empty vector if nothing matches
virtual QStringList listMatchingObjects(const QString& objPrefix, in t maxNbItem=5, bool useStartOfWords=false, bool inEnglish=false) const; virtual QStringList listMatchingObjects(const QString& objPrefix, in t maxNbItem=5, bool useStartOfWords=false, bool inEnglish=false) const;
virtual QStringList listAllObjects(bool inEnglish) const; virtual QStringList listAllObjects(bool inEnglish) const;
virtual QString getName() const { return "Constellations"; } virtual QString getName() const { return "Constellations"; }
virtual QString getStelObjectType() const;
//! Describes how to display constellation labels. The viewDialog GU I has a combobox which corresponds to these values. //! Describes how to display constellation labels. The viewDialog GU I has a combobox which corresponds to these values.
enum ConstellationDisplayStyle enum ConstellationDisplayStyle
{ {
constellationsAbbreviated = 0, constellationsAbbreviated = 0,
constellationsNative = 1, constellationsNative = 1,
constellationsTranslated = 2, constellationsTranslated = 2,
constellationsEnglish = 3 // Maybe this is not useful? constellationsEnglish = 3 // Maybe this is not useful?
}; };
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
skipping to change at line 357 skipping to change at line 360
void setSelectedConst(Constellation* c); void setSelectedConst(Constellation* c);
//! Handle unselecting a single constellation. //! Handle unselecting a single constellation.
void unsetSelectedConst(Constellation* c); void unsetSelectedConst(Constellation* c);
//! Define which constellation is selected from its abbreviation. //! Define which constellation is selected from its abbreviation.
void setSelected(const QString& abbreviation); void setSelected(const QString& abbreviation);
//! Define which constellation is selected and return brightest star . //! Define which constellation is selected and return brightest star .
StelObjectP setSelectedStar(const QString& abbreviation); StelObjectP setSelectedStar(const QString& abbreviation);
//! Define which constellation is selected from a star number. //! Define which constellation is selected from a star number.
void setSelected(const StelObject* s); void setSelected(const StelObject* s);
//! Remove all selected constellations. //! Remove all selected constellations.
void deselect() { setSelected(NULL); } void deselect() { setSelected(Q_NULLPTR); }
//! Get the first selected constellation. //! Get the first selected constellation.
//! NOTE: this function should return a list of all, or may be delet ed. Please //! NOTE: this function should return a list of all, or may be delet ed. Please
//! do not use until it exhibits the proper behaviour. //! do not use until it exhibits the proper behaviour.
StelObject* getSelected(void) const; StelObject* getSelected(void) const;
std::vector<Constellation*> selected; // More than one can be select ed at a time std::vector<Constellation*> selected; // More than one can be select ed at a time
Constellation* isStarIn(const StelObject *s) const; Constellation* isStarIn(const StelObject *s) const;
Constellation* isObjectIn(const StelObject *s) const; Constellation* isObjectIn(const StelObject *s) const;
Constellation* findFromAbbreviation(const QString& abbreviation) con st; Constellation* findFromAbbreviation(const QString& abbreviation) con st;
std::vector<Constellation*> asterisms; std::vector<Constellation*> constellations;
QFont asterFont; QFont asterFont;
StarMgr* hipStarMgr; StarMgr* hipStarMgr;
bool isolateSelected; // true to pick individual constellations. bool isolateSelected; // true to pick individual constellations.
bool constellationPickEnabled; bool constellationPickEnabled;
std::vector<std::vector<Vec3f> *> allBoundarySegments; std::vector<std::vector<Vec3f> *> allBoundarySegments;
QString lastLoadedSkyCulture; // Store the last loaded sky culture directory name QString lastLoadedSkyCulture; // Store the last loaded sky culture directory name
//! this controls how constellations (and also star names) are print ed: Abbreviated/as-given/translated //! this controls how constellations (and also star names) are print ed: Abbreviated/as-given/translated
 End of changes. 6 change blocks. 
4 lines changed or deleted 7 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/