Update copyright.

Some minor improvements.

about_dialog.cpp

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

about_dialog.h

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

connection.cpp

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

connection.h

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

global.h

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *
@@ -33,7 +33,7 @@
 
 
 #define PROGRAM_NAME          "DSRemote"
-#define PROGRAM_VERSION       "0.31_1512291404"
+#define PROGRAM_VERSION       "0.31_1601021654"
 
 #define MAX_PATHLEN            4096
 

interface.cpp

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

mainwindow.cpp

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

mainwindow.h

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

mainwindow_constr.cpp

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

save_data.cpp

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *
@@ -401,7 +401,7 @@ void UI_Mainwindow::save_memory_waveform()
           break;
         }
 
-        wavbuf[chn][bytes_rcvd + k] = (int)(((unsigned char *)device->buf)[k]) - yref[chn] - yor[chn];
+        wavbuf[chn][bytes_rcvd + k] = ((int)(((unsigned char *)device->buf)[k]) - yref[chn] - yor[chn]) << 5;
       }
 
       bytes_rcvd += n;
@@ -514,14 +514,14 @@ void UI_Mainwindow::save_memory_waveform()
     edf_set_digital_minimum(hdl, j, -32768);
     if(devparms.chanscale[chn] > 2)
     {
-      edf_set_physical_maximum(hdl, j, yinc[chn] * 32767);
+      edf_set_physical_maximum(hdl, j, yinc[chn] * 32767.0 / 32.0);
-      edf_set_physical_minimum(hdl, j, yinc[chn] * -32768);
+      edf_set_physical_minimum(hdl, j, yinc[chn] * -32768.0 / 32.0);
       edf_set_physical_dimension(hdl, j, "V");
     }
     else
     {
-      edf_set_physical_maximum(hdl, j, 1000 * yinc[chn] * 32767);
+      edf_set_physical_maximum(hdl, j, 1000.0 * yinc[chn] * 32767.0 / 32.0);
-      edf_set_physical_minimum(hdl, j, 1000 * yinc[chn] * -32768);
+      edf_set_physical_minimum(hdl, j, 1000.0 * yinc[chn] * -32768.0 / 32.0);
       edf_set_physical_dimension(hdl, j, "mV");
     }
     sprintf(str, "CHAN%i", chn + 1);
@@ -831,7 +831,7 @@ void UI_Mainwindow::save_screen_waveform()
 
     for(i=0; i<n; i++)
     {
-      wavbuf[chn][i] = (int)(((unsigned char *)device->buf)[i]) - yref[chn] - yor[chn];
+      wavbuf[chn][i] = ((int)(((unsigned char *)device->buf)[i]) - yref[chn] - yor[chn]) << 5;
     }
   }
 
@@ -879,14 +879,14 @@ void UI_Mainwindow::save_screen_waveform()
     edf_set_digital_minimum(hdl, j, -32768);
     if(devparms.chanscale[chn] > 2)
     {
-      edf_set_physical_maximum(hdl, j, yinc[chn] * 32767);
+      edf_set_physical_maximum(hdl, j, yinc[chn] * 32767.0 / 32.0);
-      edf_set_physical_minimum(hdl, j, yinc[chn] * -32768);
+      edf_set_physical_minimum(hdl, j, yinc[chn] * -32768.0 / 32.0);
       edf_set_physical_dimension(hdl, j, "V");
     }
     else
     {
-      edf_set_physical_maximum(hdl, j, 1000 * yinc[chn] * 32767);
+      edf_set_physical_maximum(hdl, j, 1000.0 * yinc[chn] * 32767.0 / 32.0);
-      edf_set_physical_minimum(hdl, j, 1000 * yinc[chn] * -32768);
+      edf_set_physical_minimum(hdl, j, 1000.0 * yinc[chn] * -32768.0 / 32.0);
       edf_set_physical_dimension(hdl, j, "mV");
     }
     sprintf(str, "CHAN%i", chn + 1);

screen_thread.cpp

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

screen_thread.h

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

settings_dialog.cpp

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

settings_dialog.h

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

signalcurve.cpp

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015 Teunis van Beelen
+* Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

signalcurve.h

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

timer_handlers.cpp

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

tled.cpp

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2014, 2015 Teunis van Beelen
+* Copyright (C) 2014, 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

tled.h

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2014, 2015 Teunis van Beelen
+* Copyright (C) 2014, 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

tmc_dev.c

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

tmc_dev.h

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

tmc_lan.c

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

tmc_lan.h

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2015 Teunis van Beelen
+* Copyright (C) 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *

utils.c

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Teunis van Beelen
+* Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *
@@ -1599,114 +1599,6 @@ void hextobin(char *dest, const char *str)
 }
 
 
-int convert_to_metric_suffix(char *buf, double value, int decimals)
-{
-  double ltmp;
-
-  char suffix=' ';
-
-  if(value < 0)
-  {
-      ltmp = value * -1;
-  }
-  else
-  {
-      ltmp = value;
-  }
-
-  if(ltmp >= 1e12 && ltmp < 1e15)
-  {
-      ltmp = ltmp / 1e12;
-
-      suffix = 'T';
-  }
-  else if(ltmp >= 1e9 && ltmp < 1e12)
-    {
-        ltmp = ltmp / 1e9;
-
-        suffix = 'G';
-    }
-    else if(ltmp >= 1e6 && ltmp < 1e9)
-      {
-          ltmp = ltmp / 1e6;
-
-          suffix = 'M';
-      }
-      else if(ltmp >= 1e3 && ltmp < 1e6)
-        {
-          ltmp /= 1e3;
-
-          suffix = 'K';
-        }
-        else if(ltmp >= 1e-3 && ltmp < 1)
-          {
-            ltmp *= 1e3;
-
-            suffix = 'm';
-          }
-          else if( ltmp >= 1e-6 && ltmp < 1e-3)
-            {
-              ltmp *= 1e6;
-
-              suffix = 'u';
-            }
-            else if(ltmp >= 1e-9 && ltmp < 1e-6)
-              {
-                ltmp *= 1e9;
-
-                suffix = 'n';
-              }
-              else if(ltmp >= 1e-12 && ltmp < 1e-9)
-                {
-                  ltmp *= 1e12;
-
-                  suffix = 'p';
-                }
-
-  if(value >= 0)
-  {
-    switch(decimals)
-    {
-      case 0: return sprintf(buf, "%.0f%c", ltmp, suffix);
-              break;
-      case 1: return sprintf(buf, "%.1f%c", ltmp, suffix);
-              break;
-      case 2: return sprintf(buf, "%.2f%c", ltmp, suffix);
-              break;
-      case 3: return sprintf(buf, "%.3f%c", ltmp, suffix);
-              break;
-      case 4: return sprintf(buf, "%.4f%c", ltmp, suffix);
-              break;
-      case 5: return sprintf(buf, "%.5f%c", ltmp, suffix);
-              break;
-      case 6: return sprintf(buf, "%.6f%c", ltmp, suffix);
-              break;
-      default: return sprintf(buf, "%.3f%c", ltmp, suffix);
-              break;
-    }
-  }
-
-  if(value < 0)
-  {
-    switch(decimals)
-    {
-      case 0: return sprintf(buf, "%.0f%c", ltmp * -1, suffix);
-              break;
-      case 1: return sprintf(buf, "%.1f%c", ltmp * -1, suffix);
-              break;
-      case 2: return sprintf(buf, "%.2f%c", ltmp * -1, suffix);
-              break;
-      default: return sprintf(buf, "%.3f%c", ltmp * -1, suffix);
-              break;
-    }
-  }
-
-  strcpy(buf, "0");
-
-  return 1;
-}
-
-
 double round_up_step125(double val)
 {
   int i, exp=0;
@@ -1819,6 +1711,114 @@ double round_down_step125(double val)
 }
 
 
+int convert_to_metric_suffix(char *buf, double value, int decimals)
+{
+  double ltmp;
+
+  char suffix=' ';
+
+  if(value < 0)
+  {
+      ltmp = value * -1;
+  }
+  else
+  {
+      ltmp = value;
+  }
+
+  if(ltmp >= 1e12 && ltmp < 1e15)
+  {
+      ltmp = ltmp / 1e12;
+
+      suffix = 'T';
+  }
+  else if(ltmp >= 1e9 && ltmp < 1e12)
+    {
+        ltmp = ltmp / 1e9;
+
+        suffix = 'G';
+    }
+    else if(ltmp >= 1e6 && ltmp < 1e9)
+      {
+          ltmp = ltmp / 1e6;
+
+          suffix = 'M';
+      }
+      else if(ltmp >= 1e3 && ltmp < 1e6)
+        {
+          ltmp /= 1e3;
+
+          suffix = 'K';
+        }
+        else if(ltmp >= 1e-3 && ltmp < 1)
+          {
+            ltmp *= 1e3;
+
+            suffix = 'm';
+          }
+          else if( ltmp >= 1e-6 && ltmp < 1e-3)
+            {
+              ltmp *= 1e6;
+
+              suffix = 'u';
+            }
+            else if(ltmp >= 1e-9 && ltmp < 1e-6)
+              {
+                ltmp *= 1e9;
+
+                suffix = 'n';
+              }
+              else if(ltmp >= 1e-12 && ltmp < 1e-9)
+                {
+                  ltmp *= 1e12;
+
+                  suffix = 'p';
+                }
+
+  if(value >= 0)
+  {
+    switch(decimals)
+    {
+      case 0: return sprintf(buf, "%.0f%c", ltmp, suffix);
+              break;
+      case 1: return sprintf(buf, "%.1f%c", ltmp, suffix);
+              break;
+      case 2: return sprintf(buf, "%.2f%c", ltmp, suffix);
+              break;
+      case 3: return sprintf(buf, "%.3f%c", ltmp, suffix);
+              break;
+      case 4: return sprintf(buf, "%.4f%c", ltmp, suffix);
+              break;
+      case 5: return sprintf(buf, "%.5f%c", ltmp, suffix);
+              break;
+      case 6: return sprintf(buf, "%.6f%c", ltmp, suffix);
+              break;
+      default: return sprintf(buf, "%.3f%c", ltmp, suffix);
+              break;
+    }
+  }
+
+  if(value < 0)
+  {
+    switch(decimals)
+    {
+      case 0: return sprintf(buf, "%.0f%c", ltmp * -1, suffix);
+              break;
+      case 1: return sprintf(buf, "%.1f%c", ltmp * -1, suffix);
+              break;
+      case 2: return sprintf(buf, "%.2f%c", ltmp * -1, suffix);
+              break;
+      default: return sprintf(buf, "%.3f%c", ltmp * -1, suffix);
+              break;
+    }
+  }
+
+  strcpy(buf, "0");
+
+  return 1;
+}
+
+
 int strtoipaddr(unsigned int *dest, const char *src)
 {
   int i, err=1;
@@ -1873,3 +1873,10 @@ int strtoipaddr(unsigned int *dest, const char *src)
 
 
 
+
+
+
+
+
+
+

utils.h

@@ -3,7 +3,7 @@
 *
 * Author: Teunis van Beelen
 *
-* Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Teunis van Beelen
+* Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Teunis van Beelen
 *
 * Email: teuniz@gmail.com
 *
@@ -86,7 +86,10 @@ void asciitohex(char *, const char *);  /* destination must have double the size
 void asciitobin(char *, const char *);  /* destination must have eight times the size of source! */
 void hextobin(char *, const char *);    /* destination must have four times the size of source! */
 
+/* Converts a double to Giga/Mega/Kilo/milli/micro/etc. */
+/* int is number of decimals. Result is written into the string argument */
 int convert_to_metric_suffix(char *, double, int);
+
 double round_up_step125(double);                  /* Rounds the value up to 1-2-5 steps */
 double round_down_step125(double);                /* Rounds the value down to 1-2-5 steps */