Changeset 640 for cpp

Timestamp:

12/05/16 02:31:34 (8 years ago)

Author:

Maciej Komosinski

Message:

Introduced a separate function to provide a human-friendly description of a given param-item type

Location:

cpp/frams

Files:

• model/modelparts.cpp (modified) (1 diff)
• param/param.cpp (modified) (1 diff)
• param/param.h (modified) (1 diff)

cpp/frams/model/modelparts.cpp

@@ -159 +159 @@
                 {
                 if (i) t+="\n";
-                t+="   "; t+=p.name(i); t+=" ("; t+=p.id(i); t+=")";
-                switch(*p.type(i))
-                        {
-                        case 'd': t+=" integer";
-                        {paInt a,b,c; int n=p.getMinMax(i,a,b,c); if (n>=2) 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=p.getMinMax(i,a,b,c); if (n>=2) t+=SString::sprintf(" %g..%g",a,b); if (n>=3) t+=SString::sprintf(" (default %g)",c);}
-                                break;
-                        case 's': t+=" string";
-                        {int a,b; SString c; int n=p.getMinMax(i,a,b,c); if ((n>=2)&&(b>0)) t+=SString::sprintf(", max %d chars",b); if (n>=3) t+=SString::sprintf(" (default \"%s\")",c.c_str());}
-                                break;
-                        case 'x': t+=" anything"; break;
-                        }
+                t+="   "; t+=p.name(i); t+=" ("; t+=p.id(i); t+=") ";
+                t+=p.describeType(i);
                 if (h=p.help(i)) if (*h) {t+=" - "; t+=h;}
                 }

cpp/frams/param/param.cpp

@@ -739 +739 @@
 }
 
+SString ParamInterface::describeType(const char* type)
+{
+SString t;
+switch(type[0])
+        {
+        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);}
+        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);}
+        break;
+        case 's': t+="string";
+        {int a,b; SString c; int n=getMinMax(type,a,b,c); if ((n>=2)&&(b>0)) t+=SString::sprintf(", max %d chars",b); if (n>=3) t+=SString::sprintf(" (default \"%s\")",c.c_str());}
+        break;
+        case 'x': t+="untyped value"; break;
+        case 'p': t+="function"; break;
+        case 'o': t+="object"; if (type[1]) {t+=" of class "; t+=type+1;} break;
+        default: return "unknown type";
+        }
+return t;
+}
+
 //////////////////////////////// PARAM ////////////////////////////////////
 

cpp/frams/param/param.h

@@ -155 +155 @@
         void setMax(int i);
 
+        /** return the human readable description of the given type */
+        static SString describeType(const char* type);
+        SString describeType(int i) {return describeType(type(i));}
+        
         /** copy all property values from other ParamInterface object */
         void copyFrom(ParamInterface *src);