Commit 0d90558b authored by Jasem Mutlaq's avatar Jasem Mutlaq

BUG:326647 REVIEW:113438

Merge branch 'KDE/4.11' into KDE/4.12
parents 42e39289 daea47ed
......@@ -206,9 +206,15 @@ void DetailDialog::createGeneralTab()
Data->Illumination->setText( QString("%1 %").arg( KGlobal::locale()->formatNumber( ((KSMoon *)selectedObject)->illum()*100., 0 ) ) );
}
Data->Magnitude->setText( i18nc( "number in magnitudes", "%1 mag" ,
KGlobal::locale()->formatNumber( ps->mag(), 1 ) ) ); //show to tenths place
if(selectedObject->type() == SkyObject::COMET){
Data->Magnitude->setText( i18nc( "number in magnitudes", "%1 mag" ,
KGlobal::locale()->formatNumber( ((KSComet *)selectedObject)->getTotalMagnitudeParameter(), 1 ) ) ); //show to tenths place
}
else{
Data->Magnitude->setText( i18nc( "number in magnitudes", "%1 mag" ,
KGlobal::locale()->formatNumber( ps->mag(), 1 ) ) ); //show to tenths place
}
//Distance from Earth. The moon requires a unit conversion
if ( ps->name() == "Moon" ) {
Data->Distance->setText( i18nc("distance in kilometers", "%1 km",
......
......@@ -190,7 +190,7 @@ void CometsComponent::draw( SkyPainter *skyp )
foreach ( SkyObject *so, m_ObjectList ) {
KSComet *com = (KSComet*)so;
bool drawn = skyp->drawPointSource(com,com->mag());
bool drawn = skyp->drawPointSource(com,com->getTotalMagnitudeParameter());
if ( drawn && !(hideLabels || com->rsun() >= rsunLabelLimit) )
SkyLabeler::AddLabel( com, SkyLabeler::COMET_LABEL );
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment