Changeset dd43a7 for molecuilder/src

Timestamp:

Apr 25, 2010, 1:16:09 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

0707dd

Parents:

65b413

Message:

Made the input methods more robust to invalid inputs.

File:

• molecuilder/src/UIElements/TextDialog.cpp (modified) (5 diffs)

molecuilder/src/UIElements/TextDialog.cpp

@@ -62 +62 @@
 
 bool TextDialog::IntTextQuery::handle() {
-  Log() << Verbose(0) << getTitle();
-  cin >> tmp;
+  bool badInput = false;
+  do{
+    badInput = false;
+    Log() << Verbose(0) << getTitle();
+    cin >> tmp;
+    if(cin.fail()){
+      badInput=true;
+      cin.clear();
+      cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
+      Log() << Verbose(0) << "Input was not a number!" << endl;
+    }
+  } while(badInput);
+  // clear the input buffer of anything still in the line
+  cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
   return true;
 }
@@ -75 +87 @@
 bool TextDialog::StringTextQuery::handle() {
   Log() << Verbose(0) << getTitle();
-  cin >> tmp;
+  getline(cin,tmp);
   return true;
 }
@@ -86 +98 @@
 
 bool TextDialog::DoubleTextQuery::handle() {
-  Log() << Verbose(0) << getTitle();
-  cin >> tmp;
+  bool badInput = false;
+  do{
+    badInput = false;
+    Log() << Verbose(0) << getTitle();
+    cin >> tmp;
+    if(cin.fail()){
+      badInput = true;
+      cin.clear();
+      cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
+      Log() << Verbose(0) << "Input was not a number!" << endl;
+    }
+  }while(badInput);
+  cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
   return true;
 }
@@ -98 +121 @@
 
 bool TextDialog::MoleculeTextQuery::handle() {
-  int idxOfMol;
-  Log() << Verbose(0) << getTitle();
-  cin >> idxOfMol;
-  tmp = molecules->ReturnIndex(idxOfMol);
-  while(!tmp && (idxOfMol !=-1)) {
-    Log() << Verbose(0) << "Invalid Molecule Index" << endl;
+  int idxOfMol=0;
+  bool badInput = false;
+  do{
+    badInput = false;
     Log() << Verbose(0) << getTitle();
     cin >> idxOfMol;
+    if(cin.fail()){
+      badInput = true;
+      cin.clear();
+      cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
+      Log() << Verbose(0) << "Input was not a number!" << endl;
+      continue;
+    }
+
     tmp = molecules->ReturnIndex(idxOfMol);
-  }
+    if(!tmp && idxOfMol!=-1){
+      Log() << Verbose(0) << "Invalid Molecule Index" << endl;
+      badInput = true;
+    }
+
+  } while(badInput);
+  cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
   return (idxOfMol!=-1);
 }
@@ -133 +168 @@
 
 bool TextDialog::ElementTextQuery::handle() {
-  int Z;
-  Log() << Verbose(0) << getTitle();
-  cin >> Z;
-  tmp = World::getInstance().getPeriode()->FindElement(Z);
-  return tmp;
-}
+  bool badInput=false;
+  bool aborted = false;
+  do{
+    badInput = false;
+    Log() << Verbose(0) << getTitle();
+
+    // try to read as Atomic number
+    int Z;
+    cin >> Z;
+    if(!cin.fail()){
+      if(Z==-1){
+        aborted = true;
+      }
+      else{
+        tmp = World::getInstance().getPeriode()->FindElement(Z);
+        if(!tmp){
+          Log() << Verbose(0) << "No element with this atomic number!" << endl;
+          badInput = true;
+        }
+      }
+      continue;
+    }
+    else{
+      cin.clear();
+    }
+
+    // Try to read as shorthand
+    // the last buffer content was not removed, so we read the
+    // same thing again, this time as a string
+    string shorthand;
+    cin >> shorthand;
+    if(!cin.fail()){
+      if(shorthand.empty()){
+        aborted = true;
+      }
+      else{
+        tmp = World::getInstance().getPeriode()->FindElement(shorthand.c_str());
+        if(!tmp){
+          Log() << Verbose(0) << "No element with this shorthand!" << endl;
+          badInput = true;
+        }
+      }
+    }
+    else{
+      Log() << Verbose(0) << "Could not read input. Try Again." << endl;
+      cin.clear();
+      cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
+      badInput = true;
+    }
+
+  }while(badInput);
+  cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
+  return !aborted;
+}