Changeset 988 for cpp/frams/model


Ignore:
Timestamp:
07/09/20 00:13:20 (5 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:
1 edited

Legend:

Unmodified
Added
Removed

  • cpp/frams/model/model.cpp

    r975 r988  
    351351                return;
    352352        }
     353        if (declared_shape == SHAPE_UNKNOWN)
     354                declareShapeType(shapeTypeForGenoFormat(f0geno.getFormat()));
    353355        SString f0txt = f0geno.getGenes();
    354356        buildstatus = building; // was: open();
    … …  
    447449        if ((buildstatus != valid) && (buildstatus != building))
    448450        {
    449                 g = Geno("", Geno::INVALID_FORMAT, "", "invalid model");
     451                g = Geno("", Geno::FORMAT_INVALID, "", "invalid model");
    450452                return;
    451453        }
    … …  
    563565                return "0s";
    564566        default:
    565                 return Geno::INVALID_FORMAT;
     567                return Geno::FORMAT_INVALID;
    566568        }
    567569}
Note: See TracChangeset for help on using the changeset viewer.