Changeset 299 for cpp

Timestamp:

01/17/15 02:43:46 (9 years ago)

Author:

Maciej Komosinski

Message:

Instead of linking with stdiofile-autoinit.cpp, create an object StdioFileSystem_autoselect stdiofilesys;

Location:

cpp/frams

Files:

• Makefile-SDK-files (modified) (2 diffs)
• _demos/geometry/geometrytestutils.cpp (modified) (4 diffs)
• _demos/loader_test.cpp (modified) (2 diffs)
• virtfile/stdiofile-autoinit.cpp (deleted)
• virtfile/stdiofile.h (modified) (1 diff)

cpp/frams/Makefile-SDK-files

@@ -31 +31 @@
 F0_VARIANTS_OBJS=frams/_demos/f0_variants_test.o frams/virtfile/stringfile.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o   $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
 
-LOADER_TEST_OBJS=frams/_demos/genotypeloader.o frams/_demos/loader_test.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
+LOADER_TEST_OBJS=frams/_demos/genotypeloader.o frams/_demos/loader_test.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
 
 GENOCONV_TEST_OBJS= frams/_demos/genoconv_test.o frams/_demos/printconvmap.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o  $(SDK_OBJS) $(GENOCONV_SDK_OBJS)
@@ -55 +55 @@
 NEURO_LAYOUT_TEST_OBJS= frams/_demos/neuro_layout_test.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS) frams/canvas/nn_layout_model.o frams/canvas/nn_simple_layout.o frams/canvas/nn_smart_layout.o
 
-GEOMETRY_INFO_TEST_OBJS=frams/_demos/geometry/info_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
+GEOMETRY_INFO_TEST_OBJS=frams/_demos/geometry/info_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
 
-GEOMETRY_SURFACE_TEST_OBJS=frams/_demos/geometry/surface_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
+GEOMETRY_SURFACE_TEST_OBJS=frams/_demos/geometry/surface_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
 
-GEOMETRY_VOLUME_TEST_OBJS=frams/_demos/geometry/volume_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
+GEOMETRY_VOLUME_TEST_OBJS=frams/_demos/geometry/volume_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
 
-GEOMETRY_APICES_TEST_OBJS=frams/_demos/geometry/apices_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile-autoinit.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)
+GEOMETRY_APICES_TEST_OBJS=frams/_demos/geometry/apices_test.o frams/_demos/geometry/geometrytestutils.o frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GEOMETRY_OBJS)

cpp/frams/_demos/geometry/geometrytestutils.cpp

@@ -6 +6 @@
 
 #include "../genotypeloader.h"
+#include <frams/virtfile/stdiofile.h>
 #include <math.h>
 #include <stdio.h>
@@ -119 +120 @@
 {
         srand(time(NULL));
+        StdioFileSystem_autoselect stdiofilesys;
         
         if ((argc == 3) && (strcmp("-l", argv[1]) == 0))
@@ -178 +180 @@
 {
         srand(time(NULL));
+        StdioFileSystem_autoselect stdiofilesys;
         
         if ((argc == 3) && (strcmp("-l", argv[1]) == 0))
@@ -215 +218 @@
                 "GENO_ID - either genotype name or index (1-based)\n"
                 "DENSITY - minimal number of samples per unit\n"
-                "SHAPE - 1=ellipsoid, 2=cuboid, 3=cylinder, others or none=random",
+                "SHAPE - 1=ellipsoid, 2=cuboid, 3=cylinder, others or none=random\n",
                 (const char*)header);
         return 1;

cpp/frams/_demos/loader_test.cpp

@@ -4 +4 @@
 
 #include "genotypeloader.h"
+#include <frams/virtfile/stdiofile.h>
 
 /**
@@ -24 +25 @@
 
 long count=0,totalsize=0;
+StdioFileSystem_autoselect stdiofilesys;
 MiniGenotypeLoader loader(argv[1]);
 const char* selected=(argc<3)?NULL:argv[2];

cpp/frams/virtfile/stdiofile.h

@@ -107 +107 @@
 };
 
+class StdioFileSystem_autoselect: public StdioFileSystem
+{
+public:
+StdioFileSystem_autoselect()
+        {
+        VirtFILE::selectFileSystem(this);
+        }
+};
+
 #endif
-