Ocular.hpp   Ocular.hpp 
skipping to change at line 22 skipping to change at line 22
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA.
*/ */
#ifndef OCULAR_HPP_ #ifndef OCULAR_HPP_
#define OCULAR_HPP_ #define OCULAR_HPP_
#include <QDebug>
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <QSqlRecord> #include <QSettings>
class Telescope; class Telescope;
class Ocular : public QObject class Ocular : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QString name READ name WRITE setName)
Q_PROPERTY(double appearentFOV READ appearentFOV WRITE setAppearentF
OV)
Q_PROPERTY(double effectiveFocalLength READ effectiveFocalLength WRI
TE setEffectiveFocalLength)
Q_PROPERTY(double fieldStop READ fieldStop WRITE setFieldStop)
public: public:
Ocular(QSqlRecord record); Ocular();
Q_INVOKABLE Ocular(const QObject& other);
virtual ~Ocular(); virtual ~Ocular();
const QString getName(); static Ocular* ocularFromSettings(QSettings* theSettings, int ocular
int getOcularID(); Index);
double getAppearentFOV(); static Ocular* ocularModel();
double getEffectiveFocalLength();
double getFieldStop(); const QString name() const;
void setName(QString aName);
double getActualFOV(Telescope *telescope); double appearentFOV() const;
double getMagnification(Telescope *telescope); void setAppearentFOV(double fov);
double getExitCircle(Telescope *telescope); double effectiveFocalLength() const;
void setEffectiveFocalLength(double fl);
double fieldStop() const;
void setFieldStop(double fs);
double actualFOV(Telescope *telescope) const;
double magnification(Telescope *telescope) const;
QMap<int, QString> propertyMap();
private: private:
int ocularID; QString m_name;
QString name; double m_appearentFOV;
double appearentFOV; double m_effectiveFocalLength;
double effectiveFocalLength; double m_fieldStop;
double fieldStop;
}; };
#endif /* OCULAR_HPP_ */ #endif /* OCULAR_HPP_ */
 End of changes. 7 change blocks. 
16 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/