Changeset 314 for cpp

Timestamp:

01/26/15 13:03:22 (10 years ago)

Author:

Maciej Komosinski

Message:

Less cryptic variable names: a,b,c -> mn,mx,def

File:

• cpp/frams/param/param.cpp (modified) (10 diffs)

cpp/frams/param/param.cpp

@@ -139 +139 @@
         case 'f':
         {
-                double a = 0, b = 0, c = 0;
-                if (getMinMax(i, a, b, c) < 3) c = a;
-                setDouble(i, c);
+                double mn = 0, mx = 0, def = 0;
+                if (getMinMax(i, mn, mx, def) < 3) def = mn;
+                setDouble(i, def);
         }
                 break;
         case 'd':
         {
-                paInt a = 0, b = 0, c = 0;
-                if (getMinMax(i, a, b, c) < 3) c = a;
-                setInt(i, c);
+                paInt mn = 0, mx = 0, def = 0;
+                if (getMinMax(i, mn, mx, def) < 3) def = mn;
+                setInt(i, def);
         }
                 break;
         case 's': case 'x':
         {
-                int a, b; SString c;
-                getMinMax(i, a, b, c);
+                int mn, mx; SString def;
+                getMinMax(i, mn, mx, def);
                 if (*t == 's')
-                        setString(i, c);
+                        setString(i, def);
                 else
                 {
-                        if (c.len() > 0) setExtValue(i, ExtValue(c)); else setExtValue(i, ExtValue::empty());
+                        if (def.len() > 0) setExtValue(i, ExtValue(def)); else setExtValue(i, ExtValue::empty());
                 }
         }
@@ -176 +176 @@
         case 'f':
         {
-                double a = 0, b = 0, c = 0;
-                getMinMax(i, a, b, c);
-                setDouble(i, a);
+                double mn = 0, mx = 0, def = 0;
+                getMinMax(i, mn, mx, def);
+                setDouble(i, mn);
         }
                 break;
         case 'd':
         {
-                paInt a = 0, b = 0, c = 0;
-                getMinMax(i, a, b, c);
-                setInt(i, a);
+                paInt mn = 0, mx = 0, def = 0;
+                getMinMax(i, mn, mx, def);
+                setInt(i, mn);
         }
                 break;
@@ -199 +199 @@
         case 'f':
         {
-                double a = 0, b = 0, c = 0;
-                getMinMax(i, a, b, c);
-                setDouble(i, b);
+                double mn = 0, mx = 0, def = 0;
+                getMinMax(i, mn, mx, def);
+                setDouble(i, mx);
         }
                 break;
         case 'd':
         {
-                paInt a = 0, b = 0, c = 0;
-                getMinMax(i, a, b, c);
-                setInt(i, b);
+                paInt mn = 0, mx = 0, def = 0;
+                getMinMax(i, mn, mx, def);
+                setInt(i, mx);
         }
                 break;
@@ -497 +497 @@
         case 'o':       ret.setObject(getObject(i)); break;
         case 'x':       ret = getExtValue(i); break;
-        default: FMprintf("ParamInterface", "get", FMLV_ERROR, "'%s.%s' is not a field", getName(), id(i));
+        default: FMprintf("ParamInterface", "get", FMLV_ERROR, "'%s.%s' is not mn field", getName(), id(i));
         }
 }
@@ -513 +513 @@
         if (!stringIsNumeric(str))
         {
-                paInt a, b, c;
-                if (getMinMax(i, a, b, c) >= 3)
-                        return setInt(i, c);
+                paInt mn, mx, def;
+                if (getMinMax(i, mn, mx, def) >= 3)
+                        return setInt(i, def);
                 else
                         return setInt(i, (paInt)0);
@@ -527 +527 @@
         if (!stringIsNumeric(str))
         {
-                double a, b, c;
-                if (getMinMax(i, a, b, c) >= 3)
-                        return setDouble(i, c);
+                double mn, mx, def;
+                if (getMinMax(i, mn, mx, def) >= 3)
+                        return setDouble(i, def);
                 else
                         return setDouble(i, (double)0);
@@ -605 +605 @@
         if ((*(t = type(i))) == 'd')
         {
-                paInt a, b, c;
+                paInt mn, mx, def;
                 int value = getInt(i);
-                if (getMinMax(i, a, b, c) >= 2)
-                {
-                        if (value > b)
+                if (getMinMax(i, mn, mx, def) >= 2)
+                {
+                        if (value > mx)
                                 return get(i);
-                        value -= a;
+                        value -= mn;
                 }
                 if (value < 0) return get(i);
@@ -778 +778 @@
         if (pe->flags&PARAM_READONLY) return PSET_RONLY;
         paInt xcopy = x; //only needed for messageOnExceedRange(): retain original, requested value of x because it may be changed below
-        paInt a = 0, b = 0;
+        paInt mn = 0, mx = 0;
         int result = 0;
         const char* t = pe->type + 1;
         while (*t) if (*t == ' ') break; else t++;
-        if (sscanf(t, PA_INT_SCANF " " PA_INT_SCANF, &a, &b) == 2)
-                if (a <= b) // if max<min then the min/max constraint check is not supported
-                {
-                if (x < a) { x = a; result = PSET_HITMIN; }
-                else if (x > b) { x = b; result = PSET_HITMAX; }
+        if (sscanf(t, PA_INT_SCANF " " PA_INT_SCANF, &mn, &mx) == 2)
+                if (mn <= mx) // if max<min then the min/max constraint check is not supported
+                {
+                if (x < mn) { x = mn; result = PSET_HITMIN; }
+                else if (x > mx) { x = mx; result = PSET_HITMAX; }
                 }
 
@@ -814 +814 @@
         if (pe->flags&PARAM_READONLY) return PSET_RONLY;
         double xcopy = x; //only needed for messageOnExceedRange(): retain original, requested value of x because it may be changed below
-        double a = 0, b = 0;
+        double mn = 0, mx = 0;
         int result = 0;
         const char* t = pe->type + 1;
         while (*t) if (*t == ' ') break; else t++;
-        if (sscanf(t, "%lg %lg", &a, &b) == 2)
-                if (a <= b) // if max<min then the min/max constraint check is not supported
-                {
-                if (x < a) { x = a; result = PSET_HITMIN; }
-                else if (x > b) { x = b; result = PSET_HITMAX; }
+        if (sscanf(t, "%lg %lg", &mn, &mx) == 2)
+                if (mn <= mx) // if max<min then the min/max constraint check is not supported
+                {
+                if (x < mn) { x = mn; result = PSET_HITMIN; }
+                else if (x > mx) { x = mx; result = PSET_HITMAX; }
                 }
 
@@ -854 +854 @@
         const char* t = pe->type + 1;
         while (*t) if (*t == ' ') break; else t++;
-        int a = 0, b = 0;
+        int mn = 0, mx = 0;
         int result = 0;
-        if (sscanf(t, "%d %d", &a, &b) == 2) //using getMinMax would also get default value, which is not needed here
-        {
-                if ((x.len() > b) && (b > 0))
-                {
-                        vs = x.substr(0, b);
+        if (sscanf(t, "%d %d", &mn, &mx) == 2) //using getMinMax would also get default value, which is not needed here
+        {
+                if ((x.len() > mx) && (mx > 0))
+                {
+                        vs = x.substr(0, mx);
                         xx = &vs;
                         result |= PSET_HITMAX;