CCD.cpp   CCD.cpp 
skipping to change at line 255 skipping to change at line 255
return m_binningY; return m_binningY;
} }
void CCD::setBinningY(int binning) void CCD::setBinningY(int binning)
{ {
m_binningY = binning; m_binningY = binning;
} }
double CCD::getInnerOAGRadius(Telescope *telescope, Lens *lens) const double CCD::getInnerOAGRadius(Telescope *telescope, Lens *lens) const
{ {
const double lens_multipler = (lens != NULL ? lens->getMultipler() : 1.0f); const double lens_multipler = (lens != Q_NULLPTR ? lens->getMultiple r() : 1.0f);
double radius = RADIAN_TO_DEGREES * 2 * qAtan(this->prismDistance() /(2.0 * telescope->focalLength() * lens_multipler)); double radius = RADIAN_TO_DEGREES * 2 * qAtan(this->prismDistance() /(2.0 * telescope->focalLength() * lens_multipler));
return radius; return radius;
} }
double CCD::getOuterOAGRadius(Telescope *telescope, Lens *lens) const double CCD::getOuterOAGRadius(Telescope *telescope, Lens *lens) const
{ {
const double lens_multipler = (lens != NULL ? lens->getMultipler() : 1.0f); const double lens_multipler = (lens != Q_NULLPTR ? lens->getMultiple r() : 1.0f);
double radius = RADIAN_TO_DEGREES * 2 * qAtan((this->prismDistance() + this->prismHeight()) /(2.0 * telescope->focalLength() * lens_multipler)) ; double radius = RADIAN_TO_DEGREES * 2 * qAtan((this->prismDistance() + this->prismHeight()) /(2.0 * telescope->focalLength() * lens_multipler)) ;
return radius; return radius;
} }
double CCD::getOAGActualFOVx(Telescope *telescope, Lens *lens) const double CCD::getOAGActualFOVx(Telescope *telescope, Lens *lens) const
{ {
const double lens_multipler = (lens != NULL ? lens->getMultipler() : 1.0f); const double lens_multipler = (lens != Q_NULLPTR ? lens->getMultiple r() : 1.0f);
double fovX = RADIAN_TO_DEGREES * 2 * qAtan(this->prismWidth() /(2.0 * telescope->focalLength() * lens_multipler)); double fovX = RADIAN_TO_DEGREES * 2 * qAtan(this->prismWidth() /(2.0 * telescope->focalLength() * lens_multipler));
return fovX; 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->getMultipler() : 1.0f); const double lens_multipler = (lens != Q_NULLPTR ? lens->getMultiple r() : 1.0f);
double fovX = RADIAN_TO_DEGREES * 2 * qAtan(this->chipWidth() /(2.0 * telescope->focalLength() * lens_multipler)); double fovX = RADIAN_TO_DEGREES * 2 * qAtan(this->chipWidth() /(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->getMultipler() : 1.0f); const double lens_multipler = (lens != Q_NULLPTR ? lens->getMultiple r() : 1.0f);
double fovY = RADIAN_TO_DEGREES * 2 * qAtan(this->chipHeight() /(2.0 * telescope->focalLength() * lens_multipler)); double fovY = RADIAN_TO_DEGREES * 2 * qAtan(this->chipHeight() /(2.0 * telescope->focalLength() * lens_multipler));
return fovY; return fovY;
} }
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());
 End of changes. 5 change blocks. 
5 lines changed or deleted 5 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/