OcularsGuiPanel.cpp   OcularsGuiPanel.cpp 
skipping to change at line 175 skipping to change at line 175
float scale = lineHeight*1.5; // TODO: change hardcoded 1.5 to edita ble value of scaling coefficient float scale = lineHeight*1.5; // TODO: change hardcoded 1.5 to edita ble value of scaling coefficient
QPixmap pa(":/graphicGui/btTimeRewind-on.png"); QPixmap pa(":/graphicGui/btTimeRewind-on.png");
QPixmap prevArrow = pa.scaledToHeight(scale, Qt::SmoothTransformatio n); QPixmap prevArrow = pa.scaledToHeight(scale, Qt::SmoothTransformatio n);
QPixmap paOff(":/graphicGui/btTimeRewind-off.png"); QPixmap paOff(":/graphicGui/btTimeRewind-off.png");
QPixmap prevArrowOff = paOff.scaledToHeight(scale, Qt::SmoothTransfo rmation); QPixmap prevArrowOff = paOff.scaledToHeight(scale, Qt::SmoothTransfo rmation);
QPixmap na(":/graphicGui/btTimeForward-on.png"); QPixmap na(":/graphicGui/btTimeForward-on.png");
QPixmap nextArrow = na.scaledToHeight(scale, Qt::SmoothTransformatio n); QPixmap nextArrow = na.scaledToHeight(scale, Qt::SmoothTransformatio n);
QPixmap naOff(":/graphicGui/btTimeForward-off.png"); QPixmap naOff(":/graphicGui/btTimeForward-off.png");
QPixmap nextArrowOff = naOff.scaledToHeight(scale, Qt::SmoothTransfo rmation); QPixmap nextArrowOff = naOff.scaledToHeight(scale, Qt::SmoothTransfo rmation);
StelActionMgr* actionsMgr = StelApp::getInstance().getStelActionMana
ger();
QString ocularsGroup = N_("Oculars"); // Possible group name: Ocular
s on-screen control panel
actionsMgr->addAction("actionToggle_Oculars_Previous_Ocular", ocular
sGroup, N_("Previous ocular"), this, "updateOcularControls()", "", "");
actionsMgr->addAction("actionToggle_Oculars_Next_Ocular", ocularsGro
up, N_("Next ocular"), this, "updateOcularControls()", "", "");
actionsMgr->addAction("actionToggle_Oculars_Previous_Lens", ocularsG
roup, N_("Previous lens"), this, "updateLensControls()", "", "");
actionsMgr->addAction("actionToggle_Oculars_Next_Lens", ocularsGroup
, N_("Next lens"), this, "updateLensControls()", "", "");
actionsMgr->addAction("actionToggle_Oculars_Previous_CCD", ocularsGr
oup, N_("Previous CCD frame"), this, "updateCcdControls()", "", "");
actionsMgr->addAction("actionToggle_Oculars_Next_CCD", ocularsGroup,
N_("Next CCD frame"), this, "updateCcdControls()", "", "");
actionsMgr->addAction("actionToggle_Oculars_Previous_Telescope", ocu
larsGroup, N_("Previous telescope"), this, "updateTelescopeControls()", "",
"");
actionsMgr->addAction("actionToggle_Oculars_Next_Telescope", oculars
Group, N_("Next telescope"), this, "updateTelescopeControls()", "", "");
actionsMgr->addAction("actionToggle_Oculars_Rotate_Frame_Reset", ocu
larsGroup, N_("Reset the sensor frame rotation"), this, "updateCcdControls(
)", "", "");
actionsMgr->addAction("actionToggle_Oculars_Rotate_Frame_15_Counterc
lockwise", ocularsGroup, N_("Rotate the sensor frame 15 degrees countercloc
kwise"), this, "updateCcdControls()", "", "");
actionsMgr->addAction("actionToggle_Oculars_Rotate_Frame_5_Countercl
ockwise", ocularsGroup, N_("Rotate the sensor frame 5 degrees counterclockw
ise"), this, "updateCcdControls()", "", "");
actionsMgr->addAction("actionToggle_Oculars_Rotate_Frame_1_Countercl
ockwise", ocularsGroup, N_("Rotate the sensor frame 1 degree counterclockwi
se"), this, "updateCcdControls()", "", "");
actionsMgr->addAction("actionToggle_Oculars_Rotate_Frame_15_Clockwis
e", ocularsGroup, N_("Rotate the sensor frame 15 degrees clockwise"), this,
"updateCcdControls()", "", "");
actionsMgr->addAction("actionToggle_Oculars_Rotate_Frame_5_Clockwise
", ocularsGroup, N_("Rotate the sensor frame 5 degrees clockwise"), this, "
updateCcdControls()", "", "");
actionsMgr->addAction("actionToggle_Oculars_Rotate_Frame_1_Clockwise
", ocularsGroup, N_("Rotate the sensor frame 1 degree clockwise"), this, "u
pdateCcdControls()", "", "");
prevOcularButton = new StelButton(ocularControls, prevOcularButton = new StelButton(ocularControls,
prevArrow, prevArrow,
prevArrowOff, prevArrowOff,
QPixmap()); QPixmap(),
"actionToggle_Oculars_Previous_Ocu
lar");
prevOcularButton->setToolTip(q_("Previous ocular")); prevOcularButton->setToolTip(q_("Previous ocular"));
nextOcularButton = new StelButton(ocularControls, nextOcularButton = new StelButton(ocularControls,
nextArrow, nextArrow,
nextArrowOff, nextArrowOff,
QPixmap()); QPixmap(),
"actionToggle_Oculars_Next_Ocular"
);
nextOcularButton->setToolTip(q_("Next ocular")); nextOcularButton->setToolTip(q_("Next ocular"));
prevLensButton = new StelButton(lensControls, prevLensButton = new StelButton(lensControls,
prevArrow, prevArrow,
prevArrowOff, prevArrowOff,
QPixmap()); QPixmap(),
"actionToggle_Oculars_Previous_Lens"
);
prevLensButton->setToolTip(q_("Previous lens")); prevLensButton->setToolTip(q_("Previous lens"));
nextLensButton = new StelButton(lensControls, nextLensButton = new StelButton(lensControls,
nextArrow, nextArrow,
nextArrowOff, nextArrowOff,
QPixmap()); QPixmap(),
"actionToggle_Oculars_Next_Lens");
nextLensButton->setToolTip(q_("Next lens")); nextLensButton->setToolTip(q_("Next lens"));
prevCcdButton = new StelButton(ccdControls, prevCcdButton = new StelButton(ccdControls,
prevArrow, prevArrow,
prevArrowOff, prevArrowOff,
QPixmap()); QPixmap(),
"actionToggle_Oculars_Previous_CCD");
prevCcdButton->setToolTip(q_("Previous CCD frame")); prevCcdButton->setToolTip(q_("Previous CCD frame"));
nextCcdButton = new StelButton(ccdControls, nextCcdButton = new StelButton(ccdControls,
nextArrow, nextArrow,
nextArrowOff, nextArrowOff,
QPixmap()); QPixmap(),
"actionToggle_Oculars_Next_CCD");
nextCcdButton->setToolTip(q_("Next CCD frame")); nextCcdButton->setToolTip(q_("Next CCD frame"));
prevTelescopeButton = new StelButton(telescopeControls, prevTelescopeButton = new StelButton(telescopeControls,
prevArrow, prevArrow,
prevArrowOff, prevArrowOff,
QPixmap()); QPixmap(),
"actionToggle_Oculars_Previous_
Telescope");
prevTelescopeButton->setToolTip(q_("Previous telescope")); prevTelescopeButton->setToolTip(q_("Previous telescope"));
nextTelescopeButton = new StelButton(telescopeControls, nextTelescopeButton = new StelButton(telescopeControls,
nextArrow, nextArrow,
nextArrowOff, nextArrowOff,
QPixmap()); QPixmap(),
"actionToggle_Oculars_Next_Tele
scope");
nextTelescopeButton->setToolTip(q_("Next telescope")); nextTelescopeButton->setToolTip(q_("Next telescope"));
connect(nextOcularButton, SIGNAL(triggered()), connect(nextOcularButton, SIGNAL(triggered()),
ocularsPlugin, SLOT(incrementOcularIndex())); ocularsPlugin, SLOT(incrementOcularIndex()));
connect(nextCcdButton, SIGNAL(triggered()), connect(nextCcdButton, SIGNAL(triggered()),
ocularsPlugin, SLOT(incrementCCDIndex())); ocularsPlugin, SLOT(incrementCCDIndex()));
connect(nextTelescopeButton, SIGNAL(triggered()), connect(nextTelescopeButton, SIGNAL(triggered()),
ocularsPlugin, SLOT(incrementTelescopeIndex())); ocularsPlugin, SLOT(incrementTelescopeIndex()));
connect(prevOcularButton, SIGNAL(triggered()), connect(prevOcularButton, SIGNAL(triggered()),
ocularsPlugin, SLOT(decrementOcularIndex())); ocularsPlugin, SLOT(decrementOcularIndex()));
skipping to change at line 245 skipping to change at line 272
QColor cHover(162, 162, 162); QColor cHover(162, 162, 162);
QString degrees = QString("-15%1").arg(QChar(0x00B0)); QString degrees = QString("-15%1").arg(QChar(0x00B0));
int degreesW = fm.width(degrees); int degreesW = fm.width(degrees);
QPixmap pOn = createPixmapFromText(degrees, degreesW, lineHeight, ne wFont, cOn); QPixmap pOn = createPixmapFromText(degrees, degreesW, lineHeight, ne wFont, cOn);
QPixmap pOff = createPixmapFromText(degrees, degreesW, lineHeight, n ewFont, cOff); QPixmap pOff = createPixmapFromText(degrees, degreesW, lineHeight, n ewFont, cOff);
QPixmap pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover); QPixmap pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
rotateCcdMinus15Button = new StelButton(ccdControls, rotateCcdMinus15Button = new StelButton(ccdControls,
pOn, pOn,
pOff, pOff,
pHover, pHover,
NULL, "actionToggle_Oculars_Rotate _Frame_15_Counterclockwise",
true); true);
rotateCcdMinus15Button->setToolTip(q_("Rotate the sensor frame 15 de grees counterclockwise")); rotateCcdMinus15Button->setToolTip(q_("Rotate the sensor frame 15 de grees counterclockwise"));
degrees = QString("-5%1").arg(QChar(0x00B0)); degrees = QString("-5%1").arg(QChar(0x00B0));
degreesW = fm.width(degrees); degreesW = fm.width(degrees);
pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, c On); pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, c On);
pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff); pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont , cHover); pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont , cHover);
rotateCcdMinus5Button = new StelButton(ccdControls, rotateCcdMinus5Button = new StelButton(ccdControls,
pOn, pOn,
pOff, pOff,
pHover, pHover,
NULL, "actionToggle_Oculars_Rotate_ Frame_5_Counterclockwise",
true); true);
rotateCcdMinus5Button->setToolTip(q_("Rotate the sensor frame 5 degr ees counterclockwise")); rotateCcdMinus5Button->setToolTip(q_("Rotate the sensor frame 5 degr ees counterclockwise"));
degrees = QString("-1%1").arg(QChar(0x00B0)); degrees = QString("-1%1").arg(QChar(0x00B0));
degreesW = fm.width(degrees); degreesW = fm.width(degrees);
pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, c On); pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, c On);
pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff); pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont , cHover); pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont , cHover);
rotateCcdMinus1Button = new StelButton(ccdControls, rotateCcdMinus1Button = new StelButton(ccdControls,
pOn, pOn,
pOff, pOff,
pHover, pHover,
NULL, "actionToggle_Oculars_Rotate_ Frame_1_Counterclockwise",
true); true);
rotateCcdMinus1Button->setToolTip(q_("Rotate the sensor frame 1 degr ee counterclockwise")); rotateCcdMinus1Button->setToolTip(q_("Rotate the sensor frame 1 degr ee counterclockwise"));
degrees = QString("0%1").arg(QChar(0x00B0)); degrees = QString("0%1").arg(QChar(0x00B0));
degreesW = fm.width(degrees); degreesW = fm.width(degrees);
pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, c On); pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, c On);
pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff); pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont , cHover); pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont , cHover);
resetCcdRotationButton = new StelButton(ccdControls, resetCcdRotationButton = new StelButton(ccdControls,
pOn, pOn,
pOff, pOff,
pHover, pHover,
NULL, "actionToggle_Oculars_Rotate _Frame_Reset",
true); true);
resetCcdRotationButton->setToolTip(q_("Reset the sensor frame rotati on")); resetCcdRotationButton->setToolTip(q_("Reset the sensor frame rotati on"));
degrees = QString("+1%1").arg(QChar(0x00B0)); degrees = QString("+1%1").arg(QChar(0x00B0));
degreesW = fm.width(degrees); degreesW = fm.width(degrees);
pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, c On); pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, c On);
pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff); pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont , cHover); pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont , cHover);
rotateCcdPlus1Button = new StelButton(ccdControls, rotateCcdPlus1Button = new StelButton(ccdControls,
pOn, pOn,
pOff, pOff,
pHover, pHover,
NULL, "actionToggle_Oculars_Rotate_F rame_1_Clockwise",
true); true);
rotateCcdPlus1Button->setToolTip(q_("Rotate the sensor frame 1 degre e clockwise")); rotateCcdPlus1Button->setToolTip(q_("Rotate the sensor frame 1 degre e clockwise"));
degrees = QString("+5%1").arg(QChar(0x00B0)); degrees = QString("+5%1").arg(QChar(0x00B0));
degreesW = fm.width(degrees); degreesW = fm.width(degrees);
pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, c On); pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, c On);
pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff); pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont , cHover); pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont , cHover);
rotateCcdPlus5Button = new StelButton(ccdControls, rotateCcdPlus5Button = new StelButton(ccdControls,
pOn, pOn,
pOff, pOff,
pHover, pHover,
NULL, "actionToggle_Oculars_Rotate_F rame_5_Clockwise",
true); true);
rotateCcdPlus5Button->setToolTip(q_("Rotate the sensor frame 5 degre es clockwise")); rotateCcdPlus5Button->setToolTip(q_("Rotate the sensor frame 5 degre es clockwise"));
degrees = QString("+15%1").arg(QChar(0x00B0)); degrees = QString("+15%1").arg(QChar(0x00B0));
degreesW = fm.width(degrees); degreesW = fm.width(degrees);
pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, c On); pOn = createPixmapFromText(degrees, degreesW, lineHeight, newFont, c On);
pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff); pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont , cHover); pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont , cHover);
rotateCcdPlus15Button = new StelButton(ccdControls, rotateCcdPlus15Button = new StelButton(ccdControls,
pOn, pOn,
pOff, pOff,
pHover, pHover,
NULL, "actionToggle_Oculars_Rotate_ Frame_15_Clockwise",
true); true);
rotateCcdPlus15Button->setToolTip(q_("Rotate the sensor frame 15 deg rees clockwise")); rotateCcdPlus15Button->setToolTip(q_("Rotate the sensor frame 15 deg rees clockwise"));
QSignalMapper* sm = ocularsPlugin->ccdRotationSignalMapper; QSignalMapper* sm = ocularsPlugin->ccdRotationSignalMapper;
sm->setMapping(rotateCcdMinus15Button, QString("-15")); sm->setMapping(rotateCcdMinus15Button, QString("-15"));
sm->setMapping(rotateCcdMinus5Button, QString("-5")); sm->setMapping(rotateCcdMinus5Button, QString("-5"));
sm->setMapping(rotateCcdMinus1Button, QString("-1")); sm->setMapping(rotateCcdMinus1Button, QString("-1"));
sm->setMapping(rotateCcdPlus1Button, QString("1")); sm->setMapping(rotateCcdPlus1Button, QString("1"));
sm->setMapping(rotateCcdPlus5Button, QString("5")); sm->setMapping(rotateCcdPlus5Button, QString("5"));
sm->setMapping(rotateCcdPlus15Button, QString("15")); sm->setMapping(rotateCcdPlus15Button, QString("15"));
skipping to change at line 561 skipping to change at line 588
void OcularsGuiPanel::updateLensControls() void OcularsGuiPanel::updateLensControls()
{ {
Lens* lens = ocularsPlugin->selectedLens(); Lens* lens = ocularsPlugin->selectedLens();
int index = ocularsPlugin->selectedLensIndex; int index = ocularsPlugin->selectedLensIndex;
QString fullName; QString fullName;
QString multiplerString; QString multiplerString;
if (lens != NULL) if (lens != NULL)
{ {
QString name = lens->name(); QString name = lens->getName();
if (name.isEmpty()) if (name.isEmpty())
{ {
fullName = QString(q_("Lens #%1")).arg(index); fullName = QString(q_("Lens #%1")).arg(index);
} }
else else
{ {
fullName = QString(q_("Lens #%1: %2")).arg(index).ar g(name); fullName = QString(q_("Lens #%1: %2")).arg(index).ar g(name);
} }
multiplerString = QString(q_("Multiplicity: %1")).arg(lens-> multipler()); multiplerString = QString(q_("Multiplicity: %1")).arg(lens-> getMultipler());
multiplerString.append(QChar(0x00D7)); multiplerString.append(QChar(0x00D7));
} }
else else
{ {
fullName = QString(q_("Lens: None")); fullName = QString(q_("Lens: None"));
multiplerString = QString(q_("Multiplicity: N/A")); multiplerString = QString(q_("Multiplicity: N/A"));
} }
fieldLensName->setPlainText(fullName); fieldLensName->setPlainText(fullName);
fieldLensMultipler->setPlainText(multiplerString); fieldLensMultipler->setPlainText(multiplerString);
fieldOcularFl->setToolTip(q_("Focal length of eyepiece")); fieldOcularFl->setToolTip(q_("Focal length of eyepiece"));
skipping to change at line 611 skipping to change at line 638
widgetWidth += nextLensButton->boundingRect().width(); widgetWidth += nextLensButton->boundingRect().width();
posX = prevLensButton->boundingRect().width(); posX = prevLensButton->boundingRect().width();
posY += fieldLensName->boundingRect().height(); posY += fieldLensName->boundingRect().height();
fieldLensMultipler->setPos(posX, posY); fieldLensMultipler->setPos(posX, posY);
widgetHeight += fieldLensMultipler->boundingRect().height(); widgetHeight += fieldLensMultipler->boundingRect().height();
lensControls->setMinimumSize(widgetWidth, widgetHeight); lensControls->setMinimumSize(widgetWidth, widgetHeight);
lensControls->resize(widgetWidth, widgetHeight); lensControls->resize(widgetWidth, widgetHeight);
setLensControlsVisible(true); int oindex = ocularsPlugin->selectedOcularIndex;
Ocular* ocular = ocularsPlugin->oculars[oindex];
if (ocular->isBinoculars())
setLensControlsVisible(false);
else
setLensControlsVisible(true);
} }
void OcularsGuiPanel::updateCcdControls() void OcularsGuiPanel::updateCcdControls()
{ {
setOcularControlsVisible(false); setOcularControlsVisible(false);
//Get the name //Get the name
int index = ocularsPlugin->selectedCCDIndex; int index = ocularsPlugin->selectedCCDIndex;
CCD* ccd = ocularsPlugin->ccds[index]; CCD* ccd = ocularsPlugin->ccds[index];
Q_ASSERT(ccd); Q_ASSERT(ccd);
skipping to change at line 781 skipping to change at line 813
//We need the current ocular //We need the current ocular
int index = ocularsPlugin->selectedOcularIndex; int index = ocularsPlugin->selectedOcularIndex;
Ocular* ocular = ocularsPlugin->oculars[index]; Ocular* ocular = ocularsPlugin->oculars[index];
Q_ASSERT(ocular); Q_ASSERT(ocular);
if (ocular->isBinoculars()) if (ocular->isBinoculars())
{ {
prevTelescopeButton->setVisible(false); prevTelescopeButton->setVisible(false);
nextTelescopeButton->setVisible(false); nextTelescopeButton->setVisible(false);
fieldTelescopeName->setVisible(false); fieldTelescopeName->setVisible(false);
fieldExitPupil->setVisible(false);
posY = 0.; posY = 0.;
widgetHeight = 0.; widgetHeight = 0.;
fieldMagnification->setToolTip(q_("Magnification pro vided by these binoculars")); fieldMagnification->setToolTip(q_("Magnification pro vided by these binoculars"));
fieldFov->setToolTip(q_("Actual field of view provid ed by these binoculars")); fieldFov->setToolTip(q_("Actual field of view provid ed by these binoculars"));
fieldExitPupil->setToolTip(q_("Exit pupil provided b y these binoculars")); fieldExitPupil->setToolTip(q_("Exit pupil provided b y these binoculars"));
} }
else else
{ {
prevTelescopeButton->setVisible(true); prevTelescopeButton->setVisible(true);
skipping to change at line 813 skipping to change at line 846
QString magnificationLabel = QString(q_("Magnification: %1") ).arg(magnificationString); QString magnificationLabel = QString(q_("Magnification: %1") ).arg(magnificationString);
fieldMagnification->setPlainText(magnificationLabel); fieldMagnification->setPlainText(magnificationLabel);
fieldMagnification->setPos(posX, posY); fieldMagnification->setPos(posX, posY);
posY += fieldMagnification->boundingRect().height(); posY += fieldMagnification->boundingRect().height();
widgetHeight += fieldMagnification->boundingRect().height(); widgetHeight += fieldMagnification->boundingRect().height();
double mag = ocular->magnification(telescope, lens); double mag = ocular->magnification(telescope, lens);
if (mag>0) if (mag>0)
{ {
double exitPupil = telescope->diameter()/mag; double exitPupil = telescope->diameter()/mag;
if (ocular->isBinoculars())
exitPupil = ocular->fieldStop()/mag;
QString exitPupilLabel = QString(q_("Exit pupil: %1 mm")).arg(QString::number(exitPupil, 'f', 2)); QString exitPupilLabel = QString(q_("Exit pupil: %1 mm")).arg(QString::number(exitPupil, 'f', 2));
fieldExitPupil->setPlainText(exitPupilLabel); fieldExitPupil->setPlainText(exitPupilLabel);
fieldExitPupil->setPos(posX, posY); fieldExitPupil->setPos(posX, posY);
posY += fieldExitPupil->boundingRect().height(); posY += fieldExitPupil->boundingRect().height();
widgetHeight += fieldExitPupil->boundingRect().heigh t(); widgetHeight += fieldExitPupil->boundingRect().heigh t();
} }
double fov = ((int)(ocular->actualFOV(telescope, lens) * 100 00.00)) / 10000.0; double fov = ((int)(ocular->actualFOV(telescope, lens) * 100 00.00)) / 10000.0;
QString fovString = QString::number(fov) + QChar(0x00B0); QString fovString = QString::number(fov) + QChar(0x00B0);
QString fovLabel = QString(q_("FOV: %1")).arg(fovString); QString fovLabel = QString(q_("FOV: %1")).arg(fovString);
 End of changes. 21 change blocks. 
18 lines changed or deleted 83 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/