Ocular.hpp   Ocular.hpp 
skipping to change at line 28 skipping to change at line 28
#ifndef OCULAR_HPP_ #ifndef OCULAR_HPP_
#define OCULAR_HPP_ #define OCULAR_HPP_
#include <QDebug> #include <QDebug>
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <QSettings> #include <QSettings>
class Telescope; class Telescope;
class Lens;
class Ocular : public QObject class Ocular : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString name READ name WRITE setName)
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(bool binoculars READ isBinoculars WRITE setBinoculars)
public: public:
skipping to change at line 55 skipping to change at line 56
void setName(QString aName); void setName(QString aName);
double appearentFOV() const; double appearentFOV() const;
void setAppearentFOV(double fov); void setAppearentFOV(double fov);
double effectiveFocalLength() const; double effectiveFocalLength() const;
void setEffectiveFocalLength(double fl); void setEffectiveFocalLength(double fl);
double fieldStop() const; double fieldStop() const;
void setFieldStop(double fs); void setFieldStop(double fs);
bool isBinoculars() const; bool isBinoculars() const;
void setBinoculars(bool flag); void setBinoculars(bool flag);
double actualFOV(Telescope *telescope) const; double actualFOV(Telescope *telescope, Lens *lens) const;
double magnification(Telescope *telescope) const; double magnification(Telescope *telescope, Lens *lens) const;
QMap<int, QString> propertyMap(); QMap<int, QString> propertyMap();
private: private:
QString m_name; QString m_name;
double m_appearentFOV; double m_appearentFOV;
double m_effectiveFocalLength; double m_effectiveFocalLength;
double m_fieldStop; double m_fieldStop;
bool m_binoculars; bool m_binoculars;
}; };
 End of changes. 2 change blocks. 
2 lines changed or deleted 3 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/