[cig-commits] r13092 - cs/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-10-15 13:26:47 -0700 (Wed, 15 Oct 2008)
New Revision: 13092

Modified:
   cs/cigma/trunk/src/io_file_reader.cpp
   cs/cigma/trunk/src/py_FileReader.cpp
   cs/cigma/trunk/src/py_FileReader.h
Log:
Added some FileReader-related fixes

Modified: cs/cigma/trunk/src/io_file_reader.cpp
===================================================================
--- cs/cigma/trunk/src/io_file_reader.cpp	2008-10-15 20:01:58 UTC (rev 13091)
+++ cs/cigma/trunk/src/io_file_reader.cpp	2008-10-15 20:26:47 UTC (rev 13092)
@@ -28,10 +28,9 @@
 {
 }
 
-
 // ----------------------------------------------------------------------------
 
-FileReader *New(std::string filename, std::string mode)
+FileReader* FileReader::New(std::string filename, std::string mode)
 {
     // XXX: return a boost::shared_ptr 
 

Modified: cs/cigma/trunk/src/py_FileReader.cpp
===================================================================
--- cs/cigma/trunk/src/py_FileReader.cpp	2008-10-15 20:01:58 UTC (rev 13091)
+++ cs/cigma/trunk/src/py_FileReader.cpp	2008-10-15 20:26:47 UTC (rev 13092)
@@ -23,17 +23,17 @@
 
 int pyFileReader::getDataset(const char *loc, double **data, int *num, int *dim)
 {
-    return 0;
+    return -1;
 }
 
 int pyFileReader::getCoordinates(const char *loc, double **coordinates, int *nno, int *nsd)
 {
-    return 0;
+    return -1;
 }
 
 int pyFileReader::getConnectivity(const char *loc, int **connectivity, int *nel, int *ndofs)
 {
-    return 0;
+    return -1;
 }
 
 // ----------------------------------------------------------------------------
@@ -109,21 +109,18 @@
         ;
 
 #ifdef HAVE_HDF5
-    class_<pyHDF5Reader>("HDF5Reader")
-        .def(init<std::string>())
+    class_<pyHDF5Reader, boost::noncopyable>("HDF5Reader")
         .def("open", &pyHDF5Reader::open)
         .def("close", &pyHDF5Reader::close)
         ;
 #endif
 
 #ifdef HAVE_VTK
-    class_<pyVTKReader>("VTKReader")
-        .def(init<std::string>())
+    class_<pyVTKReader, boost::noncopyable>("VTKReader")
         .def("open", &pyVTKReader::open)
         .def("close", &pyVTKReader::close)
         ;
-    class_<pyUCDReader>("UCDReader")
-        .def(init<std::string())
+    class_<pyUCDReader, boost::noncopyable>("UCDReader")
         .def("open", &pyUCDReader::open)
         .def("close", &pyUCDReader::close)
         ;

Modified: cs/cigma/trunk/src/py_FileReader.h
===================================================================
--- cs/cigma/trunk/src/py_FileReader.h	2008-10-15 20:01:58 UTC (rev 13091)
+++ cs/cigma/trunk/src/py_FileReader.h	2008-10-15 20:26:47 UTC (rev 13092)
@@ -45,6 +45,8 @@
 #ifdef HAVE_HDF5
 struct pyHDF5Reader : cigma::HDF5_Reader
 {
+    int open(const char *filename);
+    int close();
 };
 #endif
 
@@ -52,9 +54,13 @@
 #ifdef HAVE_VTK
 struct pyVTKReader : cigma::VtkReader
 {
+    int open(const char *filename);
+    int close();
 };
 struct pyUCDReader : cigma::UCD_Reader
 {
+    int open(const char *filename);
+    int close();
 };
 #endif