Oculars.cpp   Oculars.cpp 
skipping to change at line 1502 skipping to change at line 1502
QString magString = QString::number(magnification); QString magString = QString::number(magnification);
magString.append(QChar(0x00D7));//Multiplication sig n magString.append(QChar(0x00D7));//Multiplication sig n
QString magnificationLabel = QString(q_("Magnificati on: %1")) QString magnificationLabel = QString(q_("Magnificati on: %1"))
.arg(magString); .arg(magString);
painter.drawText(xPosition, yPosition, magnification Label); painter.drawText(xPosition, yPosition, magnification Label);
yPosition-=lineHeight; yPosition-=lineHeight;
double fov = ((int)(ocular->actualFOV(telescope) * 1 0000.00)) / 10000.0; double fov = ((int)(ocular->actualFOV(telescope) * 1 0000.00)) / 10000.0;
QString fovString = QString::number(fov); QString fovString = QString::number(fov);
fovString.append(QChar(0x00B0));//Degree sign fovString.append(QChar(0x00B0));//Degree sign
QString fovLabel = QString(q_("FOV: %1")).append(fov String); QString fovLabel = QString(q_("FOV: %1")).arg(fovStr ing);
painter.drawText(xPosition, yPosition, fovLabel); painter.drawText(xPosition, yPosition, fovLabel);
} }
} }
// The CCD // The CCD
if (flagShowCCD) { if (flagShowCCD) {
QString ccdSensorLabel, ccdInfoLabel; QString ccdSensorLabel, ccdInfoLabel;
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); QString stringFovX = QString::number(fovX);
skipping to change at line 1550 skipping to change at line 1550
telescopeNumberLabel = QString(q_("Telescope #%1")) telescopeNumberLabel = QString(q_("Telescope #%1"))
.arg(selectedTelescopeIndex); .arg(selectedTelescopeIndex);
} }
else else
{ {
telescopeNumberLabel = QString(q_("Telescope #%1: %2 ")) telescopeNumberLabel = QString(q_("Telescope #%1: %2 "))
.arg(selectedTelescopeIndex) .arg(selectedTelescopeIndex)
.arg(telescopeName); .arg(telescopeName);
} }
painter.drawText(xPosition, yPosition, telescopeNumberLabel) ; painter.drawText(xPosition, yPosition, telescopeNumberLabel) ;
yPosition-=lineHeight;
} }
} }
void Oculars::validateAndLoadIniFile() void Oculars::validateAndLoadIniFile()
{ {
// Insure the module directory exists // Insure the module directory exists
StelFileMgr::makeSureDirExistsAndIsWritable(StelFileMgr::getUserDir( )+"/modules/Oculars"); StelFileMgr::makeSureDirExistsAndIsWritable(StelFileMgr::getUserDir( )+"/modules/Oculars");
StelFileMgr::Flags flags = (StelFileMgr::Flags)(StelFileMgr::Directo ry|StelFileMgr::Writable); StelFileMgr::Flags flags = (StelFileMgr::Flags)(StelFileMgr::Directo ry|StelFileMgr::Writable);
QString ocularIniPath = StelFileMgr::findFile("modules/Oculars/", fl ags) + "ocular.ini"; QString ocularIniPath = StelFileMgr::findFile("modules/Oculars/", fl ags) + "ocular.ini";
 End of changes. 2 change blocks. 
2 lines changed or deleted 1 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/