Bugfix: show frames per second.

global.h

@@ -35,7 +35,7 @@
 
 
 #define PROGRAM_NAME          "DSRemote"
-#define PROGRAM_VERSION       "0.32_1601312112"
+#define PROGRAM_VERSION       "0.32_1602011306"
 
 #define MAX_PATHLEN            4096
 
@@ -204,8 +204,7 @@ struct device_settings
 
   int current_screen_sf;
 
-  int fps;
-  int fps_on;
+  int show_fps;
 };
 
 

mainwindow.cpp

@@ -378,10 +378,6 @@ void UI_Mainwindow::open_connection()
 
   scrn_timer->start(devparms.screentimerival);
 
-  fps_timer->start(100);
-
-  devparms.fps = 0;
-
   return;
 
 OUT_ERROR:
@@ -409,8 +405,6 @@ void UI_Mainwindow::close_connection()
 
   adjdial_timer->stop();
 
-  fps_timer->stop();
-
   devparms.connected = 0;
 
   if(scrn_thread->wait(5000) == false)
@@ -499,8 +493,6 @@ void UI_Mainwindow::close_connection()
     devparms.k_cfg = NULL;
   }
 
-  devparms.fps = 0;
-
   statusLabel->setText("Disconnected");
 }
 

mainwindow.h

@@ -137,7 +137,6 @@ private:
                *vertOffsDial_timer,
                *horScaleDial_timer,
                *vertScaleDial_timer,
-               *fps_timer,
                *test_timer;
 
   QStatusBar   *statusBar;
@@ -242,7 +241,6 @@ private slots:
   void vertOffsDial_timer_handler();
   void horScaleDial_timer_handler();
   void vertScaleDial_timer_handler();
-  void fps_timer_handler();
 
   void show_about_dialog();
   void show_howto_operate();

mainwindow_constr.cpp

@@ -103,19 +103,19 @@ UI_Mainwindow::UI_Mainwindow()
     settings.setValue("screenshot/inverted", devparms.screenshot_inv);
   }
 
-  devparms.fps_on = settings.value("gui/show_fps", 0).toInt();
+  devparms.show_fps = settings.value("gui/show_fps", 0).toInt();
 
-  if(devparms.fps_on)
+  if(devparms.show_fps)
   {
-    devparms.fps_on = 1;
+    devparms.show_fps = 1;
 
-    settings.setValue("gui/show_fps", devparms.fps_on);
+    settings.setValue("gui/show_fps", devparms.show_fps);
   }
   else
   {
-    devparms.fps_on = 0;
+    devparms.show_fps = 0;
 
-    settings.setValue("gui/show_fps", devparms.fps_on);
+    settings.setValue("gui/show_fps", devparms.show_fps);
   }
 
   devparms.displaygrid = 2;
@@ -502,7 +502,6 @@ UI_Mainwindow::UI_Mainwindow()
   horScaleDial_timer->setSingleShot(true);
   vertScaleDial_timer = new QTimer(this);
   vertScaleDial_timer->setSingleShot(true);
-  fps_timer = new QTimer(this);
 
 #if QT_VERSION >= 0x050000
   scrn_timer->setTimerType(Qt::PreciseTimer);
@@ -515,7 +514,6 @@ UI_Mainwindow::UI_Mainwindow()
   vertOffsDial_timer->setTimerType(Qt::PreciseTimer);
   horScaleDial_timer->setTimerType(Qt::PreciseTimer);
   vertScaleDial_timer->setTimerType(Qt::PreciseTimer);
-  fps_timer->setTimerType(Qt::PreciseTimer);
 #endif
 
   connect(scrn_timer,          SIGNAL(timeout()),        this, SLOT(scrn_timer_handler()));
@@ -530,7 +528,6 @@ UI_Mainwindow::UI_Mainwindow()
   connect(vertOffsDial_timer,  SIGNAL(timeout()),        this, SLOT(vertOffsDial_timer_handler()));
   connect(horScaleDial_timer,  SIGNAL(timeout()),        this, SLOT(horScaleDial_timer_handler()));
   connect(vertScaleDial_timer, SIGNAL(timeout()),        this, SLOT(vertScaleDial_timer_handler()));
-  connect(fps_timer,           SIGNAL(timeout()),        this, SLOT(fps_timer_handler()));
 
 ///// TEST /////////////////////////////////////
 //   DPRwidget->setEnabled(true);

settings_dialog.cpp

@@ -163,7 +163,7 @@ UI_settings_window::UI_settings_window(QWidget *parnt)
   showfpsCheckbox = new QCheckBox(this);
   showfpsCheckbox->setGeometry(180, 220, 120, 35);
   showfpsCheckbox->setTristate(false);
-  if(mainwindow->devparms.fps_on)
+  if(mainwindow->devparms.show_fps)
   {
     showfpsCheckbox->setCheckState(Qt::Checked);
   }
@@ -266,13 +266,13 @@ void UI_settings_window::applyButtonClicked()
 
   if(showfpsCheckbox->checkState() == Qt::Checked)
   {
-    mainwindow->devparms.fps_on = 1;
+    mainwindow->devparms.show_fps = 1;
 
     settings.setValue("gui/show_fps", 1);
   }
   else
   {
-    mainwindow->devparms.fps_on = 0;
+    mainwindow->devparms.show_fps = 0;
 
     settings.setValue("gui/show_fps", 0);
   }
@@ -319,14 +319,14 @@ void UI_settings_window::showfpsCheckboxChanged(int state)
 
   if(state == Qt::Checked)
   {
-    mainwindow->devparms.fps_on = 1;
+    mainwindow->devparms.show_fps = 1;
   }
   else
   {
-    mainwindow->devparms.fps_on = 0;
+    mainwindow->devparms.show_fps = 0;
   }
 
-  settings.setValue("gui/show_fps", mainwindow->devparms.fps_on);
+  settings.setValue("gui/show_fps", mainwindow->devparms.show_fps);
 }
 
 

signalcurve.cpp

@@ -29,6 +29,9 @@
 
 #include "signalcurve.h"
 
+#include "time.h"
+
+
 
 SignalCurve::SignalCurve(QWidget *w_parent) : QWidget(w_parent)
 {
@@ -218,7 +221,7 @@ void SignalCurve::drawWidget(QPainter *painter, int curve_w, int curve_h)
     drawChanLabel(painter, 8 + (i * 125), curve_h - 25, i);
   }
 
-  if(devparms->connected && devparms->fps_on)
+  if(devparms->connected && devparms->show_fps)
   {
     drawfpsLabel(painter, curve_w - 80, curve_h - 11);
   }
@@ -1187,15 +1190,26 @@ void SignalCurve::drawfpsLabel(QPainter *painter, int xpos, int ypos)
 {
   char str[256];
 
-  if(devparms->fps == 0)  return;
+  static struct timespec tp1, tp2;
 
   painter->setPen(Qt::red);
 
-  sprintf(str, "%.1f fps", 10.0 / devparms->fps);
+  clock_gettime(CLOCK_REALTIME, &tp1);
+
+  if(tp1.tv_nsec >= tp2.tv_nsec)
+  {
+    sprintf(str, "%04.1f fps", 1.0 / ((tp1.tv_sec - tp2.tv_sec) + ((tp1.tv_nsec - tp2.tv_nsec) / 1e9)));
+  }
+  else
+  {
+    sprintf(str, "%04.1f fps", 1.0 / ((tp1.tv_sec - tp2.tv_sec - 1) + ((tp1.tv_nsec - tp2.tv_nsec + 1000000000) / 1e9)));
+  }
 
   painter->drawText(xpos, ypos, str);
 
-  devparms->fps = 0;
+  tp2.tv_sec = tp1.tv_sec;
+
+  tp2.tv_nsec = tp1.tv_nsec;
 }
 
 

timer_handlers.cpp

@@ -219,10 +219,6 @@ void UI_Mainwindow::vertScaleDial_timer_handler()
 }
 
 
-void UI_Mainwindow::fps_timer_handler()
-{
-  devparms.fps++;
-}