Changeset 526

Timestamp:

07/18/16 04:12:06 (8 years ago)

Author:

Maciej Komosinski

Message:

Geno::toString() renamed to Geno::getGeneAndFormat()

Location:

cpp/frams

Files:

• _demos/full_props.cpp (modified) (1 diff)
• _demos/geometry/apices_test.cpp (modified) (1 diff)
• _demos/geometry/info_test.cpp (modified) (1 diff)
• _demos/geometry/surface_test.cpp (modified) (1 diff)
• _demos/geometry/volume_test.cpp (modified) (1 diff)
• _demos/part_shapes.cpp (modified) (1 diff)
• _demos/shapeconvert.cpp (modified) (1 diff)
• vm/classes/genoobj.cpp (modified) (2 diffs)

cpp/frams/_demos/full_props.cpp

@@ -97 +97 @@
 Geno f0_g;
 m.makeGeno(f0_g,NULL,reverse);//third arg is "handle_defaults" == whether f0 should omit default property values
-puts(f0_g.toString().c_str());
+puts(f0_g.getGeneAndFormat().c_str());
 
 return 0;

cpp/frams/_demos/geometry/apices_test.cpp

@@ -47 +47 @@
         // Finishing result Model and printing its genotype.
         resultModel.close();
-        puts(resultModel.getF0Geno().toString().c_str());
+        puts(resultModel.getF0Geno().getGeneAndFormat().c_str());
 }
 

cpp/frams/_demos/geometry/info_test.cpp

@@ -72 +72 @@
         // Finishing result Model and printing its genotype.
         resultModel.close();
-        puts(resultModel.getF0Geno().toString().c_str());
+        puts(resultModel.getF0Geno().getGeneAndFormat().c_str());
         
         // Printing calculated values.

cpp/frams/_demos/geometry/surface_test.cpp

@@ -47 +47 @@
         // Finishing result Model and printing its genotype.
         resultModel.close();
-        puts(resultModel.getF0Geno().toString().c_str());
+        puts(resultModel.getF0Geno().getGeneAndFormat().c_str());
 }
 

cpp/frams/_demos/geometry/volume_test.cpp

@@ -39 +39 @@
         // Finishing result Model and printing its genotype.
         resultModel.close();
-        puts(resultModel.getF0Geno().toString().c_str());
+        puts(resultModel.getF0Geno().getGeneAndFormat().c_str());
 }
 

cpp/frams/_demos/part_shapes.cpp

@@ -52 +52 @@
 
         m.close();
-        puts(m.getF0Geno().toString().c_str());
+        puts(m.getF0Geno().getGeneAndFormat().c_str());
         // the genotype can be fed directly to the genotype viewer, like this:
         // part_shapes | theater -g -

cpp/frams/_demos/shapeconvert.cpp

@@ -87 +87 @@
 
         Geno f0_g = newmodel.getF0Geno();
-        puts(f0_g.toString().c_str());
+        puts(f0_g.getGeneAndFormat().c_str());
 
         return 0;

cpp/frams/vm/classes/genoobj.cpp

@@ -80 +80 @@
 void GenoObj::get_string(ExtValue *ret)
 {
-        ret->setString(shortString());
+        ret->setString(getGeneAndFormat());
 }
 
@@ -178 +178 @@
 {
         VectorObject *vec = new VectorObject;
-        vec->data += new ExtValue(shortString());
+        vec->data += new ExtValue(getGeneAndFormat());
         vec->data += new ExtValue(getName());
         vec->data += new ExtValue(getComment());