Changeset 81 for cpp/gdk/modelparts.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/modelparts.cpp (modified) (7 diffs)

cpp/gdk/modelparts.cpp

@@ -193 +193 @@
 #include "defassign-f0_neuro.h"
 state=0.0;
-myclass=0;
-knownclass=1;
+myclass=NULL;
+myclassname="N";//default d="N" but f0.def is unable to set this (d is GETSET, not a regular FIELD)
+knownclass=0;
 refno=0;
 pos=Pt3D_0; rot=Pt3D_0;
@@ -343 +344 @@
 }
 
-SyntParam Neuro::classProperties()
+SyntParam Neuro::classProperties(bool handle_defaults_when_saving)
 {
 NeuroClass *cl=getClass();
 ParamEntry *pe = cl ? cl->getParamTab() : emptyParamTab;
-return SyntParam(pe,&myclassparams);
+return SyntParam(pe,&myclassparams,handle_defaults_when_saving);
 }
 
@@ -507 +508 @@
         ret->setEmpty();
 else
-        ret->setObject(ExtObject(&st_neuroparam,inputs(i).n));
+        ret->setObject(ExtObject(&Neuro::getStaticParam(),inputs(i).n));
 }
 
@@ -648 +649 @@
 }
 
+Param& Part::getStaticParam()
+{
+static Param p(f0_part_paramtab,0,"Part");
+return p;
+}
+
+
 ///////////////////////////
 
@@ -707 +715 @@
 return usedelta;
 }
+
+Param& Joint::getStaticParam()
+{
+static Param p(f0_joint_paramtab,0,"Joint");
+return p;
+}
+
 
 /////////////////////////////////////////////////////////////////
@@ -822 +837 @@
 };
 
+Param& Neuro::getStaticParam()
+{
+static Param p(f0_neuro_paramtab,0,"NeuroDef");
+return p;
+}
+
 ////////////////////////
 
@@ -843 +864 @@
 {setClassName(arg->getString());return PSET_CHANGED;}
 
-Param st_neuroparam(f0_neuro_paramtab,0,"NeuroDef");
-Param st_jointparam(f0_joint_paramtab,0,"Joint");
-Param st_partparam(f0_part_paramtab,0,"Part");
-
-
+