Changeset 860 for trunk/src/Scantable.cpp

Timestamp:

03/01/06 14:00:04 (18 years ago)

Author:

mar637

Message:

reworked history table
added STHistory class

File:

• trunk/src/Scantable.cpp (modified) (6 diffs)

trunk/src/Scantable.cpp

@@ -74 +74 @@
   moleculeTable_ = STMolecules(*this);
   table_.rwKeywordSet().defineTable("MOLECULES", moleculeTable_.table());
-  setupHistoryTable();
+  historyTable_ = STHistory(*this);
+  table_.rwKeywordSet().defineTable("HISTORY", historyTable_.table());
   setupFitTable();
-  historyTable_ = table_.keywordSet().asTable("HISTORY");
   fitTable_ = table_.keywordSet().asTable("FITS");
   originalTable_ = table_;
@@ -99 +99 @@
   attach();
 }
-
 
 Scantable::Scantable( const Scantable& other, bool clear )
@@ -141 +140 @@
   tcalTable_ = STTcal(table_);
   moleculeTable_ = STMolecules(table_);
+  historyTable_ = STHistory(table_);
 }
 
@@ -213 +213 @@
   originalTable_ = table_;
 
-}
-
-void Scantable::setupHistoryTable( )
-{
-  TableDesc tdh("", "1", TableDesc::Scratch);
-  tdh.addColumn(ScalarColumnDesc<String>("ITEM"));
-  SetupNewTable histtab("history", tdh, Table::Scratch);
-  Table histTable(histtab, Table::Memory);
-  table_.rwKeywordSet().defineTable("HISTORY", histTable);
 }
 
@@ -522 +513 @@
 {
   return polCol_(whichrow);
-}
-
-Table Scantable::getHistoryTable() const
-{
-  return table_.keywordSet().asTable("HISTORY");
-}
-
-void Scantable::appendToHistoryTable(const Table& otherHist)
-{
-  Table t = table_.rwKeywordSet().asTable("HISTORY");
-
-  addHistory(asap::SEPERATOR);
-  TableCopy::copyRows(t, otherHist, t.nrow(), 0, otherHist.nrow());
-  addHistory(asap::SEPERATOR);
-}
-
-void Scantable::addHistory(const std::string& hist)
-{
-  Table t = table_.rwKeywordSet().asTable("HISTORY");
-  uInt nrow = t.nrow();
-  t.addRow();
-  ScalarColumn<String> itemCol(t, "ITEM");
-  itemCol.put(nrow, hist);
-}
-
-std::vector<std::string> Scantable::getHistory() const
-{
-  Vector<String> history;
-  const Table& t = table_.keywordSet().asTable("HISTORY");
-  uInt nrow = t.nrow();
-  ROScalarColumn<String> itemCol(t, "ITEM");
-  std::vector<std::string> stlout;
-  String hist;
-  for (uInt i=0; i<nrow; ++i) {
-    itemCol.get(i, hist);
-    stlout.push_back(hist);
-  }
-  return stlout;
 }
 
@@ -678 +631 @@
   oss << endl;
   String tmp;
-  //table_.keywordSet().get("Observer", tmp);
-  oss << setw(15) << "Observer:" << table_.keywordSet().asString("Observer") << endl;
+  oss << setw(15) << "Observer:"
+      << table_.keywordSet().asString("Observer") << endl;
   oss << setw(15) << "Obs Date:" << getTime(-1,true) << endl;
   table_.keywordSet().get("Project", tmp);