Changeset 203

Timestamp:

04/02/14 16:17:01 (11 years ago)

Author:

Maciej Komosinski

Message:

The Geno object can be de/serialized

Location:

cpp/frams/vm/classes

Files:

• genoobj.cpp (modified) (3 diffs)
• genoobj.h (modified) (1 diff)

cpp/frams/vm/classes/genoobj.cpp

@@ -6 +6 @@
 #include <frams/util/extvalue.h>
 #include <frams/model/autoname.h>
+#include "collectionobj.h"
 
 #define FIELDSTRUCT GenoObj
 ParamEntry geno_paramtab[]=
 {
-{"Geno",1,12,"Geno","All information about a single genotype.\nThis is a genetics-only object which does not contain any performance data. See also: Genotype class"},
+{"Geno",1,14,"Geno","All information about a single genotype.\nThis is a genetics-only object which does not contain any performance data. See also: Genotype class"},
 {"name",0,PARAM_NOSTATIC,"Name","s 0 40",GETSET(name),},
 {"rawgenotype",0,PARAM_NOSTATIC+PARAM_READONLY,"Raw genotype","s 1",GETONLY(genotype),"Genotype, excluding the format specifier"},
@@ -23 +24 @@
 {"newFrom",0,0,"create new object","p oGeno(s genotype,d format,s name,s description)",PROCEDURE(p_newfrom),},
 {"autoname",0,PARAM_NOSTATIC+PARAM_READONLY,"Autogenerated name","s",GETONLY(autoname),},
+{"toVector",0,PARAM_READONLY+PARAM_NOSTATIC,"serialization support","oVector",GETONLY(toVector),},
+{"newFromVector",0,0,"serialization support","p oGeno(oVector)",PROCEDURE(p_newfromvector),},
 {0,0,0,},
 };
@@ -111 +114 @@
 return (Geno*)v.getObjectTarget(getStaticParam().getName(), warn);
 }
+
+void GenoObj::get_toVector(ExtValue *ret)
+{
+VectorObject *vec=new VectorObject;
+vec->data+=new ExtValue(shortString());
+vec->data+=new ExtValue(getName());
+vec->data+=new ExtValue(getComment());
+ret->setObject(ExtObject(&VectorObject::par,vec));
+}
+
+void GenoObj::p_newfromvector(ExtValue *args,ExtValue *ret)
+{
+VectorObject *vec=VectorObject::fromObject(args->getObject());
+if (vec && (vec->data.size()>=3))
+        {
+        SString g=vec->get(0)?vec->get(0)->getString():"";
+        SString n=vec->get(1)?vec->get(1)->getString():"";
+        SString c=vec->get(2)?vec->get(2)->getString():"";
+        *ret=makeDynamicObjectAndDecRef(new Geno(g,-1,n,c));
+        }
+else
+        ret->setEmpty();
+}

cpp/frams/vm/classes/genoobj.h

@@ -28 +28 @@
 PARAMPROCDEF(p_newfrom);
 PARAMPROCDEF(p_newfromstring);
+PARAMPROCDEF(p_newfromvector);
+PARAMGETDEF(toVector);
 #undef STATRICKCLASS