ZoneArray.hpp   ZoneArray.hpp 
skipping to change at line 34 skipping to change at line 34
#define _ZONEARRAY_HPP_ #define _ZONEARRAY_HPP_
#include <QString> #include <QString>
#include <QFile> #include <QFile>
#include <QDebug> #include <QDebug>
#include "ZoneData.hpp" #include "ZoneData.hpp"
#include "Star.hpp" #include "Star.hpp"
#include "StelCore.hpp" #include "StelCore.hpp"
#include "StelSkyDrawer.hpp"
#include "StarMgr.hpp" #include "StarMgr.hpp"
#include "StelProjector.hpp"
#include "StelPainter.hpp" #include "StelSkyDrawer.hpp"
#ifdef __OpenBSD__ #ifdef __OpenBSD__
#include <unistd.h> #include <unistd.h>
#endif #endif
// Patch by Rainer Canavan for compilation on irix with mipspro compiler pa rt 1 // Patch by Rainer Canavan for compilation on irix with mipspro compiler pa rt 1
#ifndef MAP_NORESERVE #ifndef MAP_NORESERVE
# ifdef MAP_AUTORESRV # ifdef MAP_AUTORESRV
# if (defined(__sgi) && defined(_COMPILER_VERSION)) # if (defined(__sgi) && defined(_COMPILER_VERSION))
# define MAP_NORESERVE MAP_AUTORESRV # define MAP_NORESERVE MAP_AUTORESRV
skipping to change at line 101 skipping to change at line 100
} }
//! Get the total number of stars in this catalog. //! Get the total number of stars in this catalog.
unsigned int getNrOfStars() const { return nr_of_stars; } unsigned int getNrOfStars() const { return nr_of_stars; }
//! Dummy method that does nothing. See subclass implementation. //! Dummy method that does nothing. See subclass implementation.
virtual void updateHipIndex(HipIndexStruct hipIndex[]) const {Q_UNUS ED(hipIndex);} virtual void updateHipIndex(HipIndexStruct hipIndex[]) const {Q_UNUS ED(hipIndex);}
//! Pure virtual method. See subclass implementation. //! Pure virtual method. See subclass implementation.
virtual void searchAround(const StelCore* core, int index,const Vec3 d &v,double cosLimFov, virtual void searchAround(const StelCore* core, int index,const Vec3 d &v,double cosLimFov,
QList<StelObjectP > &result) = 0; QList<StelObjectP> &result) = 0;
//! Pure virtual method. See subclass implementation. //! Pure virtual method. See subclass implementation.
virtual void draw(StelPainter* sPainter, int index,bool is_inside, virtual void draw(StelProjectorP projector, class StelRenderer* rend
const float *rcmag_table, StelCore erer, int index,
* core, bool is_inside, const float *rcmag_table, StelCore
unsigned int maxMagStarName,float * core,
names_brightness) const = 0; unsigned int maxMagStarName,float names_brightness
) const = 0;
//! Get whether or not the catalog was successfully loaded. //! Get whether or not the catalog was successfully loaded.
//! @return @c true if at least one zone was loaded, otherwise @c fa lse //! @return @c true if at least one zone was loaded, otherwise @c fa lse
bool isInitialized(void) const { return (nr_of_zones>0); } bool isInitialized(void) const { return (nr_of_zones>0); }
//! Initialize the ZoneData struct at the given index. //! Initialize the ZoneData struct at the given index.
void initTriangle(int index, void initTriangle(int index,
const Vec3f &c0, const Vec3f &c0,
const Vec3f &c1, const Vec3f &c1,
const Vec3f &c2); const Vec3f &c2);
skipping to change at line 177 skipping to change at line 176
int mag_range,int mag_steps); int mag_range,int mag_steps);
~SpecialZoneArray(void); ~SpecialZoneArray(void);
protected: protected:
//! Get an array of all SpecialZoneData objects in this catalog. //! Get an array of all SpecialZoneData objects in this catalog.
SpecialZoneData<Star> *getZones(void) const SpecialZoneData<Star> *getZones(void) const
{ {
return static_cast<SpecialZoneData<Star>*>(zones); return static_cast<SpecialZoneData<Star>*>(zones);
} }
//! Draw stars and their names onto the viewport. //! Draw stars and their names onto the viewport.
//! @param sPainter the painter to use //! @param projector Projector to project 3D coords to the vi
//! @param index zone index to draw ewport.
//! @param is_inside whether the zone is inside the current viewport //! @param renderer Renderer to use for drawing.
//! @param rcmag_table table of magnitudes //! @param index zone index to draw
//! @param core core to use for drawing //! @param is_inside whether the zone is inside the current v
//! @param maxMagStarName magnitude limit of stars that display labe iewport
ls //! @param rcmag_table table of magnitudes
//! @param core core to use for drawing
//! @param maxMagStarName magnitude limit of stars that display la
bels
//! @param names_brightness brightness of labels //! @param names_brightness brightness of labels
void draw(StelPainter* sPainter, int index,bool is_inside, void draw(StelProjectorP projector, class StelRenderer* renderer, in
const float *rcmag_table, StelCore* core, t index,
unsigned int maxMagStarName,float names_brightness bool is_inside, const float *rcmag_table, StelCore* core,
) const; unsigned int maxMagStarName,float names_brightness) const;
void scaleAxis(void); void scaleAxis(void);
void searchAround(const StelCore* core, int index,const Vec3d &v,dou ble cosLimFov, void searchAround(const StelCore* core, int index,const Vec3d &v,dou ble cosLimFov,
QList<StelObjectP > &result); QList<StelObjectP > &result);
Star *stars; Star *stars;
private: private:
uchar *mmap_start; uchar *mmap_start;
}; };
 End of changes. 6 change blocks. 
20 lines changed or deleted 23 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/