OcularsGuiPanel.cpp   OcularsGuiPanel.cpp 
skipping to change at line 685 skipping to change at line 685
widgetWidth += fieldTelescopeName->boundingRect().height(); widgetWidth += fieldTelescopeName->boundingRect().height();
//Next button //Next button
nextTelescopeButton->setPos(posX, posY + heightAdjustment); nextTelescopeButton->setPos(posX, posY + heightAdjustment);
widgetWidth += nextTelescopeButton->boundingRect().width(); widgetWidth += nextTelescopeButton->boundingRect().width();
posX = prevTelescopeButton->boundingRect().width(); posX = prevTelescopeButton->boundingRect().width();
posY += fieldTelescopeName->boundingRect().height(); posY += fieldTelescopeName->boundingRect().height();
widgetHeight += fieldTelescopeName->boundingRect().height(); widgetHeight += fieldTelescopeName->boundingRect().height();
if (ocularsPlugin->flagShowOculars) if (ocularsPlugin->flagShowCCD)
{
int index = ocularsPlugin->selectedCCDIndex;
CCD* ccd = ocularsPlugin->ccds[index];
Q_ASSERT(ccd);
double fovX = ((int)(ccd->getActualFOVx(telescope) * 1000.0)
) / 1000.0;
double fovY = ((int)(ccd->getActualFOVy(telescope) * 1000.0)
) / 1000.0;
QString stringFovX = QString::number(fovX) + QChar(0x00B0);
QString stringFovY = QString::number(fovY) + QChar(0x00B0);
QString dimensions = stringFovX + QChar(0x00D7) + stringFovY
;
QString dimensionsLabel = QString(q_("Dimensions: %1")).arg(
dimensions);
fieldCcdDimensions->setPlainText(dimensionsLabel);
fieldMagnification->setVisible(false);
fieldFov->setVisible(false);
}
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];
Q_ASSERT(ocular); Q_ASSERT(ocular);
if (ocular->isBinoculars()) if (ocular->isBinoculars())
{ {
prevTelescopeButton->setVisible(false); prevTelescopeButton->setVisible(false);
nextTelescopeButton->setVisible(false); nextTelescopeButton->setVisible(false);
skipping to change at line 857 skipping to change at line 874
if (buttonCrosshairs->isVisible()) if (buttonCrosshairs->isVisible())
{ {
buttonCrosshairs->setPos(posX, posY); buttonCrosshairs->setPos(posX, posY);
posX += buttonCrosshairs->getButtonPixmapWidth() + spacing; posX += buttonCrosshairs->getButtonPixmapWidth() + spacing;
} }
buttonCcd->setPos(posX, posY); buttonCcd->setPos(posX, posY);
posX += buttonCcd->getButtonPixmapWidth() + spacing; posX += buttonCcd->getButtonPixmapWidth() + spacing;
buttonTelrad->setPos(posX, posY); buttonTelrad->setPos(posX, posY);
posX += buttonTelrad->getButtonPixmapWidth() + spacing; posX += buttonTelrad->getButtonPixmapWidth() + spacing;
buttonConfiguration->setPos(posX, posY); buttonConfiguration->setPos(posX, posY);
posX += buttonConfiguration->getButtonPixmapWidth() + spacing;
} }
void OcularsGuiPanel::setControlsColor(const QColor& color) void OcularsGuiPanel::setControlsColor(const QColor& color)
{ {
Q_ASSERT(fieldOcularName); Q_ASSERT(fieldOcularName);
Q_ASSERT(fieldOcularFl); Q_ASSERT(fieldOcularFl);
Q_ASSERT(fieldOcularAfov); Q_ASSERT(fieldOcularAfov);
Q_ASSERT(fieldCcdName); Q_ASSERT(fieldCcdName);
Q_ASSERT(fieldCcdDimensions); Q_ASSERT(fieldCcdDimensions);
Q_ASSERT(fieldCcdRotation); Q_ASSERT(fieldCcdRotation);
 End of changes. 2 change blocks. 
2 lines changed or deleted 22 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/