StarMgr.hpp   StarMgr.hpp 
skipping to change at line 24 skipping to change at line 24
* *
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA.
*/ */
#ifndef _STARMGR_HPP_ #ifndef _STARMGR_HPP_
#define _STARMGR_HPP_ #define _STARMGR_HPP_
#include <QFont> #include <QFont>
#include <vector>
#include <map>
#include <QVariantMap> #include <QVariantMap>
#include "StelFader.hpp" #include "StelFader.hpp"
#include "StelObjectModule.hpp" #include "StelObjectModule.hpp"
#include "StelTextureTypes.hpp" #include "StelTextureTypes.hpp"
#include "StelProjectorType.hpp" #include "StelProjectorType.hpp"
class StelObject; class StelObject;
class StelToneReproducer; class StelToneReproducer;
class StelProjector; class StelProjector;
class StelNavigator; class StelNavigator;
class StelLoadingBar;
class StelPainter; class StelPainter;
class QSettings; class QSettings;
namespace BigStarCatalogExtension { namespace BigStarCatalogExtension {
class ZoneArray; class ZoneArray;
class HipIndexStruct; class HipIndexStruct;
} }
//! @class StarMgr //! @class StarMgr
//! Stores the star catalogue data. //! Stores the star catalogue data.
skipping to change at line 103 skipping to change at line 100
//! Translate text. //! Translate text.
virtual void updateI18n(); virtual void updateI18n();
//! Called when the sky culture is updated. //! Called when the sky culture is updated.
//! Loads common and scientific names of stars for a given sky cultu re. //! Loads common and scientific names of stars for a given sky cultu re.
//! @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.
virtual void updateSkyCulture(const QString& skyCultureDir); virtual void updateSkyCulture(const QString& skyCultureDir);
//! Load a color scheme //! Load a color scheme
virtual void setStelStyle(const StelStyle& style); virtual void setStelStyle(const QString& section);
//! Used to determine the order in which the various StelModules are drawn. //! Used to determine the order in which the various StelModules are drawn.
virtual double getCallOrder(StelModuleActionName actionName) const; virtual double getCallOrder(StelModuleActionName actionName) const;
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in StelObjectManager class // Methods defined in StelObjectManager class
//! Return a stl vector containing the stars located inside the limF ov circle around position v //! Return a list containing the stars located inside the limFov cir cle around position v
virtual QList<StelObjectP > searchAround(const Vec3d& v, double limi tFov, const StelCore* core) const; virtual QList<StelObjectP > searchAround(const Vec3d& v, double limi tFov, const StelCore* core) const;
//! Return the matching Stars object's pointer if exists or NULL //! Return the matching Stars object's pointer if exists or NULL
//! @param nameI18n The case in-sensistive star common name or HP //! @param nameI18n The case in-sensistive star common name or HP
//! catalog name (format can be HP1234 or HP 1234 or HIP 1234) or sc i name //! catalog name (format can be HP1234 or HP 1234 or HIP 1234) or sc i name
virtual StelObjectP searchByNameI18n(const QString& nameI18n) const; virtual StelObjectP searchByNameI18n(const QString& nameI18n) const;
//! Return the matching star if exists or NULL //! Return the matching star if exists or NULL
//! @param name The case in-sensistive standard program planet name //! @param name The case in-sensistive standard program planet name
virtual StelObjectP searchByName(const QString& name) const; virtual StelObjectP searchByName(const QString& name) const;
skipping to change at line 186 skipping to change at line 183
static QString getSciName(int hip); static QString getSciName(int hip);
static QString convertToSpectralType(int index); static QString convertToSpectralType(int index);
static QString convertToComponentIds(int index); static QString convertToComponentIds(int index);
QVariantList getCatalogsDescription() const {return catalogsDescript ion;} QVariantList getCatalogsDescription() const {return catalogsDescript ion;}
//! Try to load the given catalog, even if it is marched as unchecke d. //! Try to load the given catalog, even if it is marched as unchecke d.
//! Mark it as checked if checksum is correct. //! Mark it as checked if checksum is correct.
//! @return false in case of failure. //! @return false in case of failure.
bool checkAndLoadCatalog(QVariantMap m, StelLoadingBar* lb=NULL); bool checkAndLoadCatalog(QVariantMap m);
private: private:
void setCheckFlag(const QString& catalogId, bool b); void setCheckFlag(const QString& catalogId, bool b);
void copyDefaultConfigFile(); void copyDefaultConfigFile();
//! Loads common names for stars from a file. //! Loads common names for stars from a file.
//! Called when the SkyCulture is updated. //! Called when the SkyCulture is updated.
//! @param the path to a file containing the common names for bright stars. //! @param the path to a file containing the common names for bright stars.
skipping to change at line 223 skipping to change at line 220
LinearFader labelsFader; LinearFader labelsFader;
LinearFader starsFader; LinearFader starsFader;
bool flagStarName; bool flagStarName;
float labelsAmount; float labelsAmount;
bool gravityLabel; bool gravityLabel;
int maxGeodesicGridLevel; int maxGeodesicGridLevel;
int lastMaxSearchLevel; int lastMaxSearchLevel;
typedef std::map<int,BigStarCatalogExtension::ZoneArray*> ZoneArrayM ap; typedef QHash<int,BigStarCatalogExtension::ZoneArray*> ZoneArrayMap;
ZoneArrayMap zoneArrays; // index is the grid level ZoneArrayMap zoneArrays; // index is the grid level
static void initTriangleFunc(int lev, int index, static void initTriangleFunc(int lev, int index,
const Vec3d const Vec3f
&c0, &c0,
const Vec3d const Vec3f
&c1, &c1,
const Vec3d const Vec3f
&c2, &c2,
void *conte xt) void *conte xt)
{ {
reinterpret_cast<StarMgr*>(context)->initTriangle(lev, index , c0, c1, c2); reinterpret_cast<StarMgr*>(context)->initTriangle(lev, index , c0, c1, c2);
} }
void initTriangle(int lev, int index, void initTriangle(int lev, int index,
const Vec3d &c0, const Vec3f &c0,
const Vec3d &c1, const Vec3f &c1,
const Vec3d &c2); const Vec3f &c2);
BigStarCatalogExtension::HipIndexStruct *hipIndex; // array of hipar cos stars BigStarCatalogExtension::HipIndexStruct *hipIndex; // array of hipar cos stars
static std::map<int, QString> commonNamesMap; static QHash<int, QString> commonNamesMap;
static std::map<int, QString> commonNamesMapI18n; static QHash<int, QString> commonNamesMapI18n;
static std::map<QString, int> commonNamesIndex; static QMap<QString, int> commonNamesIndexI18n;
static std::map<QString, int> commonNamesIndexI18n;
static std::map<int, QString> sciNamesMapI18n; static QHash<int, QString> sciNamesMapI18n;
static std::map<QString, int> sciNamesIndexI18n; static QMap<QString, int> sciNamesIndexI18n;
QFont starFont; QFont starFont;
static bool flagSciNames; static bool flagSciNames;
Vec3f labelColor; Vec3f labelColor;
StelTextureSP texPointer; // The selection pointer tex ture StelTextureSP texPointer; // The selection pointer tex ture
class StelObjectMgr* objectMgr; class StelObjectMgr* objectMgr;
QString starConfigFileFullPath; QString starConfigFileFullPath;
 End of changes. 10 change blocks. 
22 lines changed or deleted 18 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/