Changeset 253

Timestamp:

11/18/14 17:01:07 (10 years ago)

Author:

Maciej Komosinski

Message:

String-type properties can now have a default value stored in their definition, just like numerics

Location:

cpp/frams/param

Files:

• param.cpp (modified) (3 diffs)
• param.h (modified) (3 diffs)

cpp/frams/param/param.cpp

@@ -86 +86 @@
 }
 
+int ParamInterface::getMinMax(int prop, int& minumum, int& maximum, SString& def)
+{
+        const char* t = type(prop) + 1;
+        while (*t) if (*t == ' ') break; else t++;
+        int ret=sscanf(t, "%d %d", &minumum, &maximum);
+        def=SString::empty();
+        if (ret==2)
+                {
+                while (*t==' ') t++;
+                for(int skip_fields=2;skip_fields>0;skip_fields--)
+                        {
+                        while (*t) if (*t == ' ') break; else t++;
+                        while (*t==' ') t++;
+                        }
+                if (*t)
+                        {
+                        const char* til=strchr(t,'~');
+                        if (!til)
+                                def=SString(t);
+                        else
+                                {
+                                while ((til>t)&&(til[-1]==' ')) til--;
+                                def=SString(t,til-t);
+                                }
+                        }
+                return 3;
+                }
+        else
+                return ret;
+}
+
 void ParamInterface::setDefault(bool numericonly)
 {
@@ -125 +156 @@
                 setInt(i, c);
         }
+                break;
+        case 's': if (!numericonly)
+        {
+                int a,b; SString c;
+                getMinMax(i,a,b,c);
+                setString(i,c);
+        }
                 break;
         default: if (!numericonly) set(i, "");
@@ -770 +808 @@
         const char* t = pe->type + 1;
         while (*t) if (*t == ' ') break; else t++;
-        paInt a = 0, b = 0;
+        int a = 0, b = 0;
         int result = 0;
-        if (sscanf(t, PA_INT_SCANF " " PA_INT_SCANF, &a, &b) == 2)
+        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))

cpp/frams/param/param.h

@@ -136 +136 @@
                 @return 0 if min/max/def information is not available */
         int getMinMax(int prop, double& minumum, double& maximum, double& def);
+        int getMinMax(int prop, int& minumum, int& maximum, SString& def);
 
         virtual void setDefault(bool numericonly = false);
@@ -228 +229 @@
 protected:
         virtual void *getTarget(int i);
-        virtual ParamEntry *entry(int i) = 0;
         const char* myname;
         bool dontcheckchanges;
@@ -249 +249 @@
         void* getSelected() { return object; }
 
+        virtual ParamEntry *entry(int i) = 0;
         const char *id(int i) { return (i >= getPropCount()) ? 0 : entry(i)->id; }
         const char *name(int i) { return entry(i)->name; }