CCD.hpp   CCD.hpp 
skipping to change at line 40 skipping to change at line 40
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)
Q_PROPERTY(double pixelHeight READ pixelHeight WRITE setPixelHeight) Q_PROPERTY(double pixelHeight READ pixelHeight WRITE setPixelHeight)
Q_PROPERTY(double chipRotAngle READ chipRotAngle WRITE setChipRotAng
le)
Q_PROPERTY(double hasOAG READ hasOAG WRITE setHasOAG)
Q_PROPERTY(double prismHeight READ prismHeight WRITE setPrismHeight)
Q_PROPERTY(double prismWidth READ prismWidth WRITE setPrismWidth)
Q_PROPERTY(double prismDistance READ prismDistance WRITE setPrismDis
tance)
Q_PROPERTY(double prismPosAngle READ prismPosAngle WRITE setPrismPos
Angle)
public: public:
CCD(); CCD();
Q_INVOKABLE CCD(const QObject& other); Q_INVOKABLE CCD(const QObject& other);
virtual ~CCD(); virtual ~CCD();
static CCD* ccdFromSettings(QSettings* theSettings, int ccdIndex); static CCD* ccdFromSettings(QSettings* theSettings, int ccdIndex);
void writeToSettings(QSettings * settings, const int index); void writeToSettings(QSettings * settings, const int index);
static CCD* ccdModel(); static CCD* ccdModel();
QString name() const; QString name() const;
void setName(QString name); void setName(QString name);
skipping to change at line 63 skipping to change at line 69
int resolutionY() const; int resolutionY() const;
void setResolutionY(int resolution); void setResolutionY(int resolution);
double chipWidth() const; double chipWidth() const;
void setChipWidth(double width); void setChipWidth(double width);
double chipHeight() const; double chipHeight() const;
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);
double chipRotAngle() const;
void setChipRotAngle(double angle);
bool hasOAG() const;
void setHasOAG(bool oag);
double prismDistance() const;
void setPrismDistance(double distance);
double prismHeight() const;
void setPrismHeight(double height);
double prismWidth() const;
void setPrismWidth(double width);
double prismPosAngle() const;
void setPrismPosAngle(double angle);
/** /**
* 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, Lens *lens) const; double getActualFOVx(Telescope *telescope, Lens *lens) const;
double getActualFOVy(Telescope *telescope, Lens *lens) const; double getActualFOVy(Telescope *telescope, Lens *lens) const;
double getInnerOAGRadius(Telescope *telescope, Lens *lens) const;
double getOuterOAGRadius(Telescope *telescope, Lens *lens) const;
double getOAGActualFOVx(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
double m_chipHeight; double m_chipHeight;
//! height of 1 pixel in micron (micrometer) //! height of 1 pixel in micron (micrometer)
double m_pixelWidth; double m_pixelWidth;
//! width of 1 pixel in micron (micrometer) //! width of 1 pixel in micron (micrometer)
double m_pixelHeight; double m_pixelHeight;
//! chip rotation angle around its axis (degrees)
double m_chipRotAngle;
//! Show off axis guider view
bool m_has_oag;
//! OAG prism height (milimeters)
double m_oag_prismHeight;
//! OAG prism width (milimeters)
double m_oag_prismWidth;
//! OAG prisrm distance from the axis center (mimileters)
double m_oag_prismDistance;
//! OAG prisrm position angle (degrees)
double m_oag_prismPosAngle;
}; };
#endif /* CCD_HPP_ */ #endif /* CCD_HPP_ */
 End of changes. 4 change blocks. 
0 lines changed or deleted 36 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/