CCD.cpp   CCD.cpp 
skipping to change at line 21 skipping to change at line 21
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#include "CCD.hpp" #include "CCD.hpp"
#include "Telescope.hpp" #include "Telescope.hpp"
#include "Lens.hpp"
#include <QDebug> #include <QDebug>
#include <QSettings> #include <QSettings>
#include <math.h> #include <math.h>
#define RADIAN_TO_DEGREES 57.2957795131 #define RADIAN_TO_DEGREES 57.2957795131
CCD::CCD() CCD::CCD()
{ {
skipping to change at line 141 skipping to change at line 142
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;
} }
double CCD::getActualFOVx(Telescope *telescope) const double CCD::getActualFOVx(Telescope *telescope, Lens *lens) const
{ {
double FOVx = RADIAN_TO_DEGREES * this->chipHeight() / telescope->fo const double lens_multipler = (lens != NULL ? lens->multipler() : 1.
calLength(); 0f);
double FOVx = RADIAN_TO_DEGREES * this->chipHeight() / (telescope->f
ocalLength() * lens_multipler);
return FOVx; return FOVx;
} }
double CCD::getActualFOVy(Telescope *telescope) const double CCD::getActualFOVy(Telescope *telescope, Lens *lens) const
{ {
double FOVy = RADIAN_TO_DEGREES * this->chipWidth() / telescope->foc const double lens_multipler = (lens != NULL ? lens->multipler() : 1.
alLength(); 0f);
double FOVy = RADIAN_TO_DEGREES * this->chipWidth() / (telescope->fo
calLength() * lens_multipler);
return FOVy; return FOVy;
} }
/* ********************************************************************* */ /* ********************************************************************* */
#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)
 End of changes. 5 change blocks. 
6 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/