Changeset 1077

Timestamp:

07/06/06 11:28:10 (18 years ago)

Author:

mar637

Message:

enabled another constructor to handle disk based tables; chnaged this interface to be int instead of string.

Location:

trunk/src

Files:

• ScantableWrapper.h (modified) (1 diff)
• python_STFiller.cpp (modified) (2 diffs)
• python_Scantable.cpp (modified) (1 diff)

trunk/src/ScantableWrapper.h

@@ -37 +37 @@
 public:
   ScantableWrapper( const std::string& name,
-                    const std::string& type="")
+                    int type=0)
   {
     casa::Table::TableType tp = casa::Table::Memory;
-    if ( type == "disk") tp = casa::Table::Plain;
+    if ( type == 1 ) tp = casa::Table::Plain;
     table_ = new Scantable(name, tp);
   }
 
-  ScantableWrapper(const std::string& type="")
+  ScantableWrapper(int type=0)
   {
     casa::Table::TableType tp = casa::Table::Memory;
-    if ( type == "disk") tp = casa::Table::Plain;
+    if ( type == 1) tp = casa::Table::Plain;
     table_= new Scantable(tp);
   }

trunk/src/python_STFiller.cpp

@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id:
+//# $Id:$
 //#---------------------------------------------------------------------------
 #include <boost/python.hpp>
 
+#include "ScantableWrapper.h"
 #include "STFillerWrapper.h"
 
@@ -40 +41 @@
     void python_STFiller() {
       class_<STFillerWrapper>("stfiller")
+        .def( init < ScantableWrapper > () )
         .def( init < std::string, int, int > () )
         .def("_open", &STFillerWrapper::open)

trunk/src/python_Scantable.cpp

@@ -44 +44 @@
   class_<ScantableWrapper>("Scantable")
     //.def( init <> () )
-    .def( init < const std::string&, const std::string& > () )
+    .def( init < int > () )
+    .def( init < const std::string&, int > () )
     .def( init < const ScantableWrapper& > () )
     .def("_copy", &ScantableWrapper::copy)