OcularsGuiPanel.cpp   OcularsGuiPanel.cpp 
skipping to change at line 528 skipping to change at line 528
fieldOcularFl->setPlainText(focalLengthString); fieldOcularFl->setPlainText(focalLengthString);
fieldOcularFl->setToolTip(q_("Effective focal length of the ocular")); fieldOcularFl->setToolTip(q_("Effective focal length of the ocular"));
fieldOcularFl->setPos(posX, posY); fieldOcularFl->setPos(posX, posY);
posY += fieldOcularFl->boundingRect().height(); posY += fieldOcularFl->boundingRect().height();
widgetHeight += fieldOcularFl->boundingRect().height(); widgetHeight += fieldOcularFl->boundingRect().height();
double apparentFov = ocular->appearentFOV(); double apparentFov = ocular->appearentFOV();
QString apparentFovString = QString::number(apparentFov); QString apparentFovString = QString::number(apparentFov);
apparentFovString.append(QChar(0x00B0));// Degree sign apparentFovString.append(QChar(0x00B0));// Degree sign
QString apparentFovLabel = QString(q_("Ocular aFOV: %1")) QString apparentFovLabel = QString(q_("Ocular aFOV: %1"))
.arg(apparentFovString); .arg(apparentFovString);
fieldOcularAfov->setPlainText(apparentFovLabel); fieldOcularAfov->setPlainText(apparentFovLabel);
fieldOcularAfov->setToolTip(q_("Apparent field of view of th e ocular")); fieldOcularAfov->setToolTip(q_("Apparent field of view of th e ocular"));
fieldOcularAfov->setPos(posX, posY); fieldOcularAfov->setPos(posX, posY);
widgetHeight += fieldOcularAfov->boundingRect().height(); widgetHeight += fieldOcularAfov->boundingRect().height();
fieldOcularFl->setVisible(true); fieldOcularFl->setVisible(true);
fieldOcularAfov->setVisible(true); fieldOcularAfov->setVisible(true);
} }
ocularControls->setMinimumSize(widgetWidth, widgetHeight); ocularControls->setMinimumSize(widgetWidth, widgetHeight);
skipping to change at line 595 skipping to change at line 595
posX = prevCcdButton->boundingRect().width(); posX = prevCcdButton->boundingRect().width();
posY = fieldCcdName->boundingRect().height(); posY = fieldCcdName->boundingRect().height();
widgetHeight += fieldCcdName->boundingRect().height(); widgetHeight += fieldCcdName->boundingRect().height();
//We need the current telescope //We need the current telescope
index = ocularsPlugin->selectedTelescopeIndex; index = ocularsPlugin->selectedTelescopeIndex;
Telescope* telescope = ocularsPlugin->telescopes[index]; Telescope* telescope = ocularsPlugin->telescopes[index];
Q_ASSERT(telescope); Q_ASSERT(telescope);
double fovX = ((int)(ccd->getActualFOVx(telescope) * 1000.0)) / 1000 .0; double fovX = ((int)(ccd->getActualFOVx(telescope) * 1000.0)) / 1000 .0;
double fovY = ((int)(ccd->getActualFOVy(telescope) * 1000.0)) / 1000 .0; double fovY = ((int)(ccd->getActualFOVy(telescope) * 1000.0)) / 1000 .0;
QString stringFovX = QString::number(fovX) + QChar(0x00B0); QString dimensionsLabel = QString(q_("Dimensions: %1")).arg(ocularsP
QString stringFovY = QString::number(fovY) + QChar(0x00B0); lugin->getDimensionsString(fovX, fovY));
QString dimensions = stringFovX + QChar(0x00D7) + stringFovY;
QString dimensionsLabel = QString(q_("Dimensions: %1")).arg(dimensio
ns);
fieldCcdDimensions->setPlainText(dimensionsLabel); fieldCcdDimensions->setPlainText(dimensionsLabel);
fieldCcdDimensions->setPos(posX, posY); fieldCcdDimensions->setPos(posX, posY);
posY += fieldCcdDimensions->boundingRect().height(); posY += fieldCcdDimensions->boundingRect().height();
widgetHeight += fieldCcdDimensions->boundingRect().height(); widgetHeight += fieldCcdDimensions->boundingRect().height();
QString rotation = QString::number(ocularsPlugin->ccdRotationAngle, 'f', 2); QString rotation = QString::number(ocularsPlugin->ccdRotationAngle, 'f', 2);
rotation.append(QChar(0x00B0)); rotation.append(QChar(0x00B0));
QString rotationLabel = QString(q_("Rotation: %1")).arg(rotation); QString rotationLabel = QString(q_("Rotation: %1")).arg(rotation);
fieldCcdRotation->setPlainText(rotationLabel); fieldCcdRotation->setPlainText(rotationLabel);
fieldCcdRotation->setPos(posX, posY); fieldCcdRotation->setPos(posX, posY);
skipping to change at line 693 skipping to change at line 690
widgetHeight += fieldTelescopeName->boundingRect().height(); widgetHeight += fieldTelescopeName->boundingRect().height();
if (ocularsPlugin->flagShowCCD) if (ocularsPlugin->flagShowCCD)
{ {
int index = ocularsPlugin->selectedCCDIndex; int index = ocularsPlugin->selectedCCDIndex;
CCD* ccd = ocularsPlugin->ccds[index]; CCD* ccd = ocularsPlugin->ccds[index];
Q_ASSERT(ccd); Q_ASSERT(ccd);
double fovX = ((int)(ccd->getActualFOVx(telescope) * 1000.0) ) / 1000.0; double fovX = ((int)(ccd->getActualFOVx(telescope) * 1000.0) ) / 1000.0;
double fovY = ((int)(ccd->getActualFOVy(telescope) * 1000.0) ) / 1000.0; double fovY = ((int)(ccd->getActualFOVy(telescope) * 1000.0) ) / 1000.0;
QString stringFovX = QString::number(fovX) + QChar(0x00B0); QString dimensionsLabel = QString(q_("Dimensions: %1")).arg(
QString stringFovY = QString::number(fovY) + QChar(0x00B0); ocularsPlugin->getDimensionsString(fovX, fovY));
QString dimensions = stringFovX + QChar(0x00D7) + stringFovY
;
QString dimensionsLabel = QString(q_("Dimensions: %1")).arg(
dimensions);
fieldCcdDimensions->setPlainText(dimensionsLabel); fieldCcdDimensions->setPlainText(dimensionsLabel);
fieldMagnification->setVisible(false); fieldMagnification->setVisible(false);
fieldFov->setVisible(false); fieldFov->setVisible(false);
} }
else if (ocularsPlugin->flagShowOculars) else if (ocularsPlugin->flagShowOculars)
{ {
//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];
 End of changes. 3 change blocks. 
12 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/