CustomObjectMgr.hpp   CustomObjectMgr.hpp 
skipping to change at line 61 skipping to change at line 61
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in StelObjectManager class // Methods defined in StelObjectManager class
//! Used to get a list of objects which are near to some position. //! Used to get a list 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 satellites. //! @param limitFov the field of view around the position v in which to search for satellites.
//! @param core the StelCore to use for computations. //! @param core the StelCore to use for computations.
//! @return an list containing the satellites located inside the lim itFov circle around position v. //! @return an list containing the satellites located inside the lim itFov 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 satellite object's pointer if exists or NULL . //! Return the matching satellite object's pointer if exists or Q_NU LLPTR.
//! @param nameI18n The case in-sensistive satellite name //! @param nameI18n The case in-sensistive satellite name
virtual StelObjectP searchByNameI18n(const QString& nameI18n) const; virtual StelObjectP searchByNameI18n(const QString& nameI18n) const;
//! Return the matching satellite if exists or NULL. //! Return the matching satellite 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 qSh
aredPointerCast<StelObject>(searchByEnglishName(id)); }
//! 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 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;
virtual QStringList listAllObjects(bool inEnglish) const; virtual QStringList listAllObjects(bool inEnglish) const;
virtual QString getName() const { return "Custom Objects"; } virtual QString getName() const { return "Custom Objects"; }
virtual QString getStelObjectType() const { return CustomObject::CUS TOMOBJECT_TYPE; }
//! Handle mouse clicks. Please note that most of the interactions w ill be done through the GUI module. //! Handle mouse clicks. Please note that most of the interactions w ill be done through the GUI module.
//! @return set the event as accepted if it was intercepted //! @return set the event as accepted if it was intercepted
virtual void handleMouseClicks(class QMouseEvent* e); virtual void handleMouseClicks(class QMouseEvent* e);
public slots: public slots:
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Other public methods // Other public methods
//! Get a pointer to a custom object. //! Get a pointer to a custom object.
//! @param customObjectEnglishName the English name of the desired o bject. //! @param customObjectEnglishName the English name of the desired o bject.
//! @return The matching custom object pointer if exists or NULL. //! @return The matching custom object pointer if exists or Q_NULLPT R.
CustomObjectP searchByEnglishName(QString customObjectEnglishName) c onst; CustomObjectP searchByEnglishName(QString customObjectEnglishName) c onst;
//! Add custom object on the sky //! Add custom object on the sky
//! @param designation - designation of custom object //! @param designation - designation of custom object
//! @param coordinates - coordinates of custom object //! @param coordinates - coordinates of custom object
//! @param isVisible - flag of visibility of custom object //! @param isVisible - flag of visibility of custom object
void addCustomObject(QString designation, Vec3d coordinates, bool is Visible=false); void addCustomObject(QString designation, Vec3d coordinates, bool is Visible=false);
//! Add custom object on the sky //! Add custom object on the sky
//! @param designation - designation of custom object //! @param designation - designation of custom object
//! @param ra - right ascension angle (J2000.0) of custom object //! @param ra - right ascension angle (J2000.0) of custom object
skipping to change at line 127 skipping to change at line 130
//! @param alt - altitude of custom object //! @param alt - altitude of custom object
//! @param azi - azimuth of custom object //! @param azi - azimuth of custom object
//! @param isVisible - flag of visibility of custom object //! @param isVisible - flag of visibility of custom object
//! @code //! @code
//! // example of usage in scripts //! // example of usage in scripts
//! CustomObjectMgr.addCustomObjectAltAzi("Marker", "2d10m15s", "60d 01m15s", true); //! CustomObjectMgr.addCustomObjectAltAzi("Marker", "2d10m15s", "60d 01m15s", true);
//! @endcode //! @endcode
void addCustomObjectAltAzi(QString designation, const QString& alt, const QString& azi, bool isVisible=false); void addCustomObjectAltAzi(QString designation, const QString& alt, const QString& azi, bool isVisible=false);
//! Remove all custom objects //! Remove all custom objects
void removeCustomObjects(); void removeCustomObjects();
//! Remove just one custom object by English name
void removeCustomObject(QString englishName);
//! Set the color used to draw custom object markers. //! Set the color used to draw custom object markers.
//! @param c The color of the custom object markers (R,G,B) //! @param c The color of the custom object markers (R,G,B)
//! @code //! @code
//! // example of usage in scripts //! // example of usage in scripts
//! CustomObjectMgr.setMarkersColor(Vec3f(1.0,0.0,0.0)); //! CustomObjectMgr.setMarkersColor(Vec3f(1.0,0.0,0.0));
//! @endcode //! @endcode
void setMarkersColor(const Vec3f& c); void setMarkersColor(const Vec3f& c);
//! Get the current color used to draw custom object markers. //! Get the current color used to draw custom object markers.
//! @return current color //! @return current color
skipping to change at line 154 skipping to change at line 159
//! @endcode //! @endcode
void setMarkersSize(const float size); void setMarkersSize(const float size);
//! Get the current size used to custom object markers. //! Get the current size used to custom object markers.
//! @return current size //! @return current size
float getMarkersSize(void) const; float getMarkersSize(void) const;
private slots: private slots:
//! Called when a new object is selected. //! Called when a new object is selected.
void selectedObjectChange(StelModule::StelModuleSelectAction action) ; void selectedObjectChange(StelModule::StelModuleSelectAction action) ;
//! Remove just one custom object
void removeCustomObject(CustomObjectP);
private: private:
// Font used for displaying our text // Font used for displaying our text
QFont font; QFont font;
QSettings* conf; QSettings* conf;
StelTextureSP texPointer; StelTextureSP texPointer;
QList<CustomObjectP> customObjects; QList<CustomObjectP> customObjects;
int countMarkers; int countMarkers;
int radiusLimit;
//! Set the size of active radius around custom object markers.
void setActiveRadiusLimit(const int radius);
//! Set selected planets by englishName. //! Set selected planets by englishName.
//! @param englishName The custom object name or "" to select no obj ect //! @param englishName The custom object name or "" to select no obj ect
void setSelected(const QString& englishName); void setSelected(const QString& englishName);
//! Set selected object from its pointer. //! Set selected object from its pointer.
void setSelected(CustomObjectP obj); void setSelected(CustomObjectP obj);
//! Get selected object's pointer. //! Get selected object's pointer.
CustomObjectP getSelected(void) const {return selected;} CustomObjectP getSelected(void) const {return selected;}
//! The currently selected planet. //! The currently selected planet.
CustomObjectP selected; CustomObjectP selected;
 End of changes. 8 change blocks. 
3 lines changed or deleted 16 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/