CCD.hpp   CCD.hpp 
skipping to change at line 41 skipping to change at line 41
{ {
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 chipRotAngle READ chipRotAngle WRITE setChipRotAng le)
Q_PROPERTY(int binningX READ binningX WRITE setBinningX)
Q_PROPERTY(int binningY READ binningY WRITE setBinningY)
Q_PROPERTY(double hasOAG READ hasOAG WRITE setHasOAG) Q_PROPERTY(double hasOAG READ hasOAG WRITE setHasOAG)
Q_PROPERTY(double prismHeight READ prismHeight WRITE setPrismHeight) Q_PROPERTY(double prismHeight READ prismHeight WRITE setPrismHeight)
Q_PROPERTY(double prismWidth READ prismWidth WRITE setPrismWidth) Q_PROPERTY(double prismWidth READ prismWidth WRITE setPrismWidth)
Q_PROPERTY(double prismDistance READ prismDistance WRITE setPrismDis tance) Q_PROPERTY(double prismDistance READ prismDistance WRITE setPrismDis tance)
Q_PROPERTY(double prismPosAngle READ prismPosAngle WRITE setPrismPos Angle) 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 71 skipping to change at line 74
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; double chipRotAngle() const;
void setChipRotAngle(double angle); void setChipRotAngle(double angle);
int binningX() const;
void setBinningX(int binning);
int binningY() const;
void setBinningY(int binning);
bool hasOAG() const; bool hasOAG() const;
void setHasOAG(bool oag); void setHasOAG(bool oag);
double prismDistance() const; double prismDistance() const;
void setPrismDistance(double distance); void setPrismDistance(double distance);
double prismHeight() const; double prismHeight() const;
void setPrismHeight(double height); void setPrismHeight(double height);
double prismWidth() const; double prismWidth() const;
void setPrismWidth(double width); void setPrismWidth(double width);
double prismPosAngle() const; double prismPosAngle() const;
void setPrismPosAngle(double angle); void setPrismPosAngle(double angle);
skipping to change at line 108 skipping to change at line 115
//! 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) //! chip rotation angle around its axis (degrees)
double m_chipRotAngle; double m_chipRotAngle;
//! Binning for axes X
int m_binningX;
//! Binning for axes Y
int m_binningY;
//! Show off axis guider view //! Show off axis guider view
bool m_has_oag; bool m_has_oag;
//! OAG prism height (milimeters) //! OAG prism height (milimeters)
double m_oag_prismHeight; double m_oag_prismHeight;
//! OAG prism width (milimeters) //! OAG prism width (milimeters)
double m_oag_prismWidth; double m_oag_prismWidth;
//! OAG prisrm distance from the axis center (mimileters) //! OAG prisrm distance from the axis center (mimileters)
double m_oag_prismDistance; double m_oag_prismDistance;
//! OAG prisrm position angle (degrees) //! OAG prisrm position angle (degrees)
double m_oag_prismPosAngle; double m_oag_prismPosAngle;
 End of changes. 4 change blocks. 
0 lines changed or deleted 11 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/