Changeset 972 for cpp/frams/model/model.h

Timestamp:

07/03/20 00:32:23 (5 years ago)

Author:

Maciej Komosinski

Message:

• separate "0" and "0s" formats (for SHAPE_BALL_AND_STICK and SHAPE_SOLIDS, respectively)
• converting to format list (Geno::F0_FORMAT_LIST = "0,0s")
• (optional) declaring Model as SHAPE_BALL_AND_STICK or SHAPE_SOLIDS (or SHAPE_UNKNOWN)

File:

• cpp/frams/model/model.h (modified) (4 diffs)

cpp/frams/model/model.h

@@ -102 +102 @@
 protected:
         ShapeType shape;
+        ShapeType declared_shape;
 
         SString nameForErrors() const;
         int internalcheck(CheckType check);
 
-        void init(const Geno &srcgen, bool _using_checkpoints, bool _is_checkpoint);
-        void init();
+        void init(const Geno &srcgen, ShapeType sh, bool _using_checkpoints, bool _is_checkpoint);
+        void init(ShapeType sh);
 
         void delMap();
@@ -136 +137 @@
         bool isUsingCheckpoints() const { return using_checkpoints; }
         bool isCheckpoint() const { return is_checkpoint; }
+        static SString genoFormatForShapeType(ShapeType st);
+        static ShapeType shapeTypeForGenoFormat(const SString& format);
+        static const char* getShapeTypeName(ShapeType sh);
 
         void updateRefno(); // set ::refno for all elements
@@ -150 +154 @@
         ModelUserTags userdata;
 
-        /// Create empty model with invalid empty genotype
-        Model();
+        /// Create empty model with invalid empty genotype, declaring the shape type for later operations
+        Model(ShapeType sh = SHAPE_UNKNOWN);
+
+        /// Change the declared shape type of the Model
+        void declareShapeType(ShapeType sh);
 
         /** Create a model based on provided genotype
@@ -158 +165 @@
            @see getMap()
            */
-        Model(const Geno &src, bool buildmaps = false, bool _using_checkpoints = false, bool _is_checkpoint = false);
+        Model(const Geno &src, ShapeType sh, bool buildmaps = false, bool _using_checkpoints = false, bool _is_checkpoint = false);
         Model(const Model &mod, bool buildmaps = false, bool _using_checkpoints = false, bool _is_checkpoint = false);
         /** duplicate the model.