[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/kstars/kstars
From:       Jason Harris <kstars () 30doradus ! org>
Date:       2005-05-19 3:40:44
Message-ID: 1116474044.722984.5290.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 415627 by harris:

Adding member QPixmap* Skymap::sky2, which is used for drawing the 
dynamic overlays on top of the skymap.   I previously was creating and 
destroying this object on every update(), so this should be more 
efficient.



 M  +5 -1      trunk/KDE/kdeedu/kstars/kstars/skymap.cpp  
 M  +1 -1      trunk/KDE/kdeedu/kstars/kstars/skymap.h  
 M  +3 -4      trunk/KDE/kdeedu/kstars/kstars/skymapevents.cpp  


--- trunk/KDE/kdeedu/kstars/kstars/skymap.cpp #415626:415627
@@ -52,7 +52,7 @@
 
 SkyMap::SkyMap(KStarsData *d, QWidget *parent, const char *name )
 	: QWidget (parent,name), computeSkymap(true), angularDistanceMode(false),
-		ksw(0), data(d), pmenu(0), sky(0), IBoxes(0), 
+		ksw(0), data(d), pmenu(0), sky(0), sky2(0), IBoxes(0), 
 		ClickedObject(0), FocusObject(0), TransientObject(0),
 		starpix(0), pts(0), sp(0)
 {
@@ -85,6 +85,7 @@
 	FocusObject = NULL;
 
 	sky = new QPixmap();
+	sky2 = new QPixmap();
 	pmenu = new KSPopupMenu( ksw );
 	
 	//Initialize Transient label stuff
@@ -133,6 +134,7 @@
 	delete pts;
 	delete sp;
 	delete sky;
+	delete sky2;
 	delete pmenu;
 	delete IBoxes;
 
@@ -155,11 +157,13 @@
 void SkyMap::setGeometry( int x, int y, int w, int h ) {
 	QWidget::setGeometry( x, y, w, h );
 	sky->resize( w, h );
+	sky2->resize( w, h );
 }
 
 void SkyMap::setGeometry( const QRect &r ) {
 	QWidget::setGeometry( r );
 	sky->resize( r.width(), r.height() );
+	sky2->resize( r.width(), r.height() );
 }
 
 
--- trunk/KDE/kdeedu/kstars/kstars/skymap.h #415626:415627
@@ -939,7 +939,7 @@
 	KStars *ksw;
 	KStarsData *data;
 	KSPopupMenu *pmenu;
-	QPixmap *sky;
+	QPixmap *sky, *sky2;
 	InfoBoxes  *IBoxes;
 	SkyPoint  Focus, OldFocus, ClickedPoint, FocusPoint, MousePoint, Destination, PreviousClickedPoint;
 	SkyObject *ClickedObject, *FocusObject, *TransientObject;
--- trunk/KDE/kdeedu/kstars/kstars/skymapevents.cpp #415626:415627
@@ -49,6 +49,7 @@
 		infoBoxes()->resize( width(), height() );
 	}
 	sky->resize( width(), height() );
+	sky2->resize( width(), height() );
 }
 
 void SkyMap::keyPressEvent( QKeyEvent *e ) {
@@ -726,10 +727,9 @@
 	//of the skymap, use forceUpdate().
 	if (!computeSkymap)
 	{
-		QPixmap *sky2 = new QPixmap( *sky );
+		*sky2 = *sky;
 		drawOverlays( sky2 );
 		bitBlt( this, 0, 0, sky2 );
-		delete sky2;
 		return ; // exit because the pixmap is repainted and that's all what we want
 	}
 
@@ -773,10 +773,9 @@
 	//Finish up
 	psky.end();
 
-	QPixmap *sky2 = new QPixmap( *sky );
+	*sky2 = *sky;
 	drawOverlays( sky2 );
 	bitBlt( this, 0, 0, sky2 );
-	delete sky2;
 
 	computeSkymap = false;	// use forceUpdate() to compute new skymap else old pixmap will be shown
 }
[prev in list] [next in list] [prev in thread] [next in thread]