Added some Efficiency Debugging stuff, and a more accurate FrameRate counter :)

Graphs/gGraphView.cpp

@@ -27,6 +27,11 @@ extern MainWindow *mainwin;
 #include "GL/glu.h"
 #endif
 
+#ifdef DEBUG_EFFICIENCY
+// Only works in 4.8
+#include <QElapsedTimer>
+#endif
+
 
 bool _graph_init=false;
 
@@ -2579,8 +2584,10 @@ void gGraphView::fadeIn(bool dir)
 
 void gGraphView::paintGL()
 {
-    QTime time;
+#ifdef DEBUG_EFFICIENCY
+    QElapsedTimer time;
     time.start();
+#endif
 
     if (redrawtimer->isActive()) {
         redrawtimer->stop();
@@ -2698,11 +2705,13 @@ void gGraphView::paintGL()
         }
     }
 
+#ifdef DEBUG_EFFICIENCY
     // Show FPS and draw time
     if (m_showsplitter && PROFILE.general->showDebug()) {
         QString ss;
-        int ela=time.elapsed();
+        qint64 ela=time.nsecsElapsed();
-        ss="Debug Mode "+QString::number(ela)+"ms ("+QString::number(1000.0/float(ela),'f',1)+"fps)";
+        double ms=double(ela)/1000000.0;
+        ss="Debug Mode "+QString::number(ms,'f',1)+"ms ("+QString::number(1000.0/float(ms),'f',1)+"fps)";
         int w,h;
         GetTextExtent(ss,w,h);
         QColor col=Qt::white;
@@ -2711,6 +2720,7 @@ void gGraphView::paintGL()
         AddTextQue(ss,width()+3,w/2,90,col,defaultfont);
         DrawTextQue();
     }
+#endif
 
     swapBuffers(); // Dump to screen.
 

SleepLib/common.h

@@ -4,6 +4,12 @@
 #include <QString>
 #include <QObject>
 
+#if QT_VERSION >= QT_VERSION_CHECK(4,8,0)
+
+#define DEBUG_EFFICIENCY 1
+
+#endif
+
 enum UnitSystem { US_Undefined, US_Metric, US_Archiac };
 
 typedef float EventDataType;

SleepLib/loader_plugins/resmed_loader.cpp

@@ -21,6 +21,10 @@ License: GPL
 #include "SleepLib/session.h"
 #include "SleepLib/calcs.h"
 
+#ifdef DEBUG_EFFICIENCY
+#include <QElapsedTimer>  // only available in 4.8
+#endif
+
 extern QProgressBar *qprogress;
 QHash<int,QString> RMS9ModelMap;
 QHash<ChannelID, QVector<QString> > resmed_codes;
@@ -1150,7 +1154,24 @@ int ResmedLoader::Open(QString & path,Profile *profile)
             m->AddSession(sess,profile);
         }
     }
-
+#ifdef DEBUG_EFFICIENCY
+    {
+        qint64 totalbytes=0;
+        qint64 totalns=0;
+    qDebug() << "Time Delta Efficiency Information";
+    for (QHash<ChannelID,qint64>::iterator it=channel_efficiency.begin();it!=channel_efficiency.end();it++) {
+        ChannelID code=it.key();
+        qint64 value=it.value();
+        qint64 ns=channel_time[code];
+        totalbytes+=value;
+        totalns+=ns;
+        double secs=double(ns)/1000000000.0L;
+        QString s=value < 0 ? "saved" : "cost";
+        qDebug() << "Time-Delta conversion for "+schema::channel[code].label()+" "+s+" "+QString::number(qAbs(value))+" bytes and took "+QString::number(secs,'f',4)+"s";
+    }
+    qDebug() << "Total toTimeDelta function usage:" << totalbytes << "in" << double(totalns)/1000000000.0 << "seconds";
+    }
+#endif
 
     if (m) {
         m->Save();
@@ -1310,13 +1331,15 @@ bool ResmedLoader::LoadBRP(Session *sess,EDFParser &edf)
         a->AddWaveform(edf.startdate,es.data,recs,duration);
         sess->setMin(code,a->Min());
         sess->setMax(code,a->Max());
-        //delete edf.edfsignals[s]->data;
-        //edf.edfsignals[s]->data=NULL; // so it doesn't get deleted when edf gets trashed.
     }
     return true;
 }
 EventList * ResmedLoader::ToTimeDelta(Session *sess,EDFParser &edf, EDFSignal & es, ChannelID code, long recs, qint64 duration,EventDataType min,EventDataType max,bool square)
 {
+#ifdef DEBUG_EFFICIENCY
+    QElapsedTimer time;
+    time.start();
+#endif
     bool first=true;
     double rate=(duration/recs); // milliseconds per record
     double tt=edf.startdate;
@@ -1348,6 +1371,23 @@ EventList * ResmedLoader::ToTimeDelta(Session *sess,EDFParser &edf, EDFSignal &
     }
     el->AddEvent(tt,c);
     sess->updateLast(tt);
+
+
+#ifdef DEBUG_EFFICIENCY
+    qint64 t=time.nsecsElapsed();
+    int cnt=el->count();
+    int bytes=cnt * (sizeof(EventStoreType)+sizeof(quint32));
+    int wvbytes=recs * (sizeof(EventStoreType));
+    QHash<ChannelID,qint64>::iterator it=channel_efficiency.find(code);
+    if (it==channel_efficiency.end()) {
+       channel_efficiency[code]=wvbytes-bytes;
+       channel_time[code]=t;
+    } else {
+        it.value()+=wvbytes-bytes;
+        channel_time[code]+=t;
+    }
+#endif
+
     return el;
 }
 bool ResmedLoader::LoadSAD(Session *sess,EDFParser &edf)

SleepLib/loader_plugins/resmed_loader.h

@@ -24,6 +24,7 @@ const int resmed_data_version=5;
 //
 //********************************************************************************************
 
+
 const QString resmed_class_name=STR_MACH_ResMed;
 
 /*! \struct EDFHeader
@@ -213,7 +214,10 @@ protected:
     bool LoadPLD(Session *sess,EDFParser &edf);
 
     QMap<SessionID,QVector<QString> > sessfiles;
-
+#ifdef DEBUG_EFFICIENCY
+    QHash<ChannelID,qint64> channel_efficiency;
+    QHash<ChannelID,qint64> channel_time;
+#endif
 };
 
 #endif // RESMED_LOADER_H