Changeset 534 for cpp/frams/_demos


Ignore:
Timestamp:
07/20/16 01:17:14 (4 years ago)
Author:
Maciej Komosinski
Message:

Renamed: get/setGene -> get/setGenes, setGeneOnly -> setGenesAssumingSameFormat

Location:
cpp/frams/_demos
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/_demos/f0_variants_test.cpp

    r391 r534  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
     
    9494        }
    9595Geno g(gen);
    96 printf("\nSource genotype: '%s'\n",g.getGene().c_str());
     96printf("\nSource genotype: '%s'\n",g.getGenes().c_str());
    9797printf("                  ( format %c %s)\n",
    9898       g.getFormat(), g.getComment().c_str());
  • cpp/frams/_demos/full_props.cpp

    r526 r534  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
     
    9797Geno f0_g;
    9898m.makeGeno(f0_g,NULL,reverse);//third arg is "handle_defaults" == whether f0 should omit default property values
    99 puts(f0_g.getGeneAndFormat().c_str());
     99puts(f0_g.getGenesAndFormat().c_str());
    100100
    101101return 0;
  • cpp/frams/_demos/genoconv_test.cpp

    r527 r534  
    5151mod.getPart(1)->p=Pt3D(0,0.2,-1);
    5252mod.close();
    53 return mod.getGeno().getGene();
     53return mod.getGeno().getGenes();
    5454}
    5555~GenoConv_Test2() {}
     
    112112{
    113113printf("Genotype:\n%s\nFormat: %c\nValid: %s\nComment: %s\n",
    114         g.getGene().c_str(),g.getFormat(),g.isValid()?"yes":"no",g.getComment().c_str());
     114        g.getGenes().c_str(),g.getFormat(),g.isValid()?"yes":"no",g.getComment().c_str());
    115115}
    116116
     
    159159        printf("conversion map:\n");
    160160        m.print();
    161         printConvMap(g1.getGene(),g2.getGene(),m);
     161        printConvMap(g1.getGenes(),g2.getGenes(),m);
    162162        printf("reverse conversion map:\n");
    163163        MultiMap rm;
    164164        rm.addReversed(m);
    165165        rm.print();
    166         printConvMap(g2.getGene(),g1.getGene(),rm);
     166        printConvMap(g2.getGenes(),g1.getGenes(),rm);
    167167        }
    168168
    169169Model mod1(g1,1);
    170170printf("\nmodel map for f%c genotype:\n",g1.getFormat());
    171 printModelMap(g1.getGene(),mod1.getMap());
     171printModelMap(g1.getGenes(),mod1.getMap());
    172172mod1.getMap().print();
    173173Model mod2(g2,1);
    174174printf("\nmodel map for f%c genotype:\n",g2.getFormat());
    175 printModelMap(g2.getGene(),mod2.getMap());
     175printModelMap(g2.getGenes(),mod2.getMap());
    176176mod2.getMap().print();
    177177return 0;
  • cpp/frams/_demos/genomanipulation.cpp

    r391 r534  
    7979CHANGE_ONE_PROPERTY(p->extraProperties());
    8080p->getModel().close();
    81 printf("\nLet's see f0... (check out part #%d !)\n\n%s\n", p->refno, p->getModel().getF0Geno().getGene().c_str());
     81printf("\nLet's see f0... (check out part #%d !)\n\n%s\n", p->refno, p->getModel().getF0Geno().getGenes().c_str());
    8282}
    8383
     
    9191j->getModel().close();
    9292printf("The Part's position is changed, but everything else stays intact:\n\n%s\n",
    93        j->getModel().getF0Geno().getGene().c_str());
     93       j->getModel().getF0Geno().getGenes().c_str());
    9494}
    9595
     
    104104j->getModel().close();
    105105printf("Position of the second Part referenced by this joint (part #%d) is now changed:\n\n%s\n",
    106        j->part2->refno, j->getModel().getF0Geno().getGene().c_str());
     106       j->part2->refno, j->getModel().getF0Geno().getGenes().c_str());
    107107printf("If no delta fields are defined, they will be computed automatically.\n"
    108108       "You can always delete existing delta values by using Joint::resetDelta().\n"
     
    112112j->resetDelta();
    113113j->getModel().close();
    114 printf("As you can see, Joint's delta fields have altered:\n\n%s\n", j->getModel().getF0Geno().getGene().c_str());
     114printf("As you can see, Joint's delta fields have altered:\n\n%s\n", j->getModel().getF0Geno().getGenes().c_str());
    115115}
    116116
     
    123123j->getModel().close();
    124124printf("f0 is now:\n\n%s\n...so this is %s joint.\n",
    125        j->getModel().getF0Geno().getGene().c_str(), option?"a delta":"an absolute");
     125       j->getModel().getF0Geno().getGenes().c_str(), option?"a delta":"an absolute");
    126126
    127127}
     
    155155CHANGE_ONE_PROPERTY(j->extraProperties());
    156156j->getModel().close();
    157 printf("And after that we have this genotype:\n\n%s\n", j->getModel().getF0Geno().getGene().c_str());
     157printf("And after that we have this genotype:\n\n%s\n", j->getModel().getF0Geno().getGenes().c_str());
    158158}
    159159
     
    250250n->getModel().close();
    251251printf("The final object description will be then: '%s'\nAnd the full f0 genotype:\n\n%s\n",
    252        n->getDetails().c_str(), n->getModel().getF0Geno().getGene().c_str());
     252       n->getDetails().c_str(), n->getModel().getF0Geno().getGenes().c_str());
    253253
    254254
     
    281281        }
    282282Geno g(gen);
    283 printf("\nSource genotype: '%s'\n",g.getGene().c_str());
     283printf("\nSource genotype: '%s'\n",g.getGenes().c_str());
    284284printf("                  ( format %c %s)\n",
    285285       g.getFormat(), g.getComment().c_str());
     
    292292        return 2;       
    293293        }
    294 printf("Converted to f0:\n%s\n",m.getF0Geno().getGene().c_str());
     294printf("Converted to f0:\n%s\n",m.getF0Geno().getGenes().c_str());
    295295
    296296printf("Model contains: %d part(s)\n"
  • cpp/frams/_demos/genooper_test.cpp

    r532 r534  
    99{
    1010        printf("Genotype: %s\nFormat: %c\nValid: %s\nComment: %s\n",
    11                 g.getGene().c_str(), g.getFormat(), g.isValid() ? "yes" : "no", g.getComment().len() == 0 ? "(empty)" : g.getComment().c_str());
     11                g.getGenes().c_str(), g.getFormat(), g.isValid() ? "yes" : "no", g.getComment().len() == 0 ? "(empty)" : g.getComment().c_str());
    1212}
    1313
     
    4747        printGenAndTitle(gvalidated, "validated");
    4848
    49         printf("\nHTMLized: %s\n", genetics.genman.HTMLize(gvalidated.getGene().c_str()).c_str());
     49        printf("\nHTMLized: %s\n", genetics.genman.HTMLize(gvalidated.getGenes().c_str()).c_str());
    5050
    5151        return 0;
  • cpp/frams/_demos/geometry/apices_test.cpp

    r526 r534  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
     
    4747        // Finishing result Model and printing its genotype.
    4848        resultModel.close();
    49         puts(resultModel.getF0Geno().getGeneAndFormat().c_str());
     49        puts(resultModel.getF0Geno().getGenesAndFormat().c_str());
    5050}
    5151
  • cpp/frams/_demos/geometry/info_test.cpp

    r526 r534  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
     
    7272        // Finishing result Model and printing its genotype.
    7373        resultModel.close();
    74         puts(resultModel.getF0Geno().getGeneAndFormat().c_str());
     74        puts(resultModel.getF0Geno().getGenesAndFormat().c_str());
    7575       
    7676        // Printing calculated values.
  • cpp/frams/_demos/geometry/surface_test.cpp

    r526 r534  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
     
    4747        // Finishing result Model and printing its genotype.
    4848        resultModel.close();
    49         puts(resultModel.getF0Geno().getGeneAndFormat().c_str());
     49        puts(resultModel.getF0Geno().getGenesAndFormat().c_str());
    5050}
    5151
  • cpp/frams/_demos/geometry/volume_test.cpp

    r526 r534  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
     
    3939        // Finishing result Model and printing its genotype.
    4040        resultModel.close();
    41         puts(resultModel.getF0Geno().getGeneAndFormat().c_str());
     41        puts(resultModel.getF0Geno().getGenesAndFormat().c_str());
    4242}
    4343
  • cpp/frams/_demos/multiline_f0_test.cpp

    r391 r534  
    2626        }
    2727Geno g(gen);
    28 printf("\nSource genotype: '%s'\n",g.getGene().c_str());
     28printf("\nSource genotype: '%s'\n",g.getGenes().c_str());
    2929printf("                  ( format %c %s)\n",
    3030       g.getFormat(), g.getComment().c_str());
     
    3737        return 2;       
    3838        }
    39 printf("Converted to f0:\n%s\n",m.getF0Geno().getGene().c_str());
     39printf("Converted to f0:\n%s\n",m.getF0Geno().getGenes().c_str());
    4040
    4141printf("\nusing Param::save() to create the \"expanded\" form of the f0 genotype...\n(MultiParamLoader should be able to load this)");
  • cpp/frams/_demos/part_shapes.cpp

    r526 r534  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
     
    5252
    5353        m.close();
    54         puts(m.getF0Geno().getGeneAndFormat().c_str());
     54        puts(m.getF0Geno().getGenesAndFormat().c_str());
    5555        // the genotype can be fed directly to the genotype viewer, like this:
    5656        // part_shapes | theater -g -
  • cpp/frams/_demos/shapeconvert.cpp

    r526 r534  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
     
    8787
    8888        Geno f0_g = newmodel.getF0Geno();
    89         puts(f0_g.getGeneAndFormat().c_str());
     89        puts(f0_g.getGenesAndFormat().c_str());
    9090
    9191        return 0;
Note: See TracChangeset for help on using the changeset viewer.