CCD.cpp   CCD.cpp 
skipping to change at line 38 skipping to change at line 38
#define RADIAN_TO_DEGREES 57.2957795131 #define RADIAN_TO_DEGREES 57.2957795131
CCD::CCD() CCD::CCD()
: m_resolutionX(0) : m_resolutionX(0)
, m_resolutionY(0) , m_resolutionY(0)
, m_chipWidth(0.) , m_chipWidth(0.)
, m_chipHeight(0.) , m_chipHeight(0.)
, m_pixelWidth(0.) , m_pixelWidth(0.)
, m_pixelHeight(0.) , m_pixelHeight(0.)
, m_chipRotAngle(0.)
, m_has_oag(false)
, m_oag_prismHeight(0.)
, m_oag_prismWidth(0.)
, m_oag_prismDistance(0.)
, m_oag_prismPosAngle(0.)
{ {
} }
CCD::CCD(const QObject& other) CCD::CCD(const QObject& other)
: m_name(other.property("name").toString()) : m_name(other.property("name").toString())
, m_resolutionX(other.property("resolutionX").toInt()) , m_resolutionX(other.property("resolutionX").toInt())
, m_resolutionY(other.property("resolutionY").toInt()) , m_resolutionY(other.property("resolutionY").toInt())
, m_chipWidth(other.property("chipWidth").toFloat()) , m_chipWidth(other.property("chipWidth").toFloat())
, m_chipHeight(other.property("chipHeight").toFloat()) , m_chipHeight(other.property("chipHeight").toFloat())
, m_pixelWidth(other.property("pixelWidth").toFloat()) , m_pixelWidth(other.property("pixelWidth").toFloat())
, m_pixelHeight(other.property("pixelHeight").toFloat()) , m_pixelHeight(other.property("pixelHeight").toFloat())
, m_chipRotAngle(other.property("chipRotAngle").toFloat())
, m_has_oag(other.property("hasOAG").toBool())
, m_oag_prismHeight(other.property("prismHeight").toFloat())
, m_oag_prismWidth(other.property("prismWidth").toFloat())
, m_oag_prismDistance(other.property("prismDistance").toFloat())
, m_oag_prismPosAngle(other.property("prismPosAngle").toFloat())
{ {
} }
CCD::~CCD() CCD::~CCD()
{ {
} }
static QMap<int, QString> mapping; static QMap<int, QString> mapping;
QMap<int, QString> CCD::propertyMap() QMap<int, QString> CCD::propertyMap()
{ {
if(mapping.isEmpty()) { if(mapping.isEmpty()) {
mapping = QMap<int, QString>(); mapping = QMap<int, QString>();
mapping[0] = "name"; mapping[0] = "name";
mapping[1] = "chipHeight"; mapping[1] = "chipHeight";
mapping[2] = "chipWidth"; mapping[2] = "chipWidth";
mapping[3] = "pixelHeight"; mapping[3] = "pixelHeight";
mapping[4] = "pixelWidth"; mapping[4] = "pixelWidth";
mapping[5] = "resolutionX"; mapping[5] = "resolutionX";
mapping[6] = "resolutionY"; mapping[6] = "resolutionY";
mapping[7] = "chipRotAngle";
mapping[8] = "hasOAG";
mapping[9] = "prismHeight";
mapping[10] = "prismWidth";
mapping[11] = "prismDistance";
mapping[12] = "prismPosAngle";
} }
return mapping; return mapping;
} }
/* ********************************************************************* */ /* ********************************************************************* */
#if 0 #if 0
#pragma mark - #pragma mark -
#pragma mark Instance Methods #pragma mark Instance Methods
#endif #endif
/* ********************************************************************* */ /* ********************************************************************* */
skipping to change at line 149 skipping to change at line 167
double CCD::pixelHeight() const double CCD::pixelHeight() const
{ {
return m_pixelHeight; return m_pixelHeight;
} }
void CCD::setPixelHeight(double height) void CCD::setPixelHeight(double height)
{ {
m_pixelHeight = height; m_pixelHeight = height;
} }
void CCD::setChipRotAngle(double angle)
{
m_chipRotAngle = angle;
}
double CCD::chipRotAngle() const
{
return m_chipRotAngle;
}
bool CCD::hasOAG() const
{
return m_has_oag;
}
void CCD::setHasOAG(bool oag)
{
m_has_oag = oag;
}
double CCD::prismHeight() const
{
return m_oag_prismHeight;
}
void CCD::setPrismHeight(double height)
{
m_oag_prismHeight = height;
}
double CCD::prismWidth() const
{
return m_oag_prismWidth;
}
void CCD::setPrismWidth(double width)
{
m_oag_prismWidth = width;
}
double CCD::prismDistance() const
{
return m_oag_prismDistance;
}
void CCD::setPrismDistance(double distance)
{
m_oag_prismDistance = distance;
}
void CCD::setPrismPosAngle(double angle)
{
m_oag_prismPosAngle = angle;
}
double CCD::prismPosAngle() const
{
return m_oag_prismPosAngle;
}
double CCD::getInnerOAGRadius(Telescope *telescope, Lens *lens) const
{
const double lens_multipler = (lens != NULL ? lens->multipler() : 1.
0f);
double radius = RADIAN_TO_DEGREES * 2 * qAtan(this->prismDistance()
/(2.0 * telescope->focalLength() * lens_multipler));
return radius;
}
double CCD::getOuterOAGRadius(Telescope *telescope, Lens *lens) const
{
const double lens_multipler = (lens != NULL ? lens->multipler() : 1.
0f);
double radius = RADIAN_TO_DEGREES * 2 * qAtan((this->prismDistance()
+ this->prismHeight()) /(2.0 * telescope->focalLength() * lens_multipler))
;
return radius;
}
double CCD::getOAGActualFOVx(Telescope *telescope, Lens *lens) const
{
const double lens_multipler = (lens != NULL ? lens->multipler() : 1.
0f);
double fovX = RADIAN_TO_DEGREES * 2 * qAtan(this->prismWidth() /(2.0
* telescope->focalLength() * lens_multipler));
return fovX;
}
double CCD::getActualFOVx(Telescope *telescope, Lens *lens) const double CCD::getActualFOVx(Telescope *telescope, Lens *lens) const
{ {
const double lens_multipler = (lens != NULL ? lens->multipler() : 1. 0f); const double lens_multipler = (lens != NULL ? lens->multipler() : 1. 0f);
double fovX = RADIAN_TO_DEGREES * 2 * qAtan(this->chipHeight() /(2.0 * telescope->focalLength() * lens_multipler)); double fovX = RADIAN_TO_DEGREES * 2 * qAtan(this->chipHeight() /(2.0 * telescope->focalLength() * lens_multipler));
return fovX; return fovX;
} }
double CCD::getActualFOVy(Telescope *telescope, Lens *lens) const double CCD::getActualFOVy(Telescope *telescope, Lens *lens) const
{ {
const double lens_multipler = (lens != NULL ? lens->multipler() : 1. 0f); const double lens_multipler = (lens != NULL ? lens->multipler() : 1. 0f);
skipping to change at line 172 skipping to change at line 271
void CCD::writeToSettings(QSettings * settings, const int index) void CCD::writeToSettings(QSettings * settings, const int index)
{ {
QString prefix = "ccd/" + QVariant(index).toString() + "/"; QString prefix = "ccd/" + QVariant(index).toString() + "/";
settings->setValue(prefix + "name", this->name()); settings->setValue(prefix + "name", this->name());
settings->setValue(prefix + "resolutionX", this->resolutionX()); settings->setValue(prefix + "resolutionX", this->resolutionX());
settings->setValue(prefix + "resolutionY", this->resolutionY()); settings->setValue(prefix + "resolutionY", this->resolutionY());
settings->setValue(prefix + "chip_width", this->chipWidth()); settings->setValue(prefix + "chip_width", this->chipWidth());
settings->setValue(prefix + "chip_height", this->chipHeight()); settings->setValue(prefix + "chip_height", this->chipHeight());
settings->setValue(prefix + "pixel_width", this->pixelWidth()); settings->setValue(prefix + "pixel_width", this->pixelWidth());
settings->setValue(prefix + "pixel_height", this->pixelWidth()); settings->setValue(prefix + "pixel_height", this->pixelHeight());
settings->setValue(prefix + "chip_rot_angle", this->chipRotAngle());
settings->setValue(prefix + "has_oag", this->hasOAG());
settings->setValue(prefix + "prism_height", this->prismHeight());
settings->setValue(prefix + "prism_width", this->prismWidth());
settings->setValue(prefix + "prism_distance", this->prismDistance())
;
settings->setValue(prefix + "prism_pos_angle", this->prismPosAngle()
);
} }
/* ********************************************************************* */ /* ********************************************************************* */
#if 0 #if 0
#pragma mark - #pragma mark -
#pragma mark Static Methods #pragma mark Static Methods
#endif #endif
/* ********************************************************************* */ /* ********************************************************************* */
CCD* CCD::ccdFromSettings(QSettings* theSettings, int ccdIndex) CCD* CCD::ccdFromSettings(QSettings* theSettings, int ccdIndex)
{ {
CCD* ccd = new CCD(); CCD* ccd = new CCD();
QString prefix = "ccd/" + QVariant(ccdIndex).toString() + "/"; QString prefix = "ccd/" + QVariant(ccdIndex).toString() + "/";
ccd->setName(theSettings->value(prefix + "name", "").toString()); ccd->setName(theSettings->value(prefix + "name", "").toString());
ccd->setResolutionX(theSettings->value(prefix + "resolutionX", "0"). toInt()); ccd->setResolutionX(theSettings->value(prefix + "resolutionX", "0"). toInt());
ccd->setResolutionY(theSettings->value(prefix + "resolutionY", "0"). toInt()); ccd->setResolutionY(theSettings->value(prefix + "resolutionY", "0"). toInt());
ccd->setChipWidth(theSettings->value(prefix + "chip_width", "0.0").t oDouble()); ccd->setChipWidth(theSettings->value(prefix + "chip_width", "0.0").t oDouble());
ccd->setChipHeight(theSettings->value(prefix + "chip_height", "0.0") .toDouble()); ccd->setChipHeight(theSettings->value(prefix + "chip_height", "0.0") .toDouble());
ccd->setPixelWidth(theSettings->value(prefix + "pixel_width", "0.0") .toDouble()); ccd->setPixelWidth(theSettings->value(prefix + "pixel_width", "0.0") .toDouble());
ccd->setPixelHeight(theSettings->value(prefix + "pixel_height", "0.0 ").toDouble()); ccd->setPixelHeight(theSettings->value(prefix + "pixel_height", "0.0 ").toDouble());
ccd->setChipRotAngle(theSettings->value(prefix + "chip_rot_angle", "
0.0").toDouble());
ccd->setHasOAG(theSettings->value(prefix + "has_oag", "false").toBoo
l());
ccd->setPrismHeight(theSettings->value(prefix + "prism_height", "0.0
").toDouble());
ccd->setPrismWidth(theSettings->value(prefix + "prism_width", "0.0")
.toDouble());
ccd->setPrismDistance(theSettings->value(prefix + "prism_distance",
"0.0").toDouble());
ccd->setPrismPosAngle(theSettings->value(prefix + "prism_pos_angle",
"0.0").toDouble());
return ccd; return ccd;
} }
CCD* CCD::ccdModel() CCD* CCD::ccdModel()
{ {
CCD* model = new CCD(); CCD* model = new CCD();
model->setName("My CCD"); model->setName("My CCD");
model->setChipHeight(36.8); model->setChipHeight(36.8);
model->setChipWidth(36.8); model->setChipWidth(36.8);
model->setPixelHeight(9); model->setPixelHeight(9);
model->setPixelWidth(9); model->setPixelWidth(9);
model->setResolutionX(4096); model->setResolutionX(4096);
model->setResolutionY(4096); model->setResolutionY(4096);
model->setChipRotAngle(0);
return model; return model;
} }
 End of changes. 7 change blocks. 
2 lines changed or deleted 128 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/