StelSkyPolygon.hpp   StelSkyPolygon.hpp 
skipping to change at line 75 skipping to change at line 75
//! Constructor //! Constructor
StelSkyPolygon(const QString& url, StelSkyPolygon* parent=NULL); StelSkyPolygon(const QString& url, StelSkyPolygon* parent=NULL);
//! Constructor //! Constructor
StelSkyPolygon(const QVariantMap& map, StelSkyPolygon* parent); StelSkyPolygon(const QVariantMap& map, StelSkyPolygon* parent);
//! Destructor //! Destructor
~StelSkyPolygon(); ~StelSkyPolygon();
//! Draw the image on the screen. //! Draw the image on the screen.
void draw(StelCore* core); void draw(StelCore* core, StelPainter& sPainter, float opacity=1.);
//! Return the dataset credits to use in the progress bar //! Return the dataset credits to use in the progress bar
DataSetCredits getDataSetCredits() const {return dataSetCredits;} DataSetCredits getDataSetCredits() const {return dataSetCredits;}
//! Return the server credits to use in the progress bar //! Return the server credits to use in the progress bar
ServerCredits getServerCredits() const {return serverCredits;} ServerCredits getServerCredits() const {return serverCredits;}
//! Convert the polygon informations to a map following the JSON str ucture. //! Convert the polygon informations to a map following the JSON str ucture.
//! It can be saved as JSON using the StelJsonParser methods. //! It can be saved as JSON using the StelJsonParser methods.
QVariantMap toQVariantMap() const; QVariantMap toQVariantMap() const;
skipping to change at line 98 skipping to change at line 98
//! Minimum resolution at which the next level needs to be loaded in degree/pixel //! Minimum resolution at which the next level needs to be loaded in degree/pixel
float minResolution; float minResolution;
//! The credits of the server where this data come from //! The credits of the server where this data come from
ServerCredits serverCredits; ServerCredits serverCredits;
//! The credits for the data set //! The credits for the data set
DataSetCredits dataSetCredits; DataSetCredits dataSetCredits;
//! Direction of the vertices of the convex hull in ICRS frame //! Direction of the vertices of the convex hull in ICRS frame
QList<StelGeom::ConvexPolygon> skyConvexPolygons; QList<SphericalConvexPolygon> skyConvexPolygons;
protected: protected:
//! Load the polygon from a valid QVariantMap //! Load the polygon from a valid QVariantMap
virtual void loadFromQVariantMap(const QVariantMap& map); virtual void loadFromQVariantMap(const QVariantMap& map);
private: private:
//! The list of all the subTiles URL or already loaded JSON map for
this tile
QVariantList subTilesUrls;
//! init the StelSkyPolygon //! init the StelSkyPolygon
void initCtor(); void initCtor();
//! Return the list of tiles which should be drawn. //! Return the list of tiles which should be drawn.
//! @param result a map containing resolution, pointer to the tiles //! @param result a map containing resolution, pointer to the tiles
void getTilesToDraw(QMultiMap<double, StelSkyPolygon*>& result, Stel Core* core, const StelGeom::ConvexPolygon& viewPortPoly, bool recheckInters ect=true); void getTilesToDraw(QMultiMap<double, StelSkyPolygon*>& result, Stel Core* core, const SphericalRegionP& viewPortPoly, bool recheckIntersect=tru e);
//! Draw the polygon on the screen. //! Draw the polygon on the screen.
//! @return true if the tile was actually displayed //! @return true if the tile was actually displayed
bool drawTile(StelCore* core); bool drawTile(StelCore* core);
//! Return the minimum resolution //! Return the minimum resolution
double getMinResolution() const {return minResolution;} double getMinResolution() const {return minResolution;}
// Used for smooth fade in // Used for smooth fade in
QTimeLine* texFader; QTimeLine* texFader;
 End of changes. 4 change blocks. 
3 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/