NebulaMgr.hpp   NebulaMgr.hpp 
skipping to change at line 81 skipping to change at line 81
Q_PROPERTY(bool hintsProportional Q_PROPERTY(bool hintsProportional
READ getHintsProportional READ getHintsProportional
WRITE setHintsProportional WRITE setHintsProportional
NOTIFY hintsProportionalChanged NOTIFY hintsProportionalChanged
) )
Q_PROPERTY(bool flagSurfaceBrightnessUsage Q_PROPERTY(bool flagSurfaceBrightnessUsage
READ getFlagSurfaceBrightnessUsage READ getFlagSurfaceBrightnessUsage
WRITE setFlagSurfaceBrightnessUsage WRITE setFlagSurfaceBrightnessUsage
NOTIFY flagSurfaceBrightnessUsageChanged NOTIFY flagSurfaceBrightnessUsageChanged
) )
Q_PROPERTY(bool flagSurfaceBrightnessArcsecUsage
READ getFlagSurfaceBrightnessArcsecUsage
WRITE setFlagSurfaceBrightnessArcsecUsage
NOTIFY flagSurfaceBrightnessArcsecUsageChanged
)
Q_PROPERTY(double labelsAmount Q_PROPERTY(double labelsAmount
READ getLabelsAmount READ getLabelsAmount
WRITE setLabelsAmount WRITE setLabelsAmount
NOTIFY labelsAmountChanged NOTIFY labelsAmountChanged
) )
Q_PROPERTY(double hintsAmount Q_PROPERTY(double hintsAmount
READ getHintsAmount READ getHintsAmount
WRITE setHintsAmount WRITE setHintsAmount
NOTIFY hintsAmountChanged NOTIFY hintsAmountChanged
) )
skipping to change at line 286 skipping to change at line 291
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in StelObjectManager class // Methods defined in StelObjectManager class
//! Used to get a vector of objects which are near to some position. //! Used to get a vector of objects which are near to some position.
//! @param v a vector representing the position in th sky around whi ch to search for nebulae. //! @param v a vector representing the position in th sky around whi ch to search for nebulae.
//! @param limitFov the field of view around the position v in which to search for nebulae. //! @param limitFov the field of view around the position v in which to search for nebulae.
//! @param core the StelCore to use for computations. //! @param core the StelCore to use for computations.
//! @return an list containing the nebulae located inside the limitF ov circle around position v. //! @return an list containing the nebulae located inside the limitF ov circle around position v.
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 nebula object's pointer if exists or NULL. //! Return the matching nebula object's pointer if exists or an "emp ty" StelObjectP.
//! @param nameI18n The case in-sensistive nebula name or NGC M cata log name : format can //! @param nameI18n The case in-sensistive nebula name or NGC M cata log name : format can
//! be M31, M 31, NGC31, NGC 31 //! be M31, M 31, NGC31, NGC 31
virtual StelObjectP searchByNameI18n(const QString& nameI18n) const; virtual StelObjectP searchByNameI18n(const QString& nameI18n) const;
//! Return the matching nebula if exists or NULL. //! Return the matching nebula if exists or Q_NULLPTR.
//! @param name The case in-sensistive standard program name //! @param name The case in-sensistive standard program name
virtual StelObjectP searchByName(const QString& name) const; virtual StelObjectP searchByName(const QString& name) const;
virtual StelObjectP searchByID(const QString &id) const { return sea
rchByName(id); }
//! Find and return the list of at most maxNbItem objects auto-compl eting the passed object English name. //! Find and return the list of at most maxNbItem objects auto-compl eting the passed object English 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 list of matching object name by order of relevance, or an empty list if nothing match //! @return a list of matching object name by order of relevance, or an empty list if nothing match
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;
//! @note Loading deep-sky objects with the proper names only. //! @note Loading deep-sky objects with the proper names only.
virtual QStringList listAllObjects(bool inEnglish) const; virtual QStringList listAllObjects(bool inEnglish) const;
virtual QStringList listAllObjectsByType(const QString& objType, boo l inEnglish) const; virtual QStringList listAllObjectsByType(const QString& objType, boo l inEnglish) const;
virtual QString getName() const { return "Deep-sky objects"; } virtual QString getName() const { return "Deep-sky objects"; }
virtual QString getStelObjectType() const { return Nebula::NEBULA_TY PE; }
//! Compute the maximum magntiude for which hints will be displayed. //! Compute the maximum magntiude for which hints will be displayed.
float computeMaxMagHint(const class StelSkyDrawer* skyDrawer) const; float computeMaxMagHint(const class StelSkyDrawer* skyDrawer) const;
bool objectInDisplayedCatalog(NebulaP n); bool objectInDisplayedCatalog(NebulaP n);
//! Get designation for latest selected DSO with priority //! Get designation for latest selected DSO with priority
//! @note using for bookmarks feature as example //! @note using for bookmarks feature as example
//! @return a designation //! @return a designation
QString getLatestSelectedDSODesignation(); QString getLatestSelectedDSODesignation();
//! Get the list of all the bodies of the solar system. //! Get the list of all deep-sky objects.
const QVector<NebulaP>& getAllDeepSkyObjects() const { return dsoArr ay; } const QVector<NebulaP>& getAllDeepSkyObjects() const { return dsoArr ay; }
//! Get the list of deep-sky objects by type.
QList<NebulaP> getDeepSkyObjectsByType(const QString& objType);
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Properties setters and getters // Properties setters and getters
public slots: public slots:
void setCatalogFilters(Nebula::CatalogGroup cflags); void setCatalogFilters(Nebula::CatalogGroup cflags);
Nebula::CatalogGroup getCatalogFilters() const { return Nebula::cata logFilters; } Nebula::CatalogGroup getCatalogFilters() const { return Nebula::cata logFilters; }
void setTypeFilters(Nebula::TypeGroup tflags); void setTypeFilters(Nebula::TypeGroup tflags);
Nebula::TypeGroup getTypeFilters() const { return Nebula::typeFilter s; } Nebula::TypeGroup getTypeFilters() const { return Nebula::typeFilter s; }
//! Set the default color used to draw the nebula symbols (default c ircles, etc). //! Set the default color used to draw the nebula symbols (default c ircles, etc).
skipping to change at line 664 skipping to change at line 675
//! Set flag for usage designations of DSO for their labels instead common names. //! Set flag for usage designations of DSO for their labels instead common names.
void setDesignationUsage(const bool flag); void setDesignationUsage(const bool flag);
//! Get flag for usage designations of DSO for their labels instead common names. //! Get flag for usage designations of DSO for their labels instead common names.
bool getDesignationUsage(void) const; bool getDesignationUsage(void) const;
//! Set whether hints (symbols) should be visible according to surfa ce brightness value. //! Set whether hints (symbols) should be visible according to surfa ce brightness value.
void setFlagSurfaceBrightnessUsage(const bool usage) {if(usage!=Nebu la::surfaceBrightnessUsage){ Nebula::surfaceBrightnessUsage=usage; emit fla gSurfaceBrightnessUsageChanged(usage);}} void setFlagSurfaceBrightnessUsage(const bool usage) {if(usage!=Nebu la::surfaceBrightnessUsage){ Nebula::surfaceBrightnessUsage=usage; emit fla gSurfaceBrightnessUsageChanged(usage);}}
//! Get whether hints (symbols) are visible according to surface bri ghtness value. //! Get whether hints (symbols) are visible according to surface bri ghtness value.
bool getFlagSurfaceBrightnessUsage(void) const { return Nebula::surf aceBrightnessUsage; } bool getFlagSurfaceBrightnessUsage(void) const { return Nebula::surf aceBrightnessUsage; }
//! Set flag for usage of measure unit mag/arcsec^2 to surface brigh
tness value.
void setFlagSurfaceBrightnessArcsecUsage(const bool usage) { Nebula:
:flagUseArcsecSurfaceBrightness=usage; }
//! Get flag for usage of measure unit mag/arcsec^2 to surface brigh
tness value.
bool getFlagSurfaceBrightnessArcsecUsage(void) const { return Nebula
::flagUseArcsecSurfaceBrightness; }
//! Set flag used to turn on and off Nebula rendering. //! Set flag used to turn on and off Nebula rendering.
void setFlagShow(bool b) { flagShow = b; } void setFlagShow(bool b) { flagShow = b; }
//! Get value of flag used to turn on and off Nebula rendering. //! Get value of flag used to turn on and off Nebula rendering.
bool getFlagShow(void) const { return flagShow; } bool getFlagShow(void) const { return flagShow; }
//! Set flag used to turn on and off DSO type filtering. //! Set flag used to turn on and off DSO type filtering.
void setFlagUseTypeFilters(bool b) { if (Nebula::flagUseTypeFilters! =b) { Nebula::flagUseTypeFilters=b; emit flagUseTypeFiltersChanged(b);}} void setFlagUseTypeFilters(bool b) { if (Nebula::flagUseTypeFilters! =b) { Nebula::flagUseTypeFilters=b; emit flagUseTypeFiltersChanged(b);}}
//! Get value of flag used to turn on and off DSO type filtering. //! Get value of flag used to turn on and off DSO type filtering.
bool getFlagUseTypeFilters(void) const { return Nebula::flagUseTypeF ilters; } bool getFlagUseTypeFilters(void) const { return Nebula::flagUseTypeF ilters; }
skipping to change at line 712 skipping to change at line 728
void flagHintsDisplayedChanged(bool b); void flagHintsDisplayedChanged(bool b);
//! Emitted when filter types are changed. //! Emitted when filter types are changed.
void flagUseTypeFiltersChanged(bool b); void flagUseTypeFiltersChanged(bool b);
//! Emitted when the catalog filter is changed //! Emitted when the catalog filter is changed
void catalogFiltersChanged(Nebula::CatalogGroup flags); void catalogFiltersChanged(Nebula::CatalogGroup flags);
//! Emitted when the type filter is changed //! Emitted when the type filter is changed
void typeFiltersChanged(Nebula::TypeGroup flags); void typeFiltersChanged(Nebula::TypeGroup flags);
void hintsProportionalChanged(bool b); void hintsProportionalChanged(bool b);
void designationUsageChanged(bool b); void designationUsageChanged(bool b);
void flagSurfaceBrightnessUsageChanged(bool b); void flagSurfaceBrightnessUsageChanged(bool b);
void flagSurfaceBrightnessArcsecUsageChanged(bool b);
void labelsAmountChanged(double a); void labelsAmountChanged(double a);
void hintsAmountChanged(double f); void hintsAmountChanged(double f);
void labelsColorChanged(const Vec3f & color) const; void labelsColorChanged(const Vec3f & color) const;
void circlesColorChanged(const Vec3f & color) const; void circlesColorChanged(const Vec3f & color) const;
void galaxiesColorChanged(const Vec3f & color) const; void galaxiesColorChanged(const Vec3f & color) const;
void activeGalaxiesColorChanged(const Vec3f & color) const; void activeGalaxiesColorChanged(const Vec3f & color) const;
void radioGalaxiesColorChanged(const Vec3f & color) const; void radioGalaxiesColorChanged(const Vec3f & color) const;
void interactingGalaxiesColorChanged(const Vec3f & color) const; void interactingGalaxiesColorChanged(const Vec3f & color) const;
void quasarsColorChanged(const Vec3f & color) const; void quasarsColorChanged(const Vec3f & color) const;
skipping to change at line 758 skipping to change at line 775
//! Update i18 names from English names according to passed translat or. //! Update i18 names from English names according to passed translat or.
//! The translation is done using gettext with translated strings de fined //! The translation is done using gettext with translated strings de fined
//! in translations.h //! in translations.h
void updateI18n(); void updateI18n();
//! Called when the sky culture is updated. //! Called when the sky culture is updated.
//! Loads native names of deep-sky objects for a given sky culture. //! Loads native names of deep-sky objects for a given sky culture.
//! @param skyCultureDir the name of the directory containing the sk y culture to use. //! @param skyCultureDir the name of the directory containing the sk y culture to use.
void updateSkyCulture(const QString& skyCultureDir); void updateSkyCulture(const QString& skyCultureDir);
//! Called when the filter of DSO is updated.
//! Loads native names of deep-sky objects for a current sky culture
.
void updateDSONames();
private: private:
//! Search for a nebula object by name. e.g. M83, NGC 1123, IC 1234. //! Search for a nebula object by name. e.g. M83, NGC 1123, IC 1234.
NebulaP search(const QString& name); NebulaP search(const QString& name);
//! Search the Nebulae by position //! Search the Nebulae by position
NebulaP search(const Vec3d& pos); NebulaP search(const Vec3d& pos);
//! Load a set of nebula images. //! Load a set of nebula images.
//! Each sub-directory of the INSTALLDIR/nebulae directory contains a set of //! Each sub-directory of the INSTALLDIR/nebulae directory contains a set of
skipping to change at line 793 skipping to change at line 814
NebulaP searchSh2(unsigned int Sh2); NebulaP searchSh2(unsigned int Sh2);
NebulaP searchVdB(unsigned int VdB); NebulaP searchVdB(unsigned int VdB);
NebulaP searchRCW(unsigned int RCW); NebulaP searchRCW(unsigned int RCW);
NebulaP searchLDN(unsigned int LDN); NebulaP searchLDN(unsigned int LDN);
NebulaP searchLBN(unsigned int LBN); NebulaP searchLBN(unsigned int LBN);
NebulaP searchCr(unsigned int Cr); NebulaP searchCr(unsigned int Cr);
NebulaP searchMel(unsigned int Mel); NebulaP searchMel(unsigned int Mel);
NebulaP searchPGC(unsigned int PGC); NebulaP searchPGC(unsigned int PGC);
NebulaP searchUGC(unsigned int UGC); NebulaP searchUGC(unsigned int UGC);
NebulaP searchCed(QString Ced); NebulaP searchCed(QString Ced);
NebulaP searchArp(unsigned int Arp);
NebulaP searchVV(unsigned int VV);
NebulaP searchPK(QString PK);
// Load catalog of DSO // Load catalog of DSO
bool loadDSOCatalog(const QString& filename); bool loadDSOCatalog(const QString& filename);
void convertDSOCatalog(const QString& in, const QString& out, bool d ecimal); void convertDSOCatalog(const QString& in, const QString& out, bool d ecimal);
// Load proper names for DSO // Load proper names for DSO
bool loadDSONames(const QString& filename); bool loadDSONames(const QString& filename);
QVector<NebulaP> dsoArray; // The DSO list QVector<NebulaP> dsoArray; // The DSO list
QHash<unsigned int, NebulaP> dsoIndex; QHash<unsigned int, NebulaP> dsoIndex;
skipping to change at line 822 skipping to change at line 846
double labelsAmount; double labelsAmount;
//! The selection pointer texture //! The selection pointer texture
StelTextureSP texPointer; StelTextureSP texPointer;
QFont nebulaFont; // Font used for names printing QFont nebulaFont; // Font used for names printing
// For DSO convertor // For DSO convertor
bool flagConverter; bool flagConverter;
bool flagDecimalCoordinates; bool flagDecimalCoordinates;
bool flagReloading;
}; };
#endif // _NEBULAMGR_HPP_ #endif // _NEBULAMGR_HPP_
 End of changes. 12 change blocks. 
3 lines changed or deleted 35 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/