From kde-commits  Sat May 07 19:46:19 2011
From: Khudyakov Alexey <alexey.skladnoy () gmail ! com>
Date: Sat, 07 May 2011 19:46:19 +0000
To: kde-commits
Subject: =?utf-8?q?=5Bkstars/4=2E6=5D_kstars=3A_Factor_out_code_for_FPS_c?=
Message-Id: <20110507194619.EDF3BA60BB () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=130479763831460

Git commit 2c6268850813a1de913feef7ae070e0e319cd230 by Khudyakov Alexey.
Committed on 14/04/2011 at 18:03.
Pushed by khudyakov into branch '4.6'.

Factor out code for FPS calculation into SkyMapDrawAbstract class
and comment out actual printing to stderr.

It's somewhat pointless to calculate FPS and then throw it away
but it could be useful for debugging.

BUG: 270779

M  +10   -2    kstars/skymapdrawabstract.cpp     
M  +3    -1    kstars/skymapdrawabstract.h     
M  +1    -10   kstars/skymapgldraw.cpp     
M  +1    -8    kstars/skymapqdraw.cpp     

http://commits.kde.org/kstars/2c6268850813a1de913feef7ae070e0e319cd230

diff --git a/kstars/skymapdrawabstract.cpp b/kstars/skymapdrawabstract.cpp
index 73a7d92..a7f5b77 100644
--- a/kstars/skymapdrawabstract.cpp
+++ b/kstars/skymapdrawabstract.cpp
@@ -327,5 +327,13 @@ void SkyMapDrawAbstract::exportSkyImage( QPaintDevice *pd ) {
     p.end();
 }
 
-
-
+void SkyMapDrawAbstract::calculateFPS()
+{
+    if(m_framecount == 25) {
+        float sec = m_fpstime.elapsed()/1000.;
+        kDebug() << "FPS " << m_framecount/sec;
+        m_framecount = 0;
+        m_fpstime.restart();
+    }
+    ++m_framecount;
+}
diff --git a/kstars/skymapdrawabstract.h b/kstars/skymapdrawabstract.h
index 90258f1..76a1b3f 100644
--- a/kstars/skymapdrawabstract.h
+++ b/kstars/skymapdrawabstract.h
@@ -131,9 +131,11 @@ class SkyMapDrawAbstract {
     KStarsData *m_KStarsData;
     SkyMap *m_SkyMap;
 
+    /** Calculate FPS and dump result to stderr using kDebug */
+    void calculateFPS();
+private:
     int m_framecount;     // To count FPS
     QTime m_fpstime;
-
 };
 
 #endif
diff --git a/kstars/skymapgldraw.cpp b/kstars/skymapgldraw.cpp
index d4d03e4..c9e7834 100644
--- a/kstars/skymapgldraw.cpp
+++ b/kstars/skymapgldraw.cpp
@@ -44,15 +44,8 @@ void SkyMapGLDraw::paintEvent( QPaintEvent *event )
     QPainter p;
     p.begin(this);
     p.beginNativePainting();
-
+    calculateFPS();
     m_SkyMap->setupProjector();
-    if(m_framecount == 25) {
-        float sec = m_fpstime.elapsed()/1000.;
-        printf("FPS: %.2f\n", m_framecount/sec);
-        m_framecount = 0;
-        m_fpstime.restart();
-    }
-
     makeCurrent();
 
     SkyGLPainter psky( this );
@@ -68,6 +61,4 @@ void SkyMapGLDraw::paintEvent( QPaintEvent *event )
     p.endNativePainting();
     drawOverlays(p);
     p.end();
-
-    ++m_framecount;
 }
diff --git a/kstars/skymapqdraw.cpp b/kstars/skymapqdraw.cpp
index ccf2878..44726ed 100644
--- a/kstars/skymapqdraw.cpp
+++ b/kstars/skymapqdraw.cpp
@@ -34,14 +34,7 @@ void SkyMapQDraw::paintEvent( QPaintEvent *event ) {
     //use update() to trigger this "short" paint event; to force a full "recompute"
     //of the skymap, use forceUpdate().
 
-    if(m_framecount == 25) {
-        float sec = m_fpstime.elapsed()/1000.;
-        printf("FPS: %.2f\n", m_framecount/sec);
-        m_framecount = 0;
-        m_fpstime.restart();
-    }
-
-    ++m_framecount;
+    calculateFPS();
     if (!m_SkyMap->computeSkymap)
         {
             QPainter p;