Changeset 2114 for branches

Timestamp:

04/06/11 19:23:51 (13 years ago)

Author:

Kana Sugimoto

Message:

merged fixes in trunk (r2111)

Location:

branches/casa-prerelease/pre-asap/src

Files:

• . (modified) (1 prop)
• SConscript (modified) (1 prop)
• Scantable.cpp (modified) (2 diffs)
• Scantable.h (modified) (1 diff)
• ScantableWrapper.h (modified) (1 diff)
• python_Scantable.cpp (modified) (1 diff)

branches/casa-prerelease/pre-asap/src/Scantable.cpp

@@ -944 +944 @@
 }
 
-std::string Scantable::summary( bool verbose )
+
+std::string Scantable::headerSummary( bool verbose )
 {
   // Format header info
+//   STHeader sdh;
+//   sdh = getHeader();
+//   sdh.print();
   ostringstream oss;
-  oss << endl;
-  oss << asap::SEPERATOR << endl;
-  oss << " Scan Table Summary" << endl;
-  oss << asap::SEPERATOR << endl;
   oss.flags(std::ios_base::left);
   oss << setw(15) << "Beams:" << setw(4) << nbeam() << endl
@@ -994 +994 @@
   oss << setw(15) << "Abcissa:" << getAbcissaLabel(0) << endl;
   oss << selector_.print() << endl;
+  /// @todo implement verbose mode
+  return String(oss);
+}
+
+std::string Scantable::summary( bool verbose )
+{
+  ostringstream oss;
   oss << endl;
+  oss << asap::SEPERATOR << endl;
+  oss << " Scan Table Summary" << endl;
+  oss << asap::SEPERATOR << endl;
+
+  // Format header info
+  oss << headerSummary(verbose);
+  oss << endl;
+
   // main table
   String dirtype = "Position ("
                   + getDirectionRefString()
                   + ")";
+  oss.flags(std::ios_base::left);
   oss << setw(5) << "Scan" << setw(15) << "Source"
       << setw(10) << "Time" << setw(18) << "Integration" 

branches/casa-prerelease/pre-asap/src/Scantable.h

@@ -371 +371 @@
     { historyTable_.append(otherhist); }
 
+  std::string headerSummary(bool verbose=false);
   std::string summary(bool verbose=false);
   //std::string getTime(int whichrow=-1, bool showdate=true) const;

branches/casa-prerelease/pre-asap/src/ScantableWrapper.h

@@ -218 +218 @@
   }
 
+  std::string listHeader(bool verbose=false) const {
+    return table_->headerSummary(verbose);
+  }
+
   std::vector<std::string> getHistory()const
     { return table_->getHistory(); }

branches/casa-prerelease/pre-asap/src/python_Scantable.cpp

@@ -119 +119 @@
     .def("_summary",  &ScantableWrapper::summary,
          (boost::python::arg("verbose")=true) )
+    .def("_list_header",  &ScantableWrapper::listHeader,
+         (boost::python::arg("verbose")=true) )
     //.def("_getrestfreqs",  &ScantableWrapper::getRestFrequencies)
     .def("_getrestfreqs",  &ScantableWrapper::getRestFrequency)