[Kstars-devel] KDE/kdeedu/kstars/kstars

[Jason Harris]

SVN commit 502171 by harris:

Fix huge planet size
Fix error message about "cyan4" being an unknown color name
Fix Antialiasing!!  It works now! :)))

CCMAIL: kstars-devel at kde.org


 M  +2 -2      ksplanetbase.cpp  
 M  +2 -2      skycomponents/cometscomponent.cpp  
 M  +3 -0      skycomponents/solarsystemsinglecomponent.cpp  
 M  +1 -1      skymapdraw.cpp  
 M  +1 -1      skymapevents.cpp  


--- trunk/KDE/kdeedu/kstars/kstars/ksplanetbase.cpp #502170:502171
@@ -188,11 +188,11 @@
 	Image = Image0.transformed( m );
 }
 
-void KSPlanetBase::scaleRotateImage( float scale, double imAngle ) {
+void KSPlanetBase::scaleRotateImage( float size, double imAngle ) {
 	ImageAngle = imAngle;
 	QMatrix m;
 	m.rotate( ImageAngle );
-	Image = Image0.transformed( m ).scaledToWidth( int(scale*Image.width()) );
+	Image = Image0.transformed( m ).scaledToWidth( int(size) );
 }
 
 void KSPlanetBase::findMagnitude(const KSNumbers *num) {
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/cometscomponent.cpp #502170:502171
@@ -89,8 +89,8 @@
 
 		if ( map->checkVisibility( com ) )
 		{
-			psky.setPen( QPen( QColor( "cyan4" ) ) );
-			psky.setBrush( QBrush( QColor( "cyan4" ) ) );
+			psky.setPen( QPen( QColor( "darkcyan" ) ) );
+			psky.setBrush( QBrush( QColor( "darkcyan" ) ) );
 			QPointF o = map->getXY( com, Options::useAltAz(), Options::useRefraction(), scale );
 
 			if ( ( o.x() >= 0. && o.x() <= Width && o.y() >= 0. && o.y() <= Height ) )
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/solarsystemsinglecomponent.cpp #502170:502171
@@ -135,6 +135,9 @@
 				spa = fabs(spa);
 				size = size * (cpa + spa);
 
+				//DEBUG
+				kdDebug() << "size of " << ksp()->name() << " : " << size << endl;
+
 				//Because Saturn has rings, we inflate its image size by a factor 2.5
 				if ( ksp()->name() == "Saturn" ) size = int(2.5*size);
 
--- trunk/KDE/kdeedu/kstars/kstars/skymapdraw.cpp #502170:502171
@@ -50,8 +50,8 @@
 void SkyMap::drawOverlays( QPixmap *pm ) {
 	if ( ksw ) { //only if we are drawing in the GUI window
 		QPainter p;
+		p.begin( pm );
 		p.setRenderHint(QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform, true);
-		p.begin( pm );
 
 		showFocusCoords( true );
 		drawBoxes( p );
--- trunk/KDE/kdeedu/kstars/kstars/skymapevents.cpp #502170:502171
@@ -763,8 +763,8 @@
 // 	bool drawCBounds( Options::showCBounds() &&!(checkSlewing && Options::hideCBounds() ) );
 // 	bool drawGrid( Options::showGrid() && !(checkSlewing && Options::hideGrid() ) );
 
+	psky.begin( sky );
 	psky.setRenderHint(QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform, true);
-	psky.begin( sky );
 	psky.fillRect( 0, 0, width(), height(), QBrush( data->colorScheme()->colorNamed( "SkyColor" ) ) );
 
 	//DEBUG