Changeset 1002 for cpp/frams

Timestamp:

07/14/20 00:22:32 (4 years ago)

Author:

Maciej Komosinski

Message:

Model::rawGeno() now ignores model validity

Location:

cpp/frams/model

Files:

• model.cpp (modified) (1 diff)
• model.h (modified) (1 diff)

cpp/frams/model/model.cpp

@@ -441 +441 @@
 {
         Geno tmpgen;
-        makeGeno(tmpgen);
+        makeGeno(tmpgen, NULL, true, true);
         return tmpgen;
 }
 
-void Model::makeGeno(Geno &g, MultiMap *map, bool handle_defaults)
-{
-        if ((buildstatus != valid) && (buildstatus != building))
+void Model::makeGeno(Geno &g, MultiMap *map, bool handle_defaults, bool can_be_invalid)
+{
+        if ((buildstatus != valid) && (!can_be_invalid))
         {
                 g = Geno("", Geno::FORMAT_INVALID, "", "invalid model");

cpp/frams/model/model.h

@@ -215 +215 @@
 
         /// make f0 genotype from current construction (low level version of getF0Geno)
-        void makeGeno(Geno &, MultiMap *map = 0, bool handle_defaults = true);
+        void makeGeno(Geno &, MultiMap *map = 0, bool handle_defaults = true, bool can_be_invalid = false);
 
         /** @return Mapping from source genotype (0-based position in text) to model elements reference numbers.