Oculars.hpp   Oculars.hpp 
skipping to change at line 35 skipping to change at line 35
#include "Ocular.hpp" #include "Ocular.hpp"
#include "OcularDialog.hpp" #include "OcularDialog.hpp"
#include "StelModule.hpp" #include "StelModule.hpp"
#include "StelTexture.hpp" #include "StelTexture.hpp"
#include "Telescope.hpp" #include "Telescope.hpp"
#include "VecMath.hpp" #include "VecMath.hpp"
#include <QFont> #include <QFont>
#include <QSettings> #include <QSettings>
#define MIN_OCULARS_INI_VERSION 2 #define MIN_OCULARS_INI_VERSION 3.1f
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QKeyEvent; class QKeyEvent;
class QMenu; class QMenu;
class QMouseEvent; class QMouseEvent;
class QPixmap; class QPixmap;
class QSettings; class QSettings;
class QSignalMapper; class QSignalMapper;
QT_END_NAMESPACE QT_END_NAMESPACE
skipping to change at line 162 skipping to change at line 162
void setFlagDecimalDegrees(const bool b); void setFlagDecimalDegrees(const bool b);
bool getFlagDecimalDegrees(void) const; bool getFlagDecimalDegrees(void) const;
void setFlagLimitMagnitude(const bool b); void setFlagLimitMagnitude(const bool b);
bool getFlagLimitMagnitude(void) const; bool getFlagLimitMagnitude(void) const;
void setFlagInitFovUsage(const bool b); void setFlagInitFovUsage(const bool b);
bool getFlagInitFovUsage(void) const; bool getFlagInitFovUsage(void) const;
void setFlagUseFlipForCCD(const bool b); void setFlagAutosetMountForCCD(const bool b);
bool getFlagUseFlipForCCD(void) const; bool getFlagAutosetMountForCCD(void) const;
void setFlagUseSemiTransparency(const bool b); void setFlagUseSemiTransparency(const bool b);
bool getFlagUseSemiTransparency(void) const; bool getFlagUseSemiTransparency(void) const;
void setFlagHideGridsLines(const bool b);
bool getFlagHideGridsLines(void) const;
signals: signals:
void enableOcularChanged(bool value); void enableOcularChanged(bool value);
void enableCrosshairsChanged(bool value); void enableCrosshairsChanged(bool value);
void enableCCDChanged(bool value); void enableCCDChanged(bool value);
void enableTelradChanged(bool value); void enableTelradChanged(bool value);
void selectedCCDChanged(); void selectedCCDChanged();
void selectedOcularChanged(); void selectedOcularChanged();
void selectedTelescopeChanged(); void selectedTelescopeChanged();
void selectedLensChanged(); void selectedLensChanged();
skipping to change at line 259 skipping to change at line 262
QFont font; //!< The font used for drawing label s. QFont font; //!< The font used for drawing label s.
bool flagShowCCD; //!< flag used to track f we are in CCD mode. bool flagShowCCD; //!< flag used to track f we are in CCD mode.
bool flagShowOculars; //!< flag used to track if we are in ocular mode. bool flagShowOculars; //!< flag used to track if we are in ocular mode.
bool flagShowCrosshairs; //!< flag used to track in crosshair s should be rendered in the ocular view. bool flagShowCrosshairs; //!< flag used to track in crosshair s should be rendered in the ocular view.
bool flagShowTelrad; //!< If true, display the Telrad ove rlay. bool flagShowTelrad; //!< If true, display the Telrad ove rlay.
int usageMessageLabelID; //!< the id of the label showing the usage message. -1 means it's not displayed. int usageMessageLabelID; //!< the id of the label showing the usage message. -1 means it's not displayed.
bool flagAzimuthalGrid; //!< Flag to track if AzimuthalGrid was displayed at activation. bool flagAzimuthalGrid; //!< Flag to track if AzimuthalGrid was displayed at activation.
bool flagGalacticGrid; //!< Flag to track if GalacticGrid w as displayed at activation. bool flagGalacticGrid; //!< Flag to track if GalacticGrid w as displayed at activation.
bool flagEquatorGrid; //!< Flag to track if EquatorGrid wa s displayed at activation. bool flagSupergalacticGrid; //!< Flag to track if SupergalacticG rid was displayed at activation.
bool flagEquatorJ2000Grid; //!< Flag to track if EquatorJ2000Gr id was displayed at activation. bool flagEquatorJ2000Grid; //!< Flag to track if EquatorJ2000Gr id was displayed at activation.
bool flagEquatorGrid; //!< Flag to track if EquatorGrid wa
s displayed at activation.
bool flagEquatorJ2000Line; //!< Flag to track if EquatorJ2000Li
ne was displayed at activation.
bool flagEquatorLine; //!< Flag to track if EquatorLine wa s displayed at activation. bool flagEquatorLine; //!< Flag to track if EquatorLine wa s displayed at activation.
bool flagEclipticJ2000Line; //!< Flag to track if EclipticJ2000L ine was displayed at activation.
bool flagEclipticLine; //!< Flag to track if EclipticLine w as displayed at activation. bool flagEclipticLine; //!< Flag to track if EclipticLine w as displayed at activation.
bool flagEclipticJ2000Grid; //!< Flag to track if EclipticJ2000G rid was displayed at activation. bool flagEclipticJ2000Grid; //!< Flag to track if EclipticJ2000G rid was displayed at activation.
bool flagEclipticGrid; //!< Flag to track if EclipticGrid w as displayed at activation.
bool flagMeridianLine; //!< Flag to track if MeridianLine w as displayed at activation. bool flagMeridianLine; //!< Flag to track if MeridianLine w as displayed at activation.
bool flagLongitudeLine; //!< Flag to track if LongitudeLine was displayed at activation. bool flagLongitudeLine; //!< Flag to track if LongitudeLine was displayed at activation.
bool flagHorizonLine; //!< Flag to track if HorizonLine wa s displayed at activation. bool flagHorizonLine; //!< Flag to track if HorizonLine wa s displayed at activation.
bool flagGalacticEquatorLine; //!< Flag to track if GalacticEquato rLine was displayed at activation. bool flagGalacticEquatorLine; //!< Flag to track if GalacticEquato rLine was displayed at activation.
bool flagSupergalacticEquatorLine; //!< Flag to track if Superg
alacticEquatorLine was displayed at activation.
bool flagPrimeVerticalLine; //!< Flag to track if PrimeVerticalL
ine was displayed at activation.
bool flagColureLines; //!< Flag to track if ColureLines wa
s displayed at activation.
bool flagCircumpolarCircles; //!< Flag to track if CircumpolarCir
cles was displayed at activation.
bool flagPrecessionCircles; //!< Flag to track if PrecessionCirc
les was displayed at activation.
bool flagCardinalPoints; //!< Flag to track if CardinalPoints
was displayed at activation.
bool flagCelestialJ2000Poles; //!< Flag to track if CelestialJ2000
Poles was displayed at activation.
bool flagCelestialPoles; //!< Flag to track if CelestialPoles
was displayed at activation.
bool flagZenithNadirPoints; //!< Flag to track if ZenithNadir wa
s displayed at activation.
bool flagEclipticJ2000Poles; //!< Flag to track if EclipticJ2000P
oles was displayed at activation.
bool flagEclipticPoles; //!< Flag to track if EclipticPoles
was displayed at activation.
bool flagGalacticPoles; //!< Flag to track if GalacticPoles
was displayed at activation.
bool flagSupergalacticPoles; //!< Flag to track if SupergalacticP
oles was displayed at activation.
bool flagEquinoxJ2000Points; //!< Flag to track if EquinoxJ2000Po
ints was displayed at activation.
bool flagEquinoxPoints; //!< Flag to track if EquinoxPoints
was displayed at activation.
bool flagAdaptation; //!< Flag to track if adaptationChec kbox was enabled at activation. bool flagAdaptation; //!< Flag to track if adaptationChec kbox was enabled at activation.
bool flagLimitStars; //!< Flag to track limit magnitude f or stars bool flagLimitStars; //!< Flag to track limit magnitude f or stars
float magLimitStars; //!< Value of limited magnitude for stars float magLimitStars; //!< Value of limited magnitude for stars
bool flagLimitDSOs; //!< Flag to track limit magnitude f or DSOs bool flagLimitDSOs; //!< Flag to track limit magnitude f or DSOs
float magLimitDSOs; //!< Value of limited magnitude for DSOs float magLimitDSOs; //!< Value of limited magnitude for DSOs
bool flagLimitPlanets; //!< Flag to track limit magnitude f or planets, asteroids, comets etc. bool flagLimitPlanets; //!< Flag to track limit magnitude f or planets, asteroids, comets etc.
float magLimitPlanets; //!< Value of limited magnitude for planets, asteroids, comets etc. float magLimitPlanets; //!< Value of limited magnitude for planets, asteroids, comets etc.
float relativeStarScale; float relativeStarScale;
float absoluteStarScale; float absoluteStarScale;
skipping to change at line 289 skipping to change at line 313
bool flagMoonScale; //!< Flag to track of usage zooming of the Moon bool flagMoonScale; //!< Flag to track of usage zooming of the Moon
double maxEyepieceAngle; //!< The maximum aFOV of any eyepiec e. double maxEyepieceAngle; //!< The maximum aFOV of any eyepiec e.
bool requireSelection; //!< Read from the ini file, whether an object is required to be selected to zoom in. bool requireSelection; //!< Read from the ini file, whether an object is required to be selected to zoom in.
bool flagLimitMagnitude; //!< Read from the ini file, whether a magnitude is required to be limited. bool flagLimitMagnitude; //!< Read from the ini file, whether a magnitude is required to be limited.
bool useMaxEyepieceAngle; //!< Read from the ini file, whether to scale the mask based aFOV. bool useMaxEyepieceAngle; //!< Read from the ini file, whether to scale the mask based aFOV.
//! Display the GUI control panel //! Display the GUI control panel
bool guiPanelEnabled; bool guiPanelEnabled;
bool flagDecimalDegrees; bool flagDecimalDegrees;
bool flagSemiTransporency; bool flagSemiTransporency;
bool flagHideGridsLines;
bool flipVert; bool flipVert;
bool flipHorz; bool flipHorz;
QSignalMapper * ccdRotationSignalMapper; //!< Used to rotate the CC D. */ QSignalMapper * ccdRotationSignalMapper; //!< Used to rotate the CC D. */
QSignalMapper * ccdsSignalMapper; //!< Used to determine which CCD w as selected from the popup navigator. */ QSignalMapper * ccdsSignalMapper; //!< Used to determine which CCD w as selected from the popup navigator. */
QSignalMapper * ocularsSignalMapper; //!< Used to determine which oc ular was selected from the popup navigator. */ QSignalMapper * ocularsSignalMapper; //!< Used to determine which oc ular was selected from the popup navigator. */
QSignalMapper * telescopesSignalMapper; //!< Used to determine which telescope was selected from the popup navigator. */ QSignalMapper * telescopesSignalMapper; //!< Used to determine which telescope was selected from the popup navigator. */
QSignalMapper * lenseSignalMapper; //!< Used to determine which lens was selected from the popup navigator */ QSignalMapper * lenseSignalMapper; //!< Used to determine which lens was selected from the popup navigator */
// for toolbar button // for toolbar button
skipping to change at line 329 skipping to change at line 354
//Styles //Styles
QByteArray normalStyleSheet; QByteArray normalStyleSheet;
QByteArray nightStyleSheet; QByteArray nightStyleSheet;
//Reticle //Reticle
StelTextureSP reticleTexture; StelTextureSP reticleTexture;
double actualFOV; //!< Holds the FOV of the ocular/tes cope/lens cobination; what the screen is zoomed to. double actualFOV; //!< Holds the FOV of the ocular/tes cope/lens cobination; what the screen is zoomed to.
double initialFOV; //!< Holds the initial FOV double initialFOV; //!< Holds the initial FOV
bool flagInitFOVUsage; //!< Flag used to track if we use de fault initial FOV (value at the startup of planetarium). bool flagInitFOVUsage; //!< Flag used to track if we use de fault initial FOV (value at the startup of planetarium).
bool flagUseFlipForCCD; //!< Flag used to track if we use fl bool flagAutosetMountForCCD; //!< Flag used to track if we use au
ips for CCD tomatic switch to type of mount for CCD frame
bool equatorialMountEnabled;
double reticleRotation; double reticleRotation;
}; };
#include <QObject> #include <QObject>
#include "StelPluginInterface.hpp" #include "StelPluginInterface.hpp"
//! This class is used by Qt to manage a plug-in interface //! This class is used by Qt to manage a plug-in interface
class OcularsStelPluginInterface : public QObject, public StelPluginInterfa ce class OcularsStelPluginInterface : public QObject, public StelPluginInterfa ce
{ {
Q_OBJECT Q_OBJECT
 End of changes. 10 change blocks. 
6 lines changed or deleted 49 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/