From 146cca9ed54002bdcf4d8ca224abdc78ddd211cd Mon Sep 17 00:00:00 2001
From: Teuniz <teuniz@gmail.com>
Date: Tue, 14 Jul 2015 19:07:00 +0200
Subject: [PATCH]  Work in progress.

---
 global.h        |  2 +-
 signalcurve.cpp |  2 +-
 utils.c         | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/global.h b/global.h
index 38a80b8..6846a8e 100644
--- a/global.h
+++ b/global.h
@@ -31,7 +31,7 @@
 
 
 #define PROGRAM_NAME          "DSRemote"
-#define PROGRAM_VERSION       "0.20_1507100942"
+#define PROGRAM_VERSION       "0.20_1507141906"
 
 #define MAX_PATHLEN            4096
 
diff --git a/signalcurve.cpp b/signalcurve.cpp
index cee203c..4a8def0 100644
--- a/signalcurve.cpp
+++ b/signalcurve.cpp
@@ -667,7 +667,7 @@ void SignalCurve::drawTopLabels(QPainter *painter)
 
   painter->setPen(Qt::gray);
 
-  convert_to_metric_suffix(str, devparms->samplerate, 3);
+  convert_to_metric_suffix(str, devparms->samplerate, 0);
 
   strcat(str, "Sa/s");
 
diff --git a/utils.c b/utils.c
index 139835b..8bc069d 100644
--- a/utils.c
+++ b/utils.c
@@ -1713,14 +1713,14 @@ double round_up_step125(double val)
 
   double ltmp;
 
-   while(val < 1)
+   while(val < 0.999)
   {
     val *= 10;
 
     exp--;
   }
 
-  while(val >= 10)
+  while(val > 9.999)
   {
     val /= 10;
 
@@ -1729,11 +1729,11 @@ double round_up_step125(double val)
 
   val = nearbyint(val);
 
-  if(val >= 5)
+  if(val > 4.999)
   {
     ltmp = 10;
   }
-  else if(val >= 2)
+  else if(val > 1.999)
     {
       ltmp = 5;
     }
@@ -1767,14 +1767,14 @@ double round_down_step125(double val)
 
   double ltmp;
 
-  while(val < 1)
+  while(val < 0.999)
   {
     val *= 10;
 
     exp--;
   }
 
-  while(val >= 10)
+  while(val > 9.999)
   {
     val /= 10;
 
@@ -1783,15 +1783,15 @@ double round_down_step125(double val)
 
   val = nearbyint(val);
 
-  if(val <= 1)
+  if(val < 1.001)
   {
     ltmp = 0.5;
   }
-  else if(val <= 2)
+  else if(val < 2.001)
     {
       ltmp = 1;
     }
-    else if(val <= 5)
+    else if(val < 5.001)
       {
         ltmp = 2;
       }