ArchaeoLines.hpp   ArchaeoLines.hpp 
skipping to change at line 56 skipping to change at line 56
-# Declinations of the crossquarter days (days right between solstices and equinoxes) -# Declinations of the crossquarter days (days right between solstices and equinoxes)
-# Declinations of the Major Lunar Standstills -# Declinations of the Major Lunar Standstills
-# Declinations of the Minor Lunar Standstills -# Declinations of the Minor Lunar Standstills
-# Declination of the Zenith passage -# Declination of the Zenith passage
-# Declination of the Nadir passage -# Declination of the Nadir passage
-# Declination of the currently selected object -# Declination of the currently selected object
-# Current declination of the sun -# Current declination of the sun
-# Current declination of the moon -# Current declination of the moon
-# Current declination of a naked-eye planet -# Current declination of a naked-eye planet
Some religions, most notably Islam, adhere to a practice of observing a pra
yer direction towards a particular location.
Azimuth lines (vertical semicircles from zenith to nadir) for two locations
can be shown. Default locations are Mecca (Kaaba) and Jerusalem.
The directions are computed based on spherical trigonometry on a spherical
Earth.
In addition, up to 2 custom azimuth lines can be drawn, also with a customi
zed label.
The lunar lines include horizon parallax effects. There are two lines each The lunar lines include horizon parallax effects. There are two lines each
drawn, for maximum and minimum distance of the moon. Note that declination drawn, for maximum and minimum distance of the moon. Note that declination
of the moon at the major standstill can exceed the indicated limits if it of the moon at the major standstill can exceed the indicated limits if it
is high in the sky due to parallax effects. is high in the sky due to parallax effects.
It may be very instructive to let the time run quite fast and observe the It may be very instructive to let the time run quite fast and observe the
line of "current moon" swinging between its north and south limits each mon th. line of "current moon" swinging between its north and south limits each mon th.
These limits grow and shrink between the Major and Minor Standstills. These limits grow and shrink between the Major and Minor Standstills.
The sun likewise swings between the solstices. Over centuries, the solstice The sun likewise swings between the solstices. Over centuries, the solstice
skipping to change at line 80 skipping to change at line 85
//! @class ArchaeoLine //! @class ArchaeoLine
//! Class which manages a line (small circle) to display around the sky lik e the solstices line. //! Class which manages a line (small circle) to display around the sky lik e the solstices line.
//! Modelled after @class SkyLine found in GridLinesMgr.cpp at V0.13.2, but with small-circle drawing. //! Modelled after @class SkyLine found in GridLinesMgr.cpp at V0.13.2, but with small-circle drawing.
//! @author Georg Zotti //! @author Georg Zotti
//! @ingroup archaeoLines //! @ingroup archaeoLines
class ArchaeoLine : QObject class ArchaeoLine : QObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(Vec3f color READ getColor WRITE setColor) Q_PROPERTY(Vec3f color READ getColor WRITE setColor)
Q_PROPERTY(bool flagLabel READ isLabelVisible WRITE setLabelVisible) Q_PROPERTY(bool flagLabel READ isLabelVisible WRITE setLabelVisible)
//Need to register Enum with Qt to be able to use it as Q_PROPERTY
//or in signals/slots
Q_ENUMS(Line)
public: public:
enum Line { enum Line { // we must start with the planet lines to allow proper h
andling in the combobox.
CurrentPlanetNone, // actually a placeholder for counting/te
sting. By itself it makes no sense, i.e. deactivates the planet line
CurrentPlanetMercury,
CurrentPlanetVenus,
CurrentPlanetMars,
CurrentPlanetJupiter,
CurrentPlanetSaturn,
Equinox, Equinox,
Solstices, Solstices,
Crossquarters, Crossquarters,
MajorStandstill, MajorStandstill,
MinorStandstill, MinorStandstill,
ZenithPassage, ZenithPassage,
NadirPassage, NadirPassage,
SelectedObject, SelectedObject,
CurrentSun, CurrentSun,
CurrentMoon, CurrentMoon,
CurrentPlanetNone, // actually a placeholder for counting/te GeographicLocation1,
sting. By itself it makes no sense, i.e. deactivates the planet line GeographicLocation2,
CurrentPlanetMercury, CustomAzimuth1,
CurrentPlanetVenus, CustomAzimuth2
CurrentPlanetMars,
CurrentPlanetJupiter,
CurrentPlanetSaturn
}; };
ArchaeoLine(ArchaeoLine::Line lineType, double declination); ArchaeoLine(ArchaeoLine::Line lineType, double definingAngle);
virtual ~ArchaeoLine(){} virtual ~ArchaeoLine(){}
void draw(StelCore* core, float intensity=1.0f) const; void draw(StelCore* core, float intensity=1.0f) const;
const Vec3f& getColor() const {return color;} const Vec3f& getColor() const {return color;}
bool isDisplayed(void) const {return fader;} bool isDisplayed(void) const {return fader;}
public slots: public slots:
void setColor(const Vec3f& c) {color = c;} void setColor(const Vec3f& c) {color = c;}
void update(double deltaTime) {fader.update((int)(deltaTime*1000));} void update(double deltaTime) {fader.update((int)(deltaTime*1000));}
void setFadeDuration(float duration) {fader.setDuration((int)(durati on*1000.f));} void setFadeDuration(float duration) {fader.setDuration((int)(durati on*1000.f));}
void setDisplayed(const bool displayed){fader = displayed;} void setDisplayed(const bool displayed){fader = displayed;}
void setFontSize(double newSize){font.setPixelSize(newSize);} void setFontSize(double newSize){font.setPixelSize(newSize);}
//! reset declination/azimuth angle (degrees) of this arc.
void setDefiningAngle(double angle){definingAngle=angle;}
double getDefiningAngle(void) const {return definingAngle;} // retur
ns declination for most, or azimuth.
//! Re-translates the label. //! Re-translates the label.
void updateLabel(); void updateLabel();
void setLabelVisible(bool b){flagLabel=b;} void setLabelVisible(bool b){flagLabel=b;}
//! reset declination (degrees) of this small arc.
void setDeclination(double decl){declination=decl;}
bool isLabelVisible() const{return flagLabel;} bool isLabelVisible() const{return flagLabel;}
void setLineType(ArchaeoLine::Line line) {lineType=line; updateLabel ();} // Meaningful only for CurrentPlanet... types void setLineType(ArchaeoLine::Line line) {lineType=line; updateLabel ();} // Meaningful only for CurrentPlanet... types
//! change label. Used only for selected-object line - the other lab els should not be changed! //! change label. Used only for selected-object line - the other lab els should not be changed!
void setLabel(const QString newLabel){label=newLabel;} void setLabel(const QString newLabel){label=newLabel;}
QString getLabel() const {return label;}
private: private:
ArchaeoLine::Line lineType; ArchaeoLine::Line lineType;
double declination; // degrees double definingAngle; // degrees. This is declination for non-azimut h lines, azimuth for geographic locations and custom azimuths.
Vec3f color; Vec3f color;
StelCore::FrameType frameType; StelCore::FrameType frameType;
bool flagLabel; //! show the label. (some should be permanently sile nt) bool flagLabel; //! show the label. (some should be permanently sile nt)
QString label; QString label;
LinearFader fader; LinearFader fader;
QFont font; QFont font;
}; };
//! Main class of the ArchaeoLines plug-in. //! Main class of the ArchaeoLines plug-in.
//! Provides an on-screen visualisation of several small circles relevant m ainly to archaeoastronomy. //! Provides an on-screen visualisation of several small circles relevant m ainly to archaeoastronomy.
//! GZ 2014-12 //! In addition, a few azimuth lines can be shown.
//! GZ 2014-12, updated 2016-06.
class ArchaeoLines : public StelModule class ArchaeoLines : public StelModule
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool enabled Q_PROPERTY(bool enabled
READ isEnabled READ isEnabled
WRITE enableArchaeoLines) WRITE enableArchaeoLines
// Q_PROPERTY(bool dmsFormat NOTIFY archaeoLinesEnabledChanged)
// READ isDmsFormat
// WRITE useDmsFormat)
Q_PROPERTY(bool flagShowEquinox Q_PROPERTY(bool flagShowEquinox
READ isEquinoxDisplayed READ isEquinoxDisplayed
WRITE showEquinox) WRITE showEquinox
NOTIFY showEquinoxChanged
)
Q_PROPERTY(bool flagShowSolstices Q_PROPERTY(bool flagShowSolstices
READ isSolsticesDisplayed READ isSolsticesDisplayed
WRITE showSolstices) WRITE showSolstices
NOTIFY showSolsticesChanged
)
Q_PROPERTY(bool flagShowCrossquarters Q_PROPERTY(bool flagShowCrossquarters
READ isCrossquartersDisplayed READ isCrossquartersDisplayed
WRITE showCrossquarters) WRITE showCrossquarters
NOTIFY showCrossquartersChanged
)
Q_PROPERTY(bool flagShowMajorStandstills Q_PROPERTY(bool flagShowMajorStandstills
READ isMajorStandstillsDisplayed READ isMajorStandstillsDisplayed
WRITE showMajorStandstills) WRITE showMajorStandstills
NOTIFY showMajorStandstillsChanged
)
Q_PROPERTY(bool flagShowMinorStandstills Q_PROPERTY(bool flagShowMinorStandstills
READ isMinorStandstillsDisplayed READ isMinorStandstillsDisplayed
WRITE showMinorStandstills) WRITE showMinorStandstills
NOTIFY showMinorStandstillsChanged
)
Q_PROPERTY(bool flagShowZenithPassage Q_PROPERTY(bool flagShowZenithPassage
READ isZenithPassageDisplayed READ isZenithPassageDisplayed
WRITE showZenithPassage) WRITE showZenithPassage
NOTIFY showZenithPassageChanged
)
Q_PROPERTY(bool flagShowNadirPassage Q_PROPERTY(bool flagShowNadirPassage
READ isNadirPassageDisplayed READ isNadirPassageDisplayed
WRITE showNadirPassage) WRITE showNadirPassage
NOTIFY showNadirPassageChanged
)
Q_PROPERTY(bool flagShowSelectedObject Q_PROPERTY(bool flagShowSelectedObject
READ isSelectedObjectDisplayed READ isSelectedObjectDisplayed
WRITE showSelectedObject) WRITE showSelectedObject
NOTIFY showSelectedObjectChanged
)
Q_PROPERTY(bool flagShowCurrentSun Q_PROPERTY(bool flagShowCurrentSun
READ isCurrentSunDisplayed READ isCurrentSunDisplayed
WRITE showCurrentSun) WRITE showCurrentSun
NOTIFY showCurrentSunChanged
)
Q_PROPERTY(bool flagShowCurrentMoon Q_PROPERTY(bool flagShowCurrentMoon
READ isCurrentMoonDisplayed READ isCurrentMoonDisplayed
WRITE showCurrentMoon) WRITE showCurrentMoon
NOTIFY showCurrentMoonChanged
)
Q_PROPERTY(ArchaeoLine::Line enumShowCurrentPlanet Q_PROPERTY(ArchaeoLine::Line enumShowCurrentPlanet
READ whichCurrentPlanetDisplayed READ whichCurrentPlanetDisplayed
WRITE showCurrentPlanet) WRITE showCurrentPlanet
NOTIFY currentPlanetChanged)
Q_PROPERTY(bool flagShowGeographicLocation1
READ isGeographicLocation1Displayed
WRITE showGeographicLocation1
NOTIFY showGeographicLocation1Changed
)
Q_PROPERTY(bool flagShowGeographicLocation2
READ isGeographicLocation2Displayed
WRITE showGeographicLocation2
NOTIFY showGeographicLocation2Changed
)
Q_PROPERTY(double geographicLocation1Longitude
READ getGeographicLocation1Longitude
WRITE setGeographicLocation1Longitude
NOTIFY geographicLocation1Changed)
Q_PROPERTY(double geographicLocation1Latitude
READ getGeographicLocation1Latitude
WRITE setGeographicLocation1Latitude
NOTIFY geographicLocation1Changed)
Q_PROPERTY(double geographicLocation2Longitude
READ getGeographicLocation2Longitude
WRITE setGeographicLocation2Longitude
NOTIFY geographicLocation2Changed)
Q_PROPERTY(double geographicLocation2Latitude
READ getGeographicLocation2Latitude
WRITE setGeographicLocation2Latitude
NOTIFY geographicLocation2Changed)
Q_PROPERTY(bool flagShowCustomAzimuth1
READ isCustomAzimuth1Displayed
WRITE showCustomAzimuth1
NOTIFY showCustomAzimuth1Changed
)
Q_PROPERTY(bool flagShowCustomAzimuth2
READ isCustomAzimuth2Displayed
WRITE showCustomAzimuth2
NOTIFY showCustomAzimuth2Changed
)
// Note: following 2 are only "forwarding properties", no proper var
iables!
Q_PROPERTY(double customAzimuth1
READ getCustomAzimuth1
WRITE setCustomAzimuth1
NOTIFY customAzimuth1Changed)
Q_PROPERTY(double customAzimuth2
READ getCustomAzimuth2
WRITE setCustomAzimuth2
NOTIFY customAzimuth2Changed)
// TODO: Maybe add properties for geo locations and custom azimuths:
labels.
public: public:
ArchaeoLines(); ArchaeoLines();
virtual ~ArchaeoLines(); virtual ~ArchaeoLines();
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in the StelModule class // Methods defined in the StelModule class
virtual void init(); virtual void init();
virtual void update(double deltaTime); virtual void update(double deltaTime);
virtual void draw(StelCore* core); virtual void draw(StelCore* core);
virtual double getCallOrder(StelModuleActionName actionName) const; virtual double getCallOrder(StelModuleActionName actionName) const;
virtual void handleKeys(class QKeyEvent* event){event->setAccepted(f alse);} virtual void handleKeys(class QKeyEvent* event){event->setAccepted(f alse);}
virtual bool configureGui(bool show=true); virtual bool configureGui(bool show=true);
bool isEnabled() const {return flagShowArchaeoLines;} ////////////////////////////////////////////////////////////////////
bool isDmsFormat() const { return flagUseDmsFormat; } // NOT SURE IF //////
USEFUL
bool isEquinoxDisplayed() const {return flagShowEquinox;} //bool isDmsFormat() const { return flagUseDmsFormat; } // NOT SURE
bool isSolsticesDisplayed() const {return flagShowSolstices;} IF USEFUL
bool isCrossquartersDisplayed() const {return flagShowCrossquarters;
}
bool isMajorStandstillsDisplayed() const {return flagShowMajorStands
tills;}
bool isMinorStandstillsDisplayed() const {return flagShowMinorStands
tills;}
bool isZenithPassageDisplayed() const {return flagShowZenithPassage;
}
bool isNadirPassageDisplayed() const {return flagShowNadirPassage;}
bool isSelectedObjectDisplayed() const {return flagShowSelectedObjec
t;}
bool isCurrentSunDisplayed() const {return flagShowCurrentSun;}
bool isCurrentMoonDisplayed() const {return flagShowCurrentMoon;}
ArchaeoLine::Line whichCurrentPlanetDisplayed() const {return enumSh
owCurrentPlanet;}
//! Restore the plug-in's settings to the default state. //! Restore the plug-in's settings to the default state.
//! Replace the plug-in's settings in Stellarium's configuration fil e //! Replace the plug-in's settings in Stellarium's configuration fil e
//! with the default values and re-load them. //! with the default values and re-load them.
//! Uses internally loadSettings(). //! Uses internally loadSettings().
void restoreDefaultSettings(); void restoreDefaultSettings();
//! Load the plug-in's settings from the configuration file. //! Load the plug-in's settings from the configuration file.
//! Settings are kept in the "ArchaeoLines" section in Stellarium's //! Settings are kept in the "ArchaeoLines" section in Stellarium's
//! configuration file. If no such section exists, it will load defa ult //! configuration file. If no such section exists, it will load defa ult
//! values. //! values.
//! @see restoreDefaultSettings() //! @see restoreDefaultSettings()
void loadSettings(); void loadSettings();
signals:
void archaeoLinesEnabledChanged(bool on);
void showEquinoxChanged(bool on);
void showSolsticesChanged(bool on);
void showCrossquartersChanged(bool on);
void showMajorStandstillsChanged(bool on);
void showMinorStandstillsChanged(bool on);
void showZenithPassageChanged(bool on);
void showNadirPassageChanged(bool on);
void showSelectedObjectChanged(bool on);
void showCurrentSunChanged(bool on);
void showCurrentMoonChanged(bool on);
void showGeographicLocation1Changed(bool on);
void showGeographicLocation2Changed(bool on);
void geographicLocation1Changed();
void geographicLocation2Changed();
void showCustomAzimuth1Changed(bool on);
void showCustomAzimuth2Changed(bool on);
void customAzimuth1Changed(double az);
void customAzimuth2Changed(double az);
void currentPlanetChanged(ArchaeoLine::Line l); // meaningful only C
urrentPlanetNone...CurrentPlanetSaturn.
public slots: public slots:
void enableArchaeoLines(bool b); void enableArchaeoLines(bool b);
//void useDmsFormat(bool b); //void useDmsFormat(bool b);
bool isEnabled() const {return flagShowArchaeoLines;}
bool isEquinoxDisplayed() const {return flagShowEquinox;}
bool isSolsticesDisplayed() const {return flagShowSolstices;}
bool isCrossquartersDisplayed() const {return flagShowCrossquarters;
}
bool isMajorStandstillsDisplayed() const {return flagShowMajorStands
tills;}
bool isMinorStandstillsDisplayed() const {return flagShowMinorStands
tills;}
bool isZenithPassageDisplayed() const {return flagShowZenithPassage;
}
bool isNadirPassageDisplayed() const {return flagShowNadirPassage;}
bool isSelectedObjectDisplayed() const {return flagShowSelectedObjec
t;}
bool isCurrentSunDisplayed() const {return flagShowCurrentSun;}
bool isCurrentMoonDisplayed() const {return flagShowCurrentMoon;}
ArchaeoLine::Line whichCurrentPlanetDisplayed() const {return enumSh
owCurrentPlanet;}
bool isGeographicLocation1Displayed() const {return flagShowGeograph
icLocation1;}
bool isGeographicLocation2Displayed() const {return flagShowGeograph
icLocation2;}
bool isCustomAzimuth1Displayed() const {return flagShowCustomAzimuth
1;}
bool isCustomAzimuth2Displayed() const {return flagShowCustomAzimuth
2;}
void showEquinox(bool b); void showEquinox(bool b);
void showSolstices(bool b); void showSolstices(bool b);
void showCrossquarters(bool b); void showCrossquarters(bool b);
void showMajorStandstills(bool b); void showMajorStandstills(bool b);
void showMinorStandstills(bool b); void showMinorStandstills(bool b);
void showZenithPassage(bool b); void showZenithPassage(bool b);
void showNadirPassage(bool b); void showNadirPassage(bool b);
void showSelectedObject(bool b); void showSelectedObject(bool b);
void showCurrentSun(bool b); void showCurrentSun(bool b);
void showCurrentMoon(bool b); void showCurrentMoon(bool b);
void showCurrentPlanet(ArchaeoLine::Line l); // Allowed values for l : CurrentPlanetNone...CurrentPlanetSaturn. void showCurrentPlanet(ArchaeoLine::Line l); // Allowed values for l : CurrentPlanetNone...CurrentPlanetSaturn.
void showCurrentPlanet(QString planet); // Allowed values for planet void showCurrentPlanetNamed(QString planet); // Allowed values for p
: "none", "Mercury", "Venus", "Mars", "Jupiter", "Saturn". lanet: "none", "Mercury", "Venus", "Mars", "Jupiter", "Saturn".
void showGeographicLocation1(bool b);
void showGeographicLocation2(bool b);
void setGeographicLocation1Longitude(double lng);
void setGeographicLocation1Latitude(double lat);
void setGeographicLocation2Longitude(double lng);
void setGeographicLocation2Latitude(double lat);
void setGeographicLocation1Label(QString label);
void setGeographicLocation2Label(QString label);
double getGeographicLocation1Longitude() const {return geographicLoc
ation1Longitude; }
double getGeographicLocation1Latitude() const {return geographicLoc
ation1Latitude; }
double getGeographicLocation2Longitude() const {return geographicLoc
ation2Longitude; }
double getGeographicLocation2Latitude() const {return geographicLoc
ation2Latitude; }
void showCustomAzimuth1(bool b);
void showCustomAzimuth2(bool b);
void setCustomAzimuth1(double az);
double getCustomAzimuth1() const { return customAzimuth1Line->getDef
iningAngle(); }
void setCustomAzimuth2(double az);
double getCustomAzimuth2() const { return customAzimuth2Line->getDef
iningAngle(); }
void setCustomAzimuth1Label(QString label);
void setCustomAzimuth2Label(QString label);
// called by the dialog GUI, converts GUI's QColor (0..255) to Stell arium's Vec3f float color. // called by the dialog GUI, converts GUI's QColor (0..255) to Stell arium's Vec3f float color.
void setLineColor(ArchaeoLine::Line whichLine, QColor color); void setLineColor(ArchaeoLine::Line whichLine, QColor color);
// called by the dialog UI, converts Stellarium's Vec3f float color to QColor (0..255). // called by the dialog UI, converts Stellarium's Vec3f float color to QColor (0..255).
QColor getLineColor(ArchaeoLine::Line whichLine); QColor getLineColor(ArchaeoLine::Line whichLine);
//! query a line for its current defining angle. Returns declination
or azimuth, respectively.
double getLineAngle(ArchaeoLine::Line whichLine);
QString getLineLabel(ArchaeoLine::Line whichLine);
private slots:
//! a slot connected to core which cares for location changes, updat
ing the geographicLocation lines.
void updateObserverLocation(StelLocation loc);
//! Compute azimuth (from North) towards Target. All angles (args an
d result) are in degrees.
double getAzimuthForLocation(double longObs, double latObs, double l
ongTarget, double latTarget) const;
private: private:
QFont font; QFont font;
bool flagShowArchaeoLines; bool flagShowArchaeoLines;
bool withDecimalDegree; //bool withDecimalDegree;
bool flagUseDmsFormat; //bool flagUseDmsFormat;
LinearFader lineFader; LinearFader lineFader;
Vec3f equinoxColor; Vec3f equinoxColor;
Vec3f solsticesColor; Vec3f solsticesColor;
Vec3f crossquartersColor; Vec3f crossquartersColor;
Vec3f majorStandstillColor; Vec3f majorStandstillColor;
Vec3f minorStandstillColor; Vec3f minorStandstillColor;
Vec3f zenithPassageColor; Vec3f zenithPassageColor;
Vec3f nadirPassageColor; Vec3f nadirPassageColor;
Vec3f selectedObjectColor; Vec3f selectedObjectColor;
Vec3f currentSunColor; Vec3f currentSunColor;
Vec3f currentMoonColor; Vec3f currentMoonColor;
Vec3f currentPlanetColor; Vec3f currentPlanetColor;
Vec3f geographicLocation1Color;
Vec3f geographicLocation2Color;
Vec3f customAzimuth1Color;
Vec3f customAzimuth2Color;
bool flagShowEquinox; bool flagShowEquinox;
bool flagShowSolstices; bool flagShowSolstices;
bool flagShowCrossquarters; bool flagShowCrossquarters;
bool flagShowMajorStandstills; bool flagShowMajorStandstills;
bool flagShowMinorStandstills; bool flagShowMinorStandstills;
bool flagShowZenithPassage; bool flagShowZenithPassage;
bool flagShowNadirPassage; bool flagShowNadirPassage;
bool flagShowSelectedObject; bool flagShowSelectedObject;
bool flagShowCurrentSun; bool flagShowCurrentSun;
bool flagShowCurrentMoon; bool flagShowCurrentMoon;
ArchaeoLine::Line enumShowCurrentPlanet; ArchaeoLine::Line enumShowCurrentPlanet;
bool flagShowGeographicLocation1;
double geographicLocation1Longitude;
double geographicLocation1Latitude;
bool flagShowGeographicLocation2;
double geographicLocation2Longitude;
double geographicLocation2Latitude;
bool flagShowCustomAzimuth1;
bool flagShowCustomAzimuth2;
double lastJDE; // cache last-time-computed to every 10 days or so? double lastJDE; // cache last-time-computed to every 10 days or so?
ArchaeoLine * equinoxLine; ArchaeoLine * equinoxLine;
ArchaeoLine * northernSolsticeLine; ArchaeoLine * northernSolsticeLine;
ArchaeoLine * southernSolsticeLine; ArchaeoLine * southernSolsticeLine;
ArchaeoLine * northernCrossquarterLine; ArchaeoLine * northernCrossquarterLine;
ArchaeoLine * southernCrossquarterLine; ArchaeoLine * southernCrossquarterLine;
ArchaeoLine * northernMajorStandstillLine0; ArchaeoLine * northernMajorStandstillLine0;
ArchaeoLine * northernMajorStandstillLine1; ArchaeoLine * northernMajorStandstillLine1;
ArchaeoLine * northernMinorStandstillLine2; ArchaeoLine * northernMinorStandstillLine2;
skipping to change at line 291 skipping to change at line 442
ArchaeoLine * southernMinorStandstillLine4; ArchaeoLine * southernMinorStandstillLine4;
ArchaeoLine * southernMinorStandstillLine5; ArchaeoLine * southernMinorStandstillLine5;
ArchaeoLine * southernMajorStandstillLine6; ArchaeoLine * southernMajorStandstillLine6;
ArchaeoLine * southernMajorStandstillLine7; ArchaeoLine * southernMajorStandstillLine7;
ArchaeoLine * zenithPassageLine; ArchaeoLine * zenithPassageLine;
ArchaeoLine * nadirPassageLine; ArchaeoLine * nadirPassageLine;
ArchaeoLine * selectedObjectLine; ArchaeoLine * selectedObjectLine;
ArchaeoLine * currentSunLine; ArchaeoLine * currentSunLine;
ArchaeoLine * currentMoonLine; ArchaeoLine * currentMoonLine;
ArchaeoLine * currentPlanetLine; ArchaeoLine * currentPlanetLine;
ArchaeoLine * geographicLocation1Line;
ArchaeoLine * geographicLocation2Line;
ArchaeoLine * customAzimuth1Line;
ArchaeoLine * customAzimuth2Line;
StelButton* toolbarButton; StelButton* toolbarButton;
// draw one arc.
//! @param core the StelCore object
//! @param declination of the small circle
//! @param frameType usually StelCore::FrameEquinoxEqu
//! @param refractionMode usually StelCore::RefractionAuto
//! @param txtColor color used for any text printed regarding this l
ine
//! @param lineColor color used for this line
// void drawOne(StelCore *core, const float declination, const StelCore
::FrameType frameType, const StelCore::RefractionMode refractionMode, const
Vec3f txtColor, const Vec3f lineColor);
QSettings* conf; QSettings* conf;
// GUI // GUI
ArchaeoLinesDialog* configDialog; ArchaeoLinesDialog* configDialog;
StelCore* core; // used quite often, better keep a reference... StelCore* core; // used quite often, better keep a reference...
StelObjectMgr* objMgr; StelObjectMgr* objMgr;
}; };
#include <QObject> #include <QObject>
#include "StelPluginInterface.hpp" #include "StelPluginInterface.hpp"
 End of changes. 32 change blocks. 
75 lines changed or deleted 242 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/