Changeset 860 for trunk/src

Timestamp:

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

Author:

mar637

Message:

reworked history table
added STHistory class

Location:

trunk/src

Files:

• Makefile (modified) (2 diffs)
• STHistory.cpp (added)
• STHistory.h (added)
• Scantable.cpp (modified) (6 diffs)
• Scantable.h (modified) (5 diffs)

trunk/src/Makefile

@@ -93 +93 @@
              STWeather.o \
              STFrequencies.o \
+             STHistory.o \
              STWriter.o \
              RowAccumulator.o \
@@ -113 +114 @@
              STFocus.h \
              STWeather.h \
+             STHistory.h \
              STFrequencies.h \
              STDefs.h \

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);

trunk/src/Scantable.h

@@ -38 +38 @@
 #include "STMolecules.h"
 #include "STSelector.h"
+#include "STHistory.h"
 
 
@@ -253 +254 @@
   void makePersistent(const std::string& filename);
 
-  std::vector<std::string> getHistory() const;
-  void addHistory(const std::string& hist);
-
-  casa::Table getHistoryTable() const;
-  void appendToHistoryTable(const casa::Table& otherHist);
+  std::vector<std::string> getHistory() const
+    { return historyTable_.getHistory(); };
+
+  void addHistory(const std::string& hist) { historyTable_.addEntry(hist); }
+
+  void appendToHistoryTable(const STHistory& otherhist)
+    { historyTable_.append(otherhist); }
 
   std::string summary(bool verbose=false);
@@ -287 +290 @@
   STTcal& tcal() { return tcalTable_; }
   STMolecules& molecules() { return moleculeTable_; }
+  STHistory& history() { return historyTable_; }
 
 private:
@@ -322 +326 @@
   void setupMainTable();
 
-  void setupHistoryTable();
-  void setupMoleculeTable();
   void setupFitTable();
 
@@ -349 +351 @@
   STFocus focusTable_;
   STMolecules moleculeTable_;
+  STHistory historyTable_;
+
   casa::Table fitTable_;
-  casa::Table historyTable_;
 
   // Cached Columns to avoid reconstructing them for each row get/put