StelSkyPolygon.hpp   StelSkyPolygon.hpp 
skipping to change at line 22 skipping to change at line 22
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#ifndef _STELSKYPOLYGON_HPP_ #ifndef _STELSKYPOLYGON_HPP_
#define _STELSKYPOLYGON_HPP_ #define _STELSKYPOLYGON_HPP_
#include "StelSphereGeometry.hpp"
#include "MultiLevelJsonBase.hpp" #include "MultiLevelJsonBase.hpp"
#include "StelSphereGeometry.hpp"
#include "StelSkyImageTile.hpp"
#include <QTimeLine> #include <QTimeLine>
class StelCore; class StelCore;
//! Contain all the credits for a given server hosting the data
class ServerCredits
{
public:
//! Very short credit to display in the loading bar
QString shortCredits;
//! Full credits
QString fullCredits;
//! The URL where to get more info about the server
QString infoURL;
};
//! Contains all the credits for the creator of the polygon collection
class DataSetCredits
{
public:
//! Very short credit to display in the loading bar
QString shortCredits;
//! Full credits
QString fullCredits;
//! The URL where to get more info about the data collection
QString infoURL;
};
//! Base class for any polygon with a fixed position in the sky //! Base class for any polygon with a fixed position in the sky
class StelSkyPolygon : public MultiLevelJsonBase class StelSkyPolygon : public MultiLevelJsonBase
{ {
Q_OBJECT Q_OBJECT
public: public:
//! Default constructor //! Default constructor
StelSkyPolygon() {initCtor();} StelSkyPolygon() {initCtor();}
//! 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, StelPainter& sPainter, float opacity=1.); void draw(StelCore* core, class StelRenderer* renderer, StelProjecto rP projector, 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 118 skipping to change at line 91
//! 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 SphericalRegionP& viewPortPoly, bool recheckIntersect=tru e); 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(class StelRenderer* renderer, StelProjectorP projector );
//! 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;
}; };
#endif // _STELSKYPOLYGON_HPP_ #endif // _STELSKYPOLYGON_HPP_
 End of changes. 5 change blocks. 
31 lines changed or deleted 4 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/