Oculars.hpp   Oculars.hpp 
skipping to change at line 83 skipping to change at line 83
//! @class Oculars //! @class Oculars
//! @ingroup oculars //! @ingroup oculars
class Oculars : public StelModule class Oculars : public StelModule
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool enableOcular READ getEnableOcular WRITE enableOcular NOTIFY enableOcularChanged) Q_PROPERTY(bool enableOcular READ getEnableOcular WRITE enableOcular NOTIFY enableOcularChanged)
Q_PROPERTY(bool enableCrosshairs READ getEnableCrosshairs WRITE togg leCrosshairs NOTIFY enableCrosshairsChanged) Q_PROPERTY(bool enableCrosshairs READ getEnableCrosshairs WRITE togg leCrosshairs NOTIFY enableCrosshairsChanged)
Q_PROPERTY(bool enableCCD READ getEnableCCD WRITE toggleCCD NOTIFY e nableCCDChanged) Q_PROPERTY(bool enableCCD READ getEnableCCD WRITE toggleCCD NOTIFY e nableCCDChanged)
Q_PROPERTY(bool enableTelrad READ getEnableTelrad WRITE toggleTelrad NOTIFY enableTelradChanged) Q_PROPERTY(bool enableTelrad READ getEnableTelrad WRITE toggleTelrad NOTIFY enableTelradChanged)
Q_PROPERTY(bool flagHideGridsLines READ getFlagHideGridsLines WRITE setFlagHideGridsLines NOTIFY hideGridsLinesChanged)
//BM: Temporary, until the GUI is finalized and some other method of getting //BM: Temporary, until the GUI is finalized and some other method of getting
//info from the main class is implemented. //info from the main class is implemented.
friend class OcularsGuiPanel; friend class OcularsGuiPanel;
public: public:
Oculars(); Oculars();
virtual ~Oculars(); virtual ~Oculars();
static QSettings* appSettings(); static QSettings* appSettings();
skipping to change at line 181 skipping to change at line 182
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();
void hideGridsLinesChanged(bool value);
private slots: private slots:
//! Signifies a change in ocular or telescope. Sets new zoom level. //! Signifies a change in ocular or telescope. Sets new zoom level.
void instrumentChanged(); void instrumentChanged();
void determineMaxEyepieceAngle(); void determineMaxEyepieceAngle();
void setRequireSelection(bool state); void setRequireSelection(bool state);
void setScaleImageCircle(bool state); void setScaleImageCircle(bool state);
void setScreenFOVForCCD(); void setScreenFOVForCCD();
void retranslateGui(); void retranslateGui();
void updateOcularReticle(void); void updateOcularReticle(void);
skipping to change at line 223 skipping to change at line 225
void unzoomOcular(); void unzoomOcular();
//! This method is responsible for insuring a valid ini file for the plugin exists. It first checks to see //! This method is responsible for insuring a valid ini file for the plugin exists. It first checks to see
//! if one exists in the expected location. If it does not, a defau lt one is copied into place, and the process //! if one exists in the expected location. If it does not, a defau lt one is copied into place, and the process
//! ends. However, if one does exist, it opens it, and looks for th e oculars_version key. The value (or even //! ends. However, if one does exist, it opens it, and looks for th e oculars_version key. The value (or even
//! presence) is used to determine if the ini file is usable. If no t, it is renamed, and a new one copied over. //! presence) is used to determine if the ini file is usable. If no t, it is renamed, and a new one copied over.
//! It does not ty to cope values over. //! It does not ty to cope values over.
//! Once there is a valid ini file, it is loaded into the settings a ttribute. //! Once there is a valid ini file, it is loaded into the settings a ttribute.
void validateAndLoadIniFile(); void validateAndLoadIniFile();
//! Recordd the state of the GridLinesMgr views beforehand, so that //!
it can be reset afterwords. //! Record the state of the GridLinesMgr views beforehand, so that i
t can be reset afterwards.
//! @param zoomedIn if true, this zoom operation is starting from an already zoomed state. //! @param zoomedIn if true, this zoom operation is starting from an already zoomed state.
//! False for the original state. //! False for the original state.
void zoom(bool zoomedIn); void zoom(bool zoomedIn);
//! This method is called by the zoom() method, when this plugin is toggled on; it resets the zoomed view. //! This method is called by the zoom() method, when this plugin is toggled on; it resets the zoomed view.
void zoomOcular(); void zoomOcular();
void hideUsageMessageIfDisplayed(); void hideUsageMessageIfDisplayed();
//! Creates the sub-menu listing lense in the pop-up menu //! Creates the sub-menu listing lense in the pop-up menu
QMenu* addLensSubmenu(QMenu* parent); QMenu* addLensSubmenu(QMenu* parent);
//! Creates the sub-menu listing telescopes in the pop-up menu. //! Creates the sub-menu listing telescopes in the pop-up menu.
QMenu* addTelescopeSubmenu(QMenu* parent); QMenu* addTelescopeSubmenu(QMenu* parent);
//! Returns selected lens,or NULL if no lens is selected //! Returns selected lens,or Q_NULLPTR if no lens is selected
Lens* selectedLens(); Lens* selectedLens();
//! A list of all the oculars defined in the ini file. Must have at least one, or module will not run. //! A list of all the oculars defined in the ini file. Must have at least one, or module will not run.
QList<CCD *> ccds; QList<CCD *> ccds;
QList<Ocular *> oculars; QList<Ocular *> oculars;
QList<Telescope *> telescopes; QList<Telescope *> telescopes;
QList<Lens *> lense; QList<Lens *> lenses;
int selectedCCDIndex; //!< index of the current CCD, in the range of -1:ccds.count(). -1 means no CCD is selected. int selectedCCDIndex; //!< index of the current CCD, in the range of -1:ccds.count(). -1 means no CCD is selected.
int selectedOcularIndex; //!< index of the current ocular, in the ra nge of -1:oculars.count(). -1 means no ocular is selected. int selectedOcularIndex; //!< index of the current ocular, in the ra nge of -1:oculars.count(). -1 means no ocular is selected.
int selectedTelescopeIndex; //!< index of the current telescope, in the range of -1:telescopes.count(). -1 means none is selected. int selectedTelescopeIndex; //!< index of the current telescope, in the range of -1:telescopes.count(). -1 means none is selected.
int selectedLensIndex; //!< index of the current lens, in the range of -1:lense.count(). -1 means no lens is selected int selectedLensIndex; //!< index of the current lens, in the range of -1:lense.count(). -1 means no lens is selected
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 flagGalacticGrid; //!< Flag to track if GalacticGrid w
as 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 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 flagEclipticJ2000Line; //!< Flag to track if EclipticJ2000L
ine was 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 flagEclipticGrid; //!< Flag to track if EclipticGrid 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 flagHorizonLine; //!< Flag to track if HorizonLine wa
s 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 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 flagSolsticeJ2000Points; //!< Flag to track if SolsticeJ2000P
oints was displayed at activation.
bool flagSolsticePoints; //!< Flag to track if SolsticePoints
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 relativeStarScaleMain; //!< Value to store the usual relati
ve star scale when activating ocular or CCD view
float absoluteStarScaleMain; //!< Value to store the usual absolu
te star scale when activating ocular or CCD view
float relativeStarScaleOculars; //!< Value to store the relative sta
r scale when switching off ocular view
float absoluteStarScaleOculars; //!< Value to store the absolute sta
r scale when switching off ocular view
float relativeStarScaleCCD; //!< Value to store the relative sta
r scale when switching off CCD view
float absoluteStarScaleCCD; //!< Value to store the absolute sta
r scale when switching off CCD view
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 flagSemiTransparency;
bool flagHideGridsLines; bool flagHideGridsLines;
bool flagGridlinesDisplayedMain; //!< keep track of gridline display while possibly suppressing their display.
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 * lensesSignalMapper; //!< Used to determine which len s was selected from the popup navigator */
// for toolbar button // for toolbar button
QPixmap * pxmapGlow; QPixmap * pxmapGlow;
QPixmap * pxmapOnIcon; QPixmap * pxmapOnIcon;
QPixmap * pxmapOffIcon; QPixmap * pxmapOffIcon;
StelButton * toolbarButton; StelButton * toolbarButton;
OcularDialog *ocularDialog; OcularDialog *ocularDialog;
bool ready; //!< A flag that determines that this module is usable. If false, we won't open. bool ready; //!< A flag that determines that this module is usable. If false, we won't open.
skipping to change at line 368 skipping to change at line 344
//! 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
Q_PLUGIN_METADATA(IID StelPluginInterface_iid) Q_PLUGIN_METADATA(IID StelPluginInterface_iid)
Q_INTERFACES(StelPluginInterface) Q_INTERFACES(StelPluginInterface)
public: public:
virtual StelModule* getStelModule() const; virtual StelModule* getStelModule() const;
virtual StelPluginInfo getPluginInfo() const; virtual StelPluginInfo getPluginInfo() const;
virtual QObjectList getExtensionList() const { return QObjectList(); }
}; };
#endif /*_OCULARS_HPP_*/ #endif /*_OCULARS_HPP_*/
 End of changes. 12 change blocks. 
71 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/