Changeset 326 for cpp/frams/param/param.cpp

Timestamp:

02/06/15 00:15:08 (9 years ago)

Author:

Maciej Komosinski

Message:

Unified parsing of ints and floats; hex notation

File:

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

cpp/frams/param/param.cpp

@@ -499 +499 @@
 }
 
-static bool stringIsNumeric(const char* str)
-{//   /-?.?[0-9]+/
-        if (!str) return false;
-        if (*str == '-') str++;
-        if (*str == '.') str++;
-        return isdigit(*str) != 0;
-}
-
 int ParamInterface::setInt(int i, const char* str)
 {
-        if (!stringIsNumeric(str))
+        paInt value;
+        if (!ExtValue::parseInt(str,value,false,true))
         {
                 paInt mn, mx, def;
@@ -518 +511 @@
         }
         else
-                return setInt(i, ExtValue::getInt(str));
+                return setInt(i, value);
 }
 
 int ParamInterface::setDouble(int i, const char* str)
 {
-        if (!stringIsNumeric(str))
+        double value;
+        if (!ExtValue::parseDouble(str,value,true))
         {
                 double mn, mx, def;
@@ -532 +526 @@
         }
         else
-                return setDouble(i, ExtValue::getDouble(str));
+                return setDouble(i, value);
 }