CCD.hpp   CCD.hpp 
skipping to change at line 27 skipping to change at line 27
*/ */
#ifndef CCD_HPP_ #ifndef CCD_HPP_
#define CCD_HPP_ #define CCD_HPP_
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <QSettings> #include <QSettings>
class Telescope; class Telescope;
class Lens;
class CCD : public QObject class CCD : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString name READ name WRITE setName)
Q_PROPERTY(int resolutionX READ resolutionX WRITE setResolutionX) Q_PROPERTY(int resolutionX READ resolutionX WRITE setResolutionX)
Q_PROPERTY(int resolutionY READ resolutionY WRITE setResolutionY) Q_PROPERTY(int resolutionY READ resolutionY WRITE setResolutionY)
Q_PROPERTY(double chipWidth READ chipWidth WRITE setChipWidth) Q_PROPERTY(double chipWidth READ chipWidth WRITE setChipWidth)
Q_PROPERTY(double chipHeight READ chipHeight WRITE setChipHeight) Q_PROPERTY(double chipHeight READ chipHeight WRITE setChipHeight)
Q_PROPERTY(double pixelWidth READ pixelWidth WRITE setPixelWidth) Q_PROPERTY(double pixelWidth READ pixelWidth WRITE setPixelWidth)
skipping to change at line 65 skipping to change at line 66
void setChipHeight(double height); void setChipHeight(double height);
double pixelWidth() const; double pixelWidth() const;
void setPixelWidth(double width); void setPixelWidth(double width);
double pixelHeight() const; double pixelHeight() const;
void setPixelHeight(double height); void setPixelHeight(double height);
/** /**
* The formula for this calculation comes from the Yerkes observato ry. * The formula for this calculation comes from the Yerkes observato ry.
* fov degrees = 2PI/360degrees * chipDimension mm / telescope FL m m * fov degrees = 2PI/360degrees * chipDimension mm / telescope FL m m
*/ */
double getActualFOVx(Telescope *telescope) const; double getActualFOVx(Telescope *telescope, Lens *lens) const;
double getActualFOVy(Telescope *telescope) const; double getActualFOVy(Telescope *telescope, Lens *lens) const;
QMap<int, QString> propertyMap(); QMap<int, QString> propertyMap();
private: private:
QString m_name; QString m_name;
//! total resolution width in pixels //! total resolution width in pixels
int m_resolutionX; int m_resolutionX;
//! total resolution height in pixels //! total resolution height in pixels
int m_resolutionY; int m_resolutionY;
//! chip width in millimeters //! chip width in millimeters
double m_chipWidth; double m_chipWidth;
//! chip height in millimeters //! chip height in millimeters
 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/