Changeset 645 for cpp/frams

Timestamp:

12/31/16 20:35:12 (8 years ago)

Author:

Maciej Komosinski

Message:

f0 is strict now, will not accept float when int is expected

Location:

cpp/frams/param

Files:

• param.cpp (modified) (4 diffs)
• param.h (modified) (2 diffs)

cpp/frams/param/param.cpp

@@ -574 +574 @@
 }
 
-int ParamInterface::setInt(int i, const char* str)
+int ParamInterface::setInt(int i, const char* str, bool strict)
 {
         paInt value;
-        if (!ExtValue::parseInt(str, value, false, true))
+        if (!ExtValue::parseInt(str, value, strict, true))
         {
                 paInt mn, mx, def;
@@ -645 +645 @@
 }
 
-int ParamInterface::set(int i, const char *v)
+int ParamInterface::set(int i, const char *v, bool strict)
 {
         char typ = type(i)[0];
         switch (typ)
         {
-        case 'd': return setInt(i, v);
+        case 'd': return setInt(i, v, strict);
         case 'f': return setDouble(i, v);
         case 's': { SString t(v); return setString(i, t); }
@@ -745 +745 @@
         {
         case 'd': t+="integer";
-        {paInt a,b,c; int n=getMinMax(type,a,b,c); if (n>=2) t+=SString::sprintf(" %d..%d",a,b); if (n>=3) t+=SString::sprintf(" (default %d)",c);}
+        {paInt a,b,c; int n=getMinMax(type,a,b,c); if ((n>=2)&&(b>=a)) t+=SString::sprintf(" %d..%d",a,b); if (n>=3) t+=SString::sprintf(" (default %d)",c);}
         break;
         case 'f': t+="float";
-        {double a,b,c; int n=getMinMax(type,a,b,c); if (n>=2) t+=SString::sprintf(" %g..%g",a,b); if (n>=3) t+=SString::sprintf(" (default %g)",c);}
+        {double a,b,c; int n=getMinMax(type,a,b,c); if ((n>=2)&&(b>=a)) t+=SString::sprintf(" %g..%g",a,b); if (n>=3) t+=SString::sprintf(" (default %g)",c);}
         break;
         case 's': t+="string";
@@ -1202 +1202 @@
                         remember = *valstop;
                         *(char*)valstop = 0;
-                        ret = set(i, value);
+                        ret = set(i, value, true);
                         fields_loaded++;
                         if (ret&(PSET_HITMAX | PSET_HITMIN))

cpp/frams/param/param.h

@@ -118 +118 @@
         ExtValue getById(const char* prop);
 
-        int setInt(int i, const char* str);
+        int setInt(int i, const char* str, bool strict=false);
         int setDouble(int i, const char* str);
         virtual int setInt(int, paInt) = 0;             ///< set long value, you can only use this for "d" type prop
@@ -128 +128 @@
         int set(int, const ExtValue &);///< most universal set, can be used for every datatype
 
-        int set(int, const char*);              ///< oldstyle set, can convert string to long or double
+        int set(int, const char*, bool strict=false);           ///< oldstyle set, can convert string to long or double
 
         int setIntById(const char* prop, paInt);///< set long value, you can only use this for "d" type prop