Changeset 941 for trunk/src

Timestamp:

03/30/06 15:35:29 (19 years ago)

Author:

mar637

Message:

fixed the output alignment of summary

Location:

trunk/src

Files:

• STFrequencies.cpp (modified) (2 diffs)
• Scantable.cpp (modified) (6 diffs)

trunk/src/STFrequencies.cpp

@@ -75 +75 @@
   table_.rwKeywordSet().define("BASEFRAME", String("TOPO"));
   table_.rwKeywordSet().define("EQUINOX",String( "J2000"));
-  table_.rwKeywordSet().define("UNIT", String("Hz"));
+  table_.rwKeywordSet().define("UNIT", String(""));
   table_.rwKeywordSet().define("DOPPLER", String("RADIO"));
 
@@ -286 +286 @@
     oss <<  setw(8)
     << t.keywordSet().asString("FRAME") << setw(16) << setprecision(8)
-    << rec.asDouble("REFVAL") << setw(10)
+    << rec.asDouble("REFVAL") << setw(7)
     << rec.asDouble("REFPIX") << setw(12)
     << rec.asDouble("INCREMENT") << endl;

trunk/src/Scantable.cpp

@@ -167 +167 @@
 Scantable::~Scantable()
 {
-  cout << "~Scantable() " << this << endl;
+  //cout << "~Scantable() " << this << endl;
 }
 
@@ -714 +714 @@
   table_.keywordSet().get("FluxUnit", tmp);
   oss << setw(15) << "Flux Unit:" << tmp << endl;
-  Vector<Float> vec;
+  Vector<Double> vec(moleculeTable_.getRestFrequencies());
   oss << setw(15) << "Rest Freqs:";
   if (vec.nelements() > 0) {
@@ -721 +721 @@
       oss << "none" << endl;
   }
-  oss << setw(15) << "Abcissa:" << "channel" << endl;
+
+  oss << setw(15) << "Abcissa:" << getAbcissaLabel(0) << endl;
   oss << selector_.print() << endl;
   oss << endl;
@@ -728 +729 @@
                   + MDirection::showType(dirCol_.getMeasRef().getType())
                   + ")";
-  oss << setw(5) << "Scan"
-      << setw(15) << "Source"
-//      << setw(24) << dirtype
-      << setw(10) << "Time"
-      << setw(18) << "Integration" << endl
-      << setw(5) << "" << setw(10) << "Beam" << dirtype << endl
-      << setw(15) << "" << setw(5) << "IF"
+  oss << setw(5) << "Scan" << setw(15) << "Source"
+      << setw(10) << "Time" << setw(18) << "Integration" << endl;
+  oss << setw(5) << "" << setw(5) << "Beam" << setw(3) << "" << dirtype << endl;
+  oss << setw(10) << "" << setw(3) << "IF" << setw(6) << ""
       << setw(8) << "Frame" << setw(16)
       << "RefVal" << setw(10) << "RefPix" << setw(12) << "Increment" <<endl;
@@ -764 +762 @@
       MDirection::ROScalarColumn bdirCol(bsubt,"DIRECTION");
       const TableRecord& brec = brow.get(0);
-      oss << setw(6) << "" <<  setw(10) << brec.asuInt("BEAMNO");
-      oss  << setw(24) << formatDirection(bdirCol(0)) << endl;
+      oss << setw(5) << "" <<  setw(4) << std::right << brec.asuInt("BEAMNO")<< std::left;
+      oss  << setw(4) << ""  << formatDirection(bdirCol(0)) << endl;
       TableIterator iiter(bsubt, "IFNO");
       while (!iiter.pastEnd()) {
@@ -771 +769 @@
         ROTableRow irow(isubt);
         const TableRecord& irec = irow.get(0);
-        oss << std::right <<setw(8) << "" << std::left << irec.asuInt("IFNO");
-        oss << frequencies().print(irec.asuInt("FREQ_ID"));
+        oss << setw(10) << "";
+        oss << setw(3) << std::right << irec.asuInt("IFNO") << std::left
+            << setw(2) << "" << frequencies().print(irec.asuInt("FREQ_ID"));
 
         ++iiter;