Changeset 1786 for branches/newfiller/src

Timestamp:

07/30/10 16:33:06 (14 years ago)

Author:

Malte Marquarding

Message:

Added Wrapper and python binding for Filler

Location:

branches/newfiller/src

Files:

• FillerBase.cpp (modified) (1 diff)
• FillerBase.h (modified) (1 diff)
• FillerWrapper.h (moved) (moved from branches/newfiller/src/Filler.h ) (1 diff)
• python_Filler.cpp (added)

branches/newfiller/src/FillerBase.cpp

@@ -17 +17 @@
 using namespace casa;
 
-namespace asap
-{
-FillerBase::FillerBase() :
-  table_(0)
+namespace asap {
+
+FillerBase::FillerBase(casa::CountedPtr<Scantable> stable) :
+  table_(stable)
 {
 }

branches/newfiller/src/FillerBase.h

@@ -40 +40 @@
 {
   public:
-    FillerBase();
-    FillerBase(casa::CountedPtr<Scantable> stable);
+    explicit FillerBase(casa::CountedPtr<Scantable> stable);
     virtual ~FillerBase();
 
+//    virtual bool open(const std::string& filename, const Record& rec)=0;
     virtual bool open(const std::string& filename)=0;
     virtual void fill() = 0;
     virtual void close() = 0;
+
+    void setReferenceRegex(const std::string& rx) { referenceRx_ = rx; }
+
 
   protected:

branches/newfiller/src/FillerWrapper.h

@@ -14 +14 @@
 
 #include <casa/aips.h>
+#include <casa/Exceptions.h>
 #include <casa/Utilities/CountedPtr.h>
 #include <string>
 
+#include "ScantableWrapper.h"
+#include "FillerBase.h"
+/*
+#include "PKSFiller.h"
+#include "NROFiller.h"
+*/
+
 namespace asap
 {
-class Filler
+class FillerWrapper
 {
 public:
-  Filler() : filler_p(0) {;};
 
-  ~Filler() { close(); };
+  FillerWrapper() : filler_(0), attached_(false), stable_(0) {;}
 
+  FillerWrapper(ScantableWrapper tbl) : filler_(0), attached_(false)
+  { stable_ = tbl.getCP(); }
+
+  virtual ~FillerWrapper() { close(); }
+
+
+//  void open(const std::string& filename, casa::Record rec) {
   void open(const std::string& filename) {
-    filler_p = new ATFiller();
-    if (filler_p->open(filename)) {
+//    filler_ = new ATFiller(stable_);
+//    if (filler_->open(filename, rec)) {
+    if (filler_->open(filename)) {
+      attached_ = true;
       return;
     }
-    filler_p = new NROFiller();
-    if (filler_p->open(filename)) {
+//    filler_ = new NROFiller(stable_);
+//    if (filler_->open(filename, rec)) {
+    if (filler_->open(filename)) {
+      attached_ = true;
       return;
     }
-    throw AipsError("Unknown Data Format");
+    filler_ = 0;
+    attached_ = false;
+    throw casa::AipsError("Unknown Data Format");
   }
   void close() {
-    if (filler_p) {
-      filler_p->close();
+    if (attached_) {
+      filler_->close();
     }
   }
 
   void fill() {
-    if (filler_p) {
-      filler_p->fill();
+    if (attached_) {
+      filler_->fill();
     }
   }
-  void setReferenceRx(const std::string& rx) {
-    if (filler_p) {
-      filler_p->setReferenceRx(rx);
+
+  void setReferenceRegex(const std::string& rx) {
+    if (attached_) {
+      filler_->setReferenceRegex(rx);
     }
   }
 
 private:
-  casa::CountedPtr<FillerBase> filler_p;
+
+  casa::CountedPtr<FillerBase> filler_;
+  bool attached_;
+  casa::CountedPtr<Scantable> stable_;
 };
 
-
 };
+#endif