OcularsGuiPanel.cpp   OcularsGuiPanel.cpp 
skipping to change at line 604 skipping to change at line 604
fieldLensMultipler->setPlainText(multiplerString); fieldLensMultipler->setPlainText(multiplerString);
fieldOcularFl->setToolTip(q_("Focal length of eyepiece")); fieldOcularFl->setToolTip(q_("Focal length of eyepiece"));
qreal posX = 0.; qreal posX = 0.;
qreal posY = 0.; qreal posY = 0.;
qreal widgetWidth = 0.; qreal widgetWidth = 0.;
qreal widgetHeight = 0.; qreal widgetHeight = 0.;
//Prev button //Prev button
qreal heightAdjustment = (fieldLensName->boundingRect().height() - p revLensButton->boundingRect().height()) / 2.; qreal heightAdjustment = (fieldLensName->boundingRect().height() - p revLensButton->boundingRect().height()) / 2.;
prevLensButton->setPos(posX, qRound(posY + heightAdjustment)); prevLensButton->setPos(posX, qRound(posY + heightAdjustment));
posX += prevLensButton->boundingRect().width(); posX += prevLensButton->boundingRect().width();
widgetWidth += prevLensButton->boundingRect().width(); widgetWidth += prevLensButton->boundingRect().width();
//Name field //Name field
fieldLensName->setPos(posX, posY); fieldLensName->setPos(posX, posY);
posX += fieldLensName->boundingRect().width(); posX += fieldLensName->boundingRect().width();
widgetWidth += fieldLensName->boundingRect().width(); widgetWidth += fieldLensName->boundingRect().width();
widgetHeight += fieldLensName->boundingRect().height(); widgetHeight += fieldLensName->boundingRect().height();
//Next button //Next button
skipping to change at line 686 skipping to change at line 686
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, lens) * 1000.0)) / 1000.0; double fovX = ((int)(ccd->getActualFOVx(telescope, lens) * 1000.0)) / 1000.0;
double fovY = ((int)(ccd->getActualFOVy(telescope, lens) * 1000.0)) / 1000.0; double fovY = ((int)(ccd->getActualFOVy(telescope, lens) * 1000.0)) / 1000.0;
QString dimensionsLabel = QString(q_("Dimensions: %1")).arg(ocularsP lugin->getDimensionsString(fovX, fovY)); QString dimensionsLabel = QString(q_("Dimensions: %1")).arg(ocularsP lugin->getDimensionsString(fovX, fovY));
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()
QString rotation = QString::number(ocularsPlugin->ccdRotationAngle, , 'f', 0);
'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);
posY += fieldCcdRotation->boundingRect().height(); posY += fieldCcdRotation->boundingRect().height();
widgetHeight += fieldCcdRotation->boundingRect().height(); widgetHeight += fieldCcdRotation->boundingRect().height();
int rotationButtonsWidth = rotateCcdMinus15Button->boundingRect().wi dth(); int rotationButtonsWidth = rotateCcdMinus15Button->boundingRect().wi dth();
rotationButtonsWidth += rotateCcdMinus5Button->boundingRect().width( ); rotationButtonsWidth += rotateCcdMinus5Button->boundingRect().width( );
rotationButtonsWidth += rotateCcdMinus1Button->boundingRect().width( ); rotationButtonsWidth += rotateCcdMinus1Button->boundingRect().width( );
 End of changes. 2 change blocks. 
4 lines changed or deleted 3 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/