Changeset 418117a for molecuilder/src/builder.cpp

Timestamp:

Nov 23, 2009, 6:22:33 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

3d4969

Parents:

09d3b8

Message:

Verbosity corrected for ERROR and WARNING

• present ERROR and WARNING prefixes removed and placed by eLog() and respective Verbosity().
• -v... is scanned for number of 'v's and verbosity is set accordingly
• standard verbosity is now 0.

Signed-off-by: Frederik Heber <heber@…>

File:

• molecuilder/src/builder.cpp (modified) (17 diffs)

molecuilder/src/builder.cpp

@@ -95 +95 @@
   switch (choice) {
     default:
-      Log() << Verbose(0) << "Not a valid choice." << endl;
+      eLog() << Verbose(2) << "Not a valid choice." << endl;
       break;
       case 'a': // absolute coordinates of atom
@@ -109 +109 @@
         valid = true;
         do {
-          if (!valid) Log() << Verbose(0) << "Resulting position out of cell." << endl;
+          if (!valid) eLog() << Verbose(2) << "Resulting position out of cell." << endl;
           Log() << Verbose(0) << "Enter reference coordinates." << endl;
           x.AskPosition(mol->cell_size, true);
@@ -125 +125 @@
         valid = true;
         do {
-          if (!valid) Log() << Verbose(0) << "Resulting position out of cell." << endl;
+          if (!valid) eLog() << Verbose(2) << "Resulting position out of cell." << endl;
           second = mol->AskAtom("Enter atom number: ");
           Log() << Verbose(0) << "Enter relative coordinates." << endl;
@@ -142 +142 @@
         do {
           if (!valid) {
-            Log() << Verbose(0) << "Resulting coordinates out of cell - ";
-            first->x.Output();
-            Log() << Verbose(0) << endl;
+            eLog() << Verbose(2) << "Resulting coordinates out of cell - " << first->x << endl;
           }
           Log() << Verbose(0) << "First, we need two atoms, the first atom is the central, while the second is the outer one." << endl;
@@ -671 +669 @@
   Log() << Verbose(0) << "===============================================" << endl;
   if (molecules->NumberOfActiveMolecules() > 1)
-    Log() << Verbose(0) << "WARNING: There is more than one molecule active! Atoms will be added to each." << endl;
+    eLog() << Verbose(2) << "There is more than one molecule active! Atoms will be added to each." << endl;
   Log() << Verbose(0) << "INPUT: ";
   cin >> choice;
@@ -794 +792 @@
   Log() << Verbose(0) << "===============================================" << endl;
   if (molecules->NumberOfActiveMolecules() > 1)
-    Log() << Verbose(0) << "WARNING: There is more than one molecule active! Atoms will be added to each." << endl;
+    eLog() << Verbose(2) << "There is more than one molecule active! Atoms will be added to each." << endl;
   Log() << Verbose(0) << "INPUT: ";
   cin >> choice;
@@ -827 +825 @@
           }
           if (count != j)
-            Log() << Verbose(0) << "ERROR: AtomCount " << count << " is not equal to number of atoms in molecule " << j << "!" << endl;
+            eLog() << Verbose(1) << "AtomCount " << count << " is not equal to number of atoms in molecule " << j << "!" << endl;
           x.Zero();
           y.Zero();
@@ -1250 +1248 @@
 
   if (!strcmp(configuration->configpath, configuration->GetDefaultPath())) {
-    eLog() << Verbose(0) << "WARNING: config is found under different path then stated in config file::defaultpath!" << endl;
+    eLog() << Verbose(2) << "config is found under different path then stated in config file::defaultpath!" << endl;
   }
 
@@ -1354 +1352 @@
 
   if (!strcmp(configuration->configpath, configuration->GetDefaultPath())) {
-    eLog() << Verbose(0) << "WARNING: config is found under different path then stated in config file::defaultpath!" << endl;
+    eLog() << Verbose(2) << "config is found under different path then stated in config file::defaultpath!" << endl;
   }
 
@@ -1387 +1385 @@
   molecule *mol = NULL;
   string BondGraphFileName("");
+  int verbosity = 0;
   strncpy(configuration.databasepath, LocalPath, MAXSTRINGSIZE-1);
 
@@ -1432 +1431 @@
             Log() << Verbose(0) << "\t-T x1 x2 x3\tTranslate periodically all atoms by this vector (x1,x2,x3)." << endl;
             Log() << Verbose(0) << "\t-u rho\tsuspend in water solution and output necessary cell lengths, average density rho and repetition." << endl;
-            Log() << Verbose(0) << "\t-v/-V\t\tGives version information." << endl;
+            Log() << Verbose(0) << "\t-v\t\tsets verbosity (more is more)." << endl;
+            Log() << Verbose(0) << "\t-V\t\tGives version information." << endl;
             Log() << Verbose(0) << "Note: config files must not begin with '-' !" << endl;
             return (1);
             break;
           case 'v':
+            while (argv[argptr-1][verbosity+1] == 'v') {
+              verbosity++;
+            }
+            setVerbosity(verbosity);
+            Log() << Verbose(0) << "Setting verbosity to " << verbosity << "." << endl;
+            break;
           case 'V':
             Log() << Verbose(0) << argv[0] << " " << VERSIONSTRING << endl;
@@ -1841 +1847 @@
                   }
                 } else {
-                  eLog() << Verbose(0) << "Removal failed due to missing atoms on molecule or wrong id." << endl;
+                  eLog() << Verbose(1) << "Removal failed due to missing atoms on molecule or wrong id." << endl;
                 }
                 argptr+=2;
@@ -2002 +2008 @@
               j = atoi(argv[argptr++]);
               if ((j<0) || (j>1)) {
-                eLog() << Verbose(1) << "ERROR: Argument of '-m' should be either 0 for no-rotate or 1 for rotate." << endl;
+                eLog() << Verbose(1) << "Argument of '-m' should be either 0 for no-rotate or 1 for rotate." << endl;
                 j = 0;
               }
@@ -2064 +2070 @@
 //                  repetition[i] = atoi(argv[argptr++]);
 //                  if (repetition[i] < 1)
-//                    eLog() << Verbose(0) << "ERROR: repetition value must be greater 1!" << endl;
+//                    eLog() << Verbose(1) << "repetition value must be greater 1!" << endl;
 //                  repetition[i] = 1;
 //                }
@@ -2083 +2089 @@
                   Vector ** vectors;
                   if (faktor < 1) {
-                    eLog() << Verbose(0) << "ERROR: Repetition faktor mus be greater than 1!" << endl;
+                    eLog() << Verbose(1) << "Repetition factor mus be greater than 1!" << endl;
                     faktor = 1;
                   }
@@ -2100 +2106 @@
                     }
                     if (count != j)
-                      Log() << Verbose(0) << "ERROR: AtomCount " << count << " is not equal to number of atoms in molecule " << j << "!" << endl;
+                      eLog() << Verbose(1) << "AtomCount " << count << " is not equal to number of atoms in molecule " << j << "!" << endl;
                     x.Zero();
                     y.Zero();
@@ -2165 +2171 @@
   int j;
 
-  setVerbosity(2);
+  setVerbosity(0);
 
   // =========================== PARSE COMMAND LINE OPTIONS ====================================