Changeset 278 for cpp/frams

Timestamp:

12/22/14 23:21:16 (10 years ago)

Author:

Maciej Komosinski

Message:

setDefault(numericonly) removed. 's', 'x' and 'o' are no special cases anymore

Location:

cpp/frams/param

Files:

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

cpp/frams/param/param.cpp

@@ -117 +117 @@
 }
 
-void ParamInterface::setDefault(bool numericonly)
+void ParamInterface::setDefault()
 {
         int n = getPropCount();
         for (int i = 0; i < n; i++)
-                setDefault(i, numericonly);
+                setDefault(i);
 }
 
@@ -138 +138 @@
 }
 
-void ParamInterface::setDefault(int i, bool numericonly)
+void ParamInterface::setDefault(int i)
 {
         const char *t = type(i);
@@ -157 +157 @@
         }
                 break;
-        case 's': if (!numericonly)
+        case 's': case 'x':
         {
                 int a,b; SString c;
                 getMinMax(i,a,b,c);
-                setString(i,c);
+                if (*t=='s')
+                        setString(i,c);
+                else
+                        { if (c.len()>0) setExtValue(i,ExtValue(c)); else setExtValue(i,ExtValue::empty()); }
         }
                 break;
-        default: if (!numericonly) set(i, "");
+        case 'o':
+                setObject(i,ExtObject::empty());
+                break;
         }
 }
@@ -371 +376 @@
 }
 
-int ParamInterface::load(VirtFILE* f,bool warn_unknown_fields)
+int ParamInterface::load(VirtFILE* f,bool warn_unknown_fields,bool *abortable)
 {
         SString buf;
@@ -379 +384 @@
         bool loaded;
         int fields_loaded = 0;
-        while (loadSStringLine(f, buf))
+        while ( ((!abortable)||(!*abortable)) && loadSStringLine(f, buf) )
         {
                 const char* t = (const char*)buf;
@@ -908 +913 @@
 }
 
-void SimpleAbstractParam::setDefault(bool numericonly)
+void SimpleAbstractParam::setDefault()
 {
         bool save = dontcheckchanges;
         dontcheckchanges = 1;
-        ParamInterface::setDefault(numericonly);
+        ParamInterface::setDefault();
         dontcheckchanges = save;
 }
 
-void SimpleAbstractParam::setDefault(int i, bool numericonly)
+void SimpleAbstractParam::setDefault(int i)
 {
         bool save = dontcheckchanges;
         dontcheckchanges = 1;
-        ParamInterface::setDefault(i, numericonly);
+        ParamInterface::setDefault(i);
         dontcheckchanges = save;
 }

cpp/frams/param/param.h

@@ -138 +138 @@
         int getMinMax(int prop, int& minumum, int& maximum, SString& def);
 
-        virtual void setDefault(bool numericonly = false);
-        virtual void setDefault(int i, bool numericonly = false);
+        virtual void setDefault();
+        virtual void setDefault(int i);
         void setMin();
         void setMax();
@@ -158 +158 @@
         int save(VirtFILE*, const char* altname = NULL, bool force = 0);
         int saveprop(VirtFILE*, int i, const char* p, bool force = 0);
-        int load(VirtFILE*,bool warn_unknown_fields=true);///< @return the number of fields loaded
+        int load(VirtFILE*,bool warn_unknown_fields=true,bool *abortable=NULL);///< @return the number of fields loaded
         int load2(const SString &, int &);///< @return the number of fields loaded
 
@@ -284 +284 @@
         void save2(SString&, void *defdata, bool addcr = true, bool all_names = true);
 
-        virtual void setDefault(bool numericonly = false);
-        virtual void setDefault(int i, bool numericonly = false);
+        virtual void setDefault();
+        virtual void setDefault(int i);
 
 #ifdef DEBUG