Changeset 12128 for trunk/FACT++/src

Timestamp:

09/17/11 09:39:58 (13 years ago)

Author:

tbretz

Message:

Made pritning of event more compatible with help2man

File:

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

trunk/FACT++/src/EventImp.cc

@@ -215 +215 @@
 void EventImp::Print(ostream &out, bool strip) const
 {
-    out << " \xc2\xb7 ";
+    out << " -";
 
     const string str = GetName();
     if (!str.empty())
-        out << kBold << str.substr(strip?str.find_first_of('/')+1:0);
+        out << kBold << str.substr(strip?str.find_first_of('/')+1:0) << kReset << "-";
 
     const string fmt = GetFormat();
+
+    if (!str.empty() && !fmt.empty())
+        out << " ";
+
     if (!fmt.empty())
-        out << kBold << "[" << fmt << "]";
+        out << "[" << fmt << "]";
 
     vector<Description> v = Description::SplitDescription(GetDescription());
@@ -229 +233 @@
     if (!GetDescription().empty())
     {
+        out << kBold;
         for (vector<Description>::const_iterator j=v.begin()+1;
              j!=v.end(); j++)
             out << " <" << j->name << ">";
+        out << kReset;
     }
-
-    out << kReset << ":";
 
     for (unsigned int i=0; i<fAllowedStates.size(); i++)
@@ -240 +244 @@
 
     if (fTargetState<0)
-        out << " [conf]";
+        out << " (conf)";
     else
-        out << " [trans->" << fTargetState << "]";
+        out << " (trans->" << fTargetState << ")";
 
     const Time tm = GetTime();
@@ -262 +266 @@
 
     if (GetDescription().empty())
+    {
+        out << endl;
         return;
-
-    out << "      " << v[0].comment << endl;
+    }
+
+    out << "     " << v[0].comment << endl;
 
     for (vector<Description>::const_iterator j=v.begin()+1;
          j!=v.end(); j++)
     {
-        out << "      " << kGreen << j->name;
+        out << "      ||" << kGreen << j->name;
         if (!j->comment.empty())
             out << kReset << ": " << kBlue << j->comment;
@@ -276 +283 @@
         out << endl;
     }
+    out << endl;
 }