Ocular.hpp   Ocular.hpp 
skipping to change at line 34 skipping to change at line 34
#include <QString> #include <QString>
#include <QSettings> #include <QSettings>
class Telescope; class Telescope;
class Lens; class Lens;
class Ocular : public QObject class Ocular : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool binoculars READ isBinoculars WRITE setBinoculars) Q_PROPERTY(bool binoculars READ isBinoculars WRITE setBinoculars)
Q_PROPERTY(bool permanentCrosshair READ hasPermanentCrosshair WRITE setPermanentCrosshair)
Q_PROPERTY(double appearentFOV READ appearentFOV WRITE setAppearentF OV) Q_PROPERTY(double appearentFOV READ appearentFOV WRITE setAppearentF OV)
Q_PROPERTY(double effectiveFocalLength READ effectiveFocalLength WRI TE setEffectiveFocalLength) Q_PROPERTY(double effectiveFocalLength READ effectiveFocalLength WRI TE setEffectiveFocalLength)
Q_PROPERTY(double fieldStop READ fieldStop WRITE setFieldStop) Q_PROPERTY(double fieldStop READ fieldStop WRITE setFieldStop)
Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString name READ name WRITE setName)
Q_PROPERTY(QString reticlePath READ reticlePath WRITE setReticlePath ) Q_PROPERTY(QString reticlePath READ reticlePath WRITE setReticlePath )
public: public:
Ocular(); Ocular();
Q_INVOKABLE Ocular(const QObject& other); Q_INVOKABLE Ocular(const QObject& other);
virtual ~Ocular(); virtual ~Ocular();
static Ocular * ocularFromSettings(const QSettings * theSettings, co nst int ocularIndex); static Ocular * ocularFromSettings(const QSettings * theSettings, co nst int ocularIndex);
void writeToSettings(QSettings * settings, const int index); void writeToSettings(QSettings * settings, const int index);
static Ocular * ocularModel(void); static Ocular * ocularModel(void);
bool isBinoculars(void) const; bool isBinoculars(void) const;
void setBinoculars(const bool flag); void setBinoculars(const bool flag);
bool hasPermanentCrosshair(void) const;
void setPermanentCrosshair(const bool flag);
double appearentFOV(void) const; double appearentFOV(void) const;
void setAppearentFOV(const double fov); void setAppearentFOV(const double fov);
double effectiveFocalLength(void) const; double effectiveFocalLength(void) const;
void setEffectiveFocalLength(const double fl); void setEffectiveFocalLength(const double fl);
double fieldStop(void) const; double fieldStop(void) const;
void setFieldStop(const double fs); void setFieldStop(const double fs);
QString name(void) const; QString name(void) const;
void setName(const QString aName); void setName(const QString aName);
QString reticlePath(void) const; QString reticlePath(void) const;
void setReticlePath(const QString path); void setReticlePath(const QString path);
double actualFOV(const Telescope * telescope, const Lens *lens) cons t; double actualFOV(const Telescope * telescope, const Lens *lens) cons t;
double magnification(const Telescope * telescope, const Lens *lens) const; double magnification(const Telescope * telescope, const Lens *lens) const;
QMap<int, QString> propertyMap(void); QMap<int, QString> propertyMap(void);
private: private:
bool m_binoculars; bool m_binoculars;
bool m_permanetCrosshair;
double m_appearentFOV; double m_appearentFOV;
double m_effectiveFocalLength; double m_effectiveFocalLength;
double m_fieldStop; double m_fieldStop;
QString m_name; QString m_name;
QString m_reticlePath; QString m_reticlePath;
double m_reticleFOV; double m_reticleFOV;
}; };
#endif /* OCULAR_HPP_ */ #endif /* OCULAR_HPP_ */
 End of changes. 3 change blocks. 
0 lines changed or deleted 4 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/