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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkstars=5D_kstars=3A_Factor_out_code_for_FPS_calcula?=
From:       Khudyakov Alexey <alexey.skladnoy () gmail ! com>
Date:       2011-04-14 16:14:55
Message-ID: 20110414161455.A7B85A60A9 () git ! kde ! org
[Download RAW message or body]

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

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/c354af67cc4e031b0151f23e49247522458c1605

diff --git a/kstars/skymapdrawabstract.cpp b/kstars/skymapdrawabstract.cpp
index 67d9dbc..bb99c73 100644
--- a/kstars/skymapdrawabstract.cpp
+++ b/kstars/skymapdrawabstract.cpp
@@ -328,5 +328,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 b496c63..c94a745 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 b3fab4e..d1cb04e 100644
--- a/kstars/skymapgldraw.cpp
+++ b/kstars/skymapgldraw.cpp
@@ -49,15 +49,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 );
@@ -73,6 +66,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;

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