Changeset 81 for cpp/gdk/syntparam.cpp

Timestamp:

02/08/13 03:29:17 (11 years ago)

Author:

Maciej Komosinski

Message:

improved parsing of properties (e.g. in f0 genotypes)

File:

• cpp/gdk/syntparam.cpp (modified) (5 diffs)

cpp/gdk/syntparam.cpp

@@ -8 +8 @@
 #include <math.h>
 
-SyntParam::SyntParam(ParamEntry *init_pe,SString* autostr)
+SyntParam::SyntParam(ParamEntry *init_pe,SString* autostr,bool handle_defaults_when_saving)
         :autostring(autostr)
 {
@@ -14 +14 @@
 pe=ParamObject::makeParamTab(this);
 Param::setParamTab(pe);
+if (handle_defaults_when_saving)
+        {
+        def_obj=ParamObject::makeObject(pe);
+        Param::select(def_obj);
+        Param::setDefault();
+        }
+else
+        def_obj=NULL;
 obj=ParamObject::makeObject(pe);
 Param::select(obj);
@@ -27 +35 @@
 Param::setParamTab(pe);
 obj=ParamObject::dupObject(src.obj);
+def_obj=src.def_obj ? ParamObject::dupObject(src.def_obj) : NULL;
 Param::select(obj);
 }
@@ -35 +44 @@
 ParamObject::freeParamTab(pe);
 ParamObject::freeObject(obj);
+ParamObject::freeObject(def_obj);
 }
 
@@ -40 +50 @@
 {
 if (!s) s=autostring;
-if (s) {*s=""; Param::save2(*s,0,0);}
+if (s) {*s=""; Param::save2(*s,def_obj,0);}
 }