Changeset 857

Timestamp:

03/01/06 11:48:43 (18 years ago)

Author:

mar637

Message:

added name()
reworked copy constructor for (Table tab) to tale name of the derived class
fixed bug in constructor, where Table::New was used instead of Table::Scratch

Location:

trunk/src

Files:

• STSubTable.cpp (modified) (2 diffs)
• STSubTable.h (modified) (3 diffs)

trunk/src/STSubTable.cpp

@@ -14 +14 @@
 #include <tables/Tables/SetupNewTab.h>
 #include <tables/Tables/ScaColDesc.h>
+#include <tables/Tables/TableRecord.h>
 
 #include "Scantable.h"
@@ -28 +29 @@
   td.addColumn(ScalarColumnDesc<uInt>("ID"));
   String tabname = parent.table().tableName()+"/"+name;
-  SetupNewTable aNewTab(tabname, td, Table::New);
+  SetupNewTable aNewTab(tabname, td, Table::Scratch);
   table_ = Table(aNewTab, parent.table().tableType());
   idCol_.attach(table_,"ID");
 
 }
-STSubTable::STSubTable(Table tab)
+STSubTable::STSubTable(Table tab, const String& name)
 {
-  table_ = tab;
+  table_ = tab.rwKeywordSet().asTable(name);
   idCol_.attach(table_,"ID");
 }

trunk/src/STSubTable.h

@@ -31 +31 @@
 public:
   STSubTable() {;}
-  STSubTable( casa::Table tab );
-  STSubTable( const Scantable& parent,
-              const casa::String& name );
+  STSubTable( casa::Table tab, const casa::String& name);
+  STSubTable( const Scantable& parent, const casa::String& name );
 
   virtual ~STSubTable();
@@ -46 +45 @@
   virtual void setup() = 0;
   // -> virtual bool conformant(const STSubTable& other) = 0;
+
+  virtual const casa::String& name() const = 0;
 
   /**
@@ -62 +63 @@
 
 private:
+
 };