Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_system_clock.cpp

Timestamp:

May 10, 2017, 3:20:54 PM (7 years ago)

Author:

stoecker

Message:

update qwt and qwtpolar, many QT5 fixes (unfinished)

File:

• trunk/BNC/qwt/qwt_system_clock.cpp (modified) (4 diffs)

trunk/BNC/qwt/qwt_system_clock.cpp

@@ -9 +9 @@
 
 #include "qwt_system_clock.h"
+
+#if QT_VERSION >= 0x040800
+#define USE_ELAPSED_TIMER 1
+#endif
+
+#if USE_ELAPSED_TIMER
+
+#include <qelapsedtimer.h>
+
+class QwtSystemClock::PrivateData
+{
+public:
+    QElapsedTimer timer;
+};
+
+QwtSystemClock::QwtSystemClock()
+{
+    d_data = new PrivateData();
+}
+
+QwtSystemClock::~QwtSystemClock()
+{
+    delete d_data;
+}
+    
+bool QwtSystemClock::isNull() const
+{
+    return d_data->timer.isValid();
+}
+        
+void QwtSystemClock::start()
+{
+    d_data->timer.start();
+}
+
+double QwtSystemClock::restart()
+{
+    const qint64 nsecs = d_data->timer.restart();
+    return nsecs / 1e6;
+}
+
+double QwtSystemClock::elapsed() const
+{
+    const qint64 nsecs = d_data->timer.nsecsElapsed();
+    return nsecs / 1e6;
+}
+    
+#else // !USE_ELAPSED_TIMER
+
 #include <qdatetime.h>
 
@@ -111 +160 @@
         kern_return_t err = mach_timebase_info( &info );
 
-        //Convert the timebase into ms
+        // convert the timebase into ms
         if ( err == 0  )
             conversion = 1e-6 * ( double ) info.numer / ( double ) info.denom;
@@ -308 +357 @@
 
 /*!
-  The start time to the current time and
-  return the time, that is elapsed since the
-  previous start time.
+  Set the start time to the current time 
+  \return Time, that is elapsed since the previous start time.
 */
 double QwtSystemClock::restart()
@@ -346 +394 @@
 }
 
-/*!
-  \return Accuracy of the system clock in milliseconds.
-*/
-double QwtSystemClock::precision()
-{
-    static double prec = 0.0;
-    if ( prec <= 0.0 )
-    {
-#if defined(QWT_HIGH_RESOLUTION_CLOCK)
-        prec = QwtHighResolutionClock::precision();
-#endif
-        if ( prec <= 0.0 )
-            prec = 1.0; // QTime offers 1 ms
-    }
-
-    return prec;
-}
+#endif