Changes in src/UIElements/TextUI/Query/MoleculeTextQuery.cpp [8df74d:d754bb]

File:

• src/UIElements/TextUI/Query/MoleculeTextQuery.cpp (modified) (3 diffs)

src/UIElements/TextUI/Query/MoleculeTextQuery.cpp

@@ -24 +24 @@
 #include <Descriptors/MoleculeDescriptor.hpp>
 #include <Descriptors/MoleculeIdDescriptor.hpp>
-#include "TextUI/TextDialog.hpp"
+#include "TextUI/Query/TextQuery.hpp"
 
 #include "Helpers/Log.hpp"
@@ -42 +42 @@
   do{
     badInput = false;
-    Log() << Verbose(0) << getTitle();
-    cin >> idxOfMol;
-    if(cin.fail()){
+    std::cout << getDescription() << ": ";
+    std::cin >> idxOfMol;
+    if(std::cin.fail()){
       badInput = true;
-      cin.clear();
-      cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
-      Log() << Verbose(0) << "Input was not a number!" << endl;
+      std::cin.clear();
+      std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
+      std::cout << "Input was not a number!" << std::endl;
       continue;
     }
@@ -54 +54 @@
     tmp = World::getInstance().getMolecule(MoleculeById(idxOfMol));
     if(!tmp && idxOfMol!=-1){
-      Log() << Verbose(0) << "Invalid Molecule Index" << endl;
+      std::cout << "Invalid Molecule Index" << std::endl;
       badInput = true;
     }
 
   } while(badInput);
-  cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
+  std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
   return (idxOfMol!=-1);
 }