Changeset 473 for cpp/frams/_demos/loader_test.cpp

Timestamp:

02/18/16 02:32:57 (8 years ago)

Author:

sz

Message:

• MiniGenotype? extended to handle all Genotype fields contained in .gen files
• loader_test now displays any MiniGenotype? field instead of the raw genotype when given the field name
• MiniGenotypeLoader? and stdiofile.o included in SDK_LIB_OBJS

File:

• cpp/frams/_demos/loader_test.cpp (modified) (3 diffs)

cpp/frams/_demos/loader_test.cpp

@@ -17 +17 @@
 if (argc<2)
         {
-        fprintf(stderr,"Arguments: filename [optional: genotype name or index (1-based)]\n"
-             "If a genotype is indicated (by providing the optional genotype identifier), the program will output the raw genotype, suitable for Framsticks Theater's genotype viewer mode. If the second optional argument is not given, the genotype names from the file will be listed.\n"
+        fprintf(stderr,"Arguments: filename [genotype name or index (1-based) [field name]]\n"
+             "If a genotype is indicated (by providing the optional genotype identifier), the program will output the raw genotype, suitable for Framsticks Theater's genotype viewer mode. If a genotype and a field name is given, the field value (instead of the raw genotype) is printed. If the second argument is not given, the genotype names from the file will be listed.\n"
              "Example: loader_test walking.gen \"Basic Quadruped\" | theater -g -\n"
                 );
@@ -28 +28 @@
 MiniGenotypeLoader loader(argv[1]);
 const char* selected=(argc<3)?NULL:argv[2];
+const char* field_name=(argc<4)?NULL:argv[3];
 int selected_index=(selected&&isdigit(selected[0]))?atol(selected):0;
 // using char* constructor (passing the file name to open)
@@ -48 +49 @@
                                 continue;
                         }
-                puts(loaded->genotype.c_str());
+                if (field_name)
+                        {
+                        Param p(minigenotype_paramtab,loaded);
+                        int field_index=p.findId(field_name);
+                        if (field_index<0)
+                                {
+                                printf("Field '%s' not found\n",field_name);
+                                return 3;
+                                }
+                        else
+                                puts(p.get(field_index).c_str());
+                                }
+                        else
+                                puts(loaded->genotype.c_str());
                 return 0;
                 }