From 180ced9223507f2c8c7669e678b4787510d4246a Mon Sep 17 00:00:00 2001
From: nemu <nemu>
Date: Tue, 10 Jun 2008 05:13:19 +0000
Subject: [PATCH] shift map and function offset from 1e3/2e3 to 1e4/2e4. Fixed
 parameter pad problem with truncated numbers

---
 src/classes/PMusrCanvas.cpp | 16 ++++++++--------
 src/include/PMusr.h         |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/classes/PMusrCanvas.cpp b/src/classes/PMusrCanvas.cpp
index 0b41e4c9..e392d671 100644
--- a/src/classes/PMusrCanvas.cpp
+++ b/src/classes/PMusrCanvas.cpp
@@ -316,9 +316,9 @@ void PMusrCanvas::UpdateParamTheoryPad()
       str += " ";
     // parameter value
     if (round(param[i].fValue)-param[i].fValue==0)
-      sprintf(cnum, "%.1lg", param[i].fValue);
+      sprintf(cnum, "%.1lf", param[i].fValue);
     else
-      sprintf(cnum, "%.6lg", param[i].fValue);
+      sprintf(cnum, "%.6lf", param[i].fValue);
     str += cnum;
     for (int j=0; j<9-(int)strlen(cnum); j++) // fill spaces
       str += " ";
@@ -332,21 +332,21 @@ void PMusrCanvas::UpdateParamTheoryPad()
       if ((fabs(fabs(param[i].fStep) - param[i].fPosError) < 0.1*fabs(param[i].fStep)) &&
           (fabs(fabs(param[i].fStep) - param[i].fPosError) < 0.1*param[i].fPosError)) {
         if (round(err)-err==0)
-          sprintf(cnum, "%.1lg", err);
+          sprintf(cnum, "%.1lf", err);
         else
-          sprintf(cnum, "%.6lg", err);
+          sprintf(cnum, "%.6lf", err);
       } else {
         if (round(err)-err==0)
-          sprintf(cnum, "%.1lg!!", err);
+          sprintf(cnum, "%.1lf!!", err);
         else
-          sprintf(cnum, "%.6lg!!", err);
+          sprintf(cnum, "%.6lf!!", err);
       }
       str += cnum;
     } else { // minos was not used
       if (round(param[i].fStep)-param[i].fStep==0)
-        sprintf(cnum, "%.1lg", param[i].fStep);
+        sprintf(cnum, "%.1lf", param[i].fStep);
       else
-        sprintf(cnum, "%.6lg", param[i].fStep);
+        sprintf(cnum, "%.6lf", param[i].fStep);
       str += cnum;
     }
     ypos = 0.925-i*0.025;
diff --git a/src/include/PMusr.h b/src/include/PMusr.h
index 9629271c..9612c972 100644
--- a/src/include/PMusr.h
+++ b/src/include/PMusr.h
@@ -89,8 +89,8 @@ using namespace std;
 
 //-------------------------------------------------------------
 // map and fun offsets for parameter parsing
-#define MSR_PARAM_MAP_OFFSET 1000
-#define MSR_PARAM_FUN_OFFSET 2000
+#define MSR_PARAM_MAP_OFFSET 10000
+#define MSR_PARAM_FUN_OFFSET 20000
 
 //-------------------------------------------------------------
 /**