Changeset 12886 for trunk/FACT++/src

Timestamp:

02/10/12 10:19:33 (13 years ago)

Author:

tbretz

Message:

Automatically assume all columns if none is given; improved output of keywords (more fits stylish)

File:

• trunk/FACT++/src/fitsdump.cc (modified) (5 diffs)

trunk/FACT++/src/fitsdump.cc

@@ -70 +70 @@
     void ListKeywords(ostream &);
 
-    vector<MyColumn> InitColumns(const vector<string>& list);
+    vector<MyColumn> InitColumns(vector<string> list);
 
     ///Display the selected columns values VS time
@@ -126 +126 @@
         for (auto jt = fKeyMap.begin(); jt != fKeyMap.end(); jt++)
             if (jt->second.value == it->first)
-                cout << jt->second.comment << endl;
+                cout << "/ " << jt->second.comment << endl;
     }
 
@@ -136 +136 @@
     const fits::Table::Keys &fKeyMap = GetKeys();
 
-    for (auto it=fKeyMap.begin(); it != fKeyMap.end(); it++) {
-        fout << "## " << setw(8) << it->first << " = " << setw(10);
-        fout << "'" << it->second.value << "'" << " / " << it->second.comment << endl;
-    }
+    for (auto it=fKeyMap.begin(); it != fKeyMap.end(); it++)
+    {
+        fout << "## " << ::left << setw(8) << it->first << "= ";
+
+        if (it->second.type=='T')
+            fout << ::left  << setw(20) << ("'"+it->second.value+"'");
+        else
+            fout << ::right << setw(20) << it->second.value;
+
+        if (it->second.comment.size()>0)
+            fout << " / " << it->second.comment;
+        fout << '\n';
+    }
+
+    fout << flush;
 }
 
@@ -161 +172 @@
 }
 
-vector<MyColumn> FitsDumper::InitColumns(const vector<string> &names)
+vector<MyColumn> FitsDumper::InitColumns(vector<string> names)
 {
     static const boost::regex expr("([[:word:].]+)(\\[([[:digit:]]+)?(:)?([[:digit:]]+)?\\])?");
 
     const fits::Table::Columns &fColMap = GetColumns();
+
+    if (names.size()==0)
+        for (auto it=fColMap.begin(); it!=fColMap.end(); it++)
+            if (it->second.num>0)
+                names.push_back(it->first);
 
     vector<MyColumn> vec;
@@ -546 +562 @@
     // ------------------------------------------------------------
 
-    if (conf.Vec<string>("col").size()==0)
-    {
-        cerr << "No columns specifiec." << endl;
-        return 0;
-    }
-
     const string filename = conf.Get<string>("outfile");