Ocular.hpp   Ocular.hpp 
skipping to change at line 33 skipping to change at line 33
#include <QObject> #include <QObject>
#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(QString name READ name WRITE setName) Q_PROPERTY(bool binoculars READ isBinoculars WRITE setBinoculars)
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(bool binoculars READ isBinoculars WRITE setBinoculars) Q_PROPERTY(QString name READ name WRITE setName)
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(QSettings* theSettings, int ocular static Ocular * ocularFromSettings(const QSettings * theSettings, co
Index); nst int ocularIndex);
static Ocular* ocularModel(); void writeToSettings(QSettings * settings, const int index);
static Ocular * ocularModel(void);
const QString name() const;
void setName(QString aName); bool isBinoculars(void) const;
double appearentFOV() const; void setBinoculars(const bool flag);
void setAppearentFOV(double fov); double appearentFOV(void) const;
double effectiveFocalLength() const; void setAppearentFOV(const double fov);
void setEffectiveFocalLength(double fl); double effectiveFocalLength(void) const;
double fieldStop() const; void setEffectiveFocalLength(const double fl);
void setFieldStop(double fs); double fieldStop(void) const;
bool isBinoculars() const; void setFieldStop(const double fs);
void setBinoculars(bool flag); QString name(void) const;
void setName(const QString aName);
double actualFOV(Telescope *telescope, Lens *lens) const; QString reticlePath(void) const;
double magnification(Telescope *telescope, Lens *lens) const; void setReticlePath(const QString path);
QMap<int, QString> propertyMap();
double actualFOV(const Telescope * telescope, const Lens *lens) cons
t;
double magnification(const Telescope * telescope, const Lens *lens)
const;
QMap<int, QString> propertyMap(void);
private: private:
QString m_name; bool m_binoculars;
double m_appearentFOV; double m_appearentFOV;
double m_effectiveFocalLength; double m_effectiveFocalLength;
double m_fieldStop; double m_fieldStop;
bool m_binoculars; QString m_name;
QString m_reticlePath;
double m_reticleFOV;
}; };
#endif /* OCULAR_HPP_ */ #endif /* OCULAR_HPP_ */
 End of changes. 5 change blocks. 
22 lines changed or deleted 31 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/