Changeset 988 for cpp/frams/model/model.cpp

Timestamp:

07/09/20 00:13:20 (4 years ago)

Author:

Maciej Komosinski

Message:

Building a Model from Geno now fails when Model.shape is incompatible with Geno.format; renamed enum constants for genetic formats: xxx_FORMAT => FORMAT_xxx

File:

• cpp/frams/model/model.cpp (modified) (3 diffs)

cpp/frams/model/model.cpp

@@ -351 +351 @@
                 return;
         }
+        if (declared_shape == SHAPE_UNKNOWN)
+                declareShapeType(shapeTypeForGenoFormat(f0geno.getFormat()));
         SString f0txt = f0geno.getGenes();
         buildstatus = building; // was: open();
@@ -447 +449 @@
         if ((buildstatus != valid) && (buildstatus != building))
         {
-                g = Geno("", Geno::INVALID_FORMAT, "", "invalid model");
+                g = Geno("", Geno::FORMAT_INVALID, "", "invalid model");
                 return;
         }
@@ -563 +565 @@
                 return "0s";
         default:
-                return Geno::INVALID_FORMAT;
+                return Geno::FORMAT_INVALID;
         }
 }