Changeset d754bb


Ignore:
Timestamp:
Dec 4, 2010, 11:44:19 PM (14 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
5d4b73, d2b28f
Parents:
5eebbc
git-author:
Frederik Heber <heber@…> (11/09/10 15:03:10)
git-committer:
Frederik Heber <heber@…> (12/04/10 23:44:19)
Message:

All TextQuery now show getDescription()+": " on handle() call.

  • getTitle() is only a token ... not a description
Location:
src/UIElements/TextUI/Query
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • src/UIElements/TextUI/Query/AtomTextQuery.cpp

    r5eebbc rd754bb  
    4141  do{
    4242    badInput = false;
    43     Log() << Verbose(0) << getTitle();
    44     cin >> idxOfAtom;
    45     if(cin.fail()){
     43    std::cout << getDescription() << ": ";
     44    std::cin >> idxOfAtom;
     45    if(std::cin.fail()){
    4646      badInput = true;
    47       cin.clear();
    48       cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    49       Log() << Verbose(0) << "Input was not a number!" << endl;
     47      std::cin.clear();
     48      std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
     49      std::cout << "Input was not a number!" << std::endl;
    5050      continue;
    5151    }
    … …  
    5353    tmp = World::getInstance().getAtom(AtomById(idxOfAtom));
    5454    if(!tmp && idxOfAtom!=-1){
    55       Log() << Verbose(0) << "Invalid Atom Index" << idxOfAtom << endl;
     55      std::cout << "Invalid Atom Index" << idxOfAtom << std::endl;
    5656      badInput = true;
    5757    }
    5858
    5959  } while(badInput);
    60   cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
     60  std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    6161  return (idxOfAtom!=-1);
    6262}

  • src/UIElements/TextUI/Query/AtomsTextQuery.cpp

    r5eebbc rd754bb  
    3939bool TextDialog::AtomsTextQuery::handle() {
    4040  int idxOfAtom=-1;
    41   Log() << Verbose(0) << getTitle();
     41  std::cout << getDescription() << ": ";
    4242  std::string line;
    43   getline(cin,line);
     43  getline(std::cin,line);
    4444  // dissect by " "
    4545  std::string::iterator olditer = line.begin();
    … …  
    5050      temp = World::getInstance().getAtom(AtomById(idxOfAtom));
    5151      if(!temp && idxOfAtom!=-1){
    52         Log() << Verbose(0) << "Invalid Atom Index" << idxOfAtom << endl;
     52        std::cout << "Invalid Atom Index" << idxOfAtom << std::endl;
    5353        break;
    5454      }
    … …  
    6262    temp = World::getInstance().getAtom(AtomById(idxOfAtom));
    6363    if(!temp && idxOfAtom!=-1) {
    64       Log() << Verbose(0) << "Invalid Atom Index" << idxOfAtom << endl;
     64      std::cout << "Invalid Atom Index" << idxOfAtom << std::endl;
    6565      tmp.push_back(temp);
    6666    }

  • src/UIElements/TextUI/Query/BooleanTextQuery.cpp

    r5eebbc rd754bb  
    3939  do{
    4040    badInput = false;
    41     Log() << Verbose(0) << getTitle();
    42     cin >> input;
     41    std::cout << getDescription() << "[y/n]: ";
     42    std::cin >> input;
    4343    if ((input == 'y' ) || (input == 'Y')) {
    4444      tmp = true;
    … …  
    4747    } else {
    4848      badInput=true;
    49       cin.clear();
    50       cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    51       Log() << Verbose(0) << "Input was not of [yYnN]!" << endl;
     49      std::cin.clear();
     50      std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
     51      std::cout << "Input was not of [yYnN]!" << std::endl;
    5252    }
    5353  } while(badInput);
    5454  // clear the input buffer of anything still in the line
    55   cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
     55  std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    5656  return true;
    5757}

  • src/UIElements/TextUI/Query/BoxTextQuery.cpp

    r5eebbc rd754bb  
    3737
    3838bool TextDialog::BoxTextQuery::handle() {
    39   Log() << Verbose(0) << getTitle();
     39  std::cout << getTitle();
    4040
    4141  double temp[6];
     42  std::cout << getDescription() << " - ";
    4243  std::string coords[6] = {"xx","yx","yy", "zx", "zy", "zz"};
    4344  for (int i=0;i<6;i++) {
    44     Log() << Verbose(0) << coords[i] << ": ";
    45     cin >> temp[i];
     45    std::cout << coords[i] << ": ";
     46    std::cin >> temp[i];
    4647  }
    4748  Matrix M;

  • src/UIElements/TextUI/Query/DoubleTextQuery.cpp

    r5eebbc rd754bb  
    3838  do{
    3939    badInput = false;
    40     Log() << Verbose(0) << getTitle();
    41     cin >> tmp;
    42     if(cin.fail()){
     40    std::cout << getDescription() << ": ";
     41    std::cin >> tmp;
     42    if(std::cin.fail()){
    4343      badInput = true;
    44       cin.clear();
    45       cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    46       Log() << Verbose(0) << "Input was not a number!" << endl;
     44      std::cin.clear();
     45      std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
     46      std::cout << "Input was not a number!" << std::endl;
    4747    }
    4848  }while(badInput);
    49   cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
     49  std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    5050  return true;
    5151}

  • src/UIElements/TextUI/Query/DoublesTextQuery.cpp

    r5eebbc rd754bb  
    3535
    3636bool TextDialog::DoublesTextQuery::handle() {
    37   Log() << Verbose(0) << getTitle();
     37  std::cout << getDescription() << ": ";
    3838  std::string line;
    39   getline(cin,line);
     39  getline(std::cin,line);
    4040  // dissect by " "
    4141  std::string::iterator olditer = line.begin();

  • src/UIElements/TextUI/Query/ElementTextQuery.cpp

    r5eebbc rd754bb  
    4444  do{
    4545    badInput = false;
    46     Log() << Verbose(0) << getTitle();
     46    std::cout << getDescription() << ": ";
    4747
    4848    // try to read as Atomic number
    4949    int Z;
    50     cin >> Z;
    51     if(!cin.fail()){
     50    std::cin >> Z;
     51    if(!std::cin.fail()){
    5252      if(Z==-1){
    5353        aborted = true;
    … …  
    5656        temp = World::getInstance().getPeriode()->FindElement(Z);
    5757        if(!temp){
    58           Log() << Verbose(0) << "No element with this atomic number!" << endl;
     58          std::cout << "No element with this atomic number!" << std::endl;
    5959          badInput = true;
    6060        }
    … …  
    6363    }
    6464    else{
    65       cin.clear();
     65      std::cin.clear();
    6666    }
    6767
    … …  
    7070    // same thing again, this time as a std::string
    7171    std::string shorthand;
    72     cin >> shorthand;
    73     if(!cin.fail()){
     72    std::cin >> shorthand;
     73    if(!std::cin.fail()){
    7474      if(shorthand.empty()){
    7575        aborted = true;
    … …  
    7878        temp = World::getInstance().getPeriode()->FindElement(shorthand.c_str());
    7979        if(!temp){
    80           Log() << Verbose(0) << "No element with this shorthand!" << endl;
     80          std::cout << "No element with this shorthand!" << std::endl;
    8181          badInput = true;
    8282        }
    … …  
    8484    }
    8585    else{
    86       Log() << Verbose(0) << "Could not read input. Try Again." << endl;
    87       cin.clear();
    88       cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
     86      std::cout << "Could not read input. Try Again." << std::endl;
     87      std::cin.clear();
     88      std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    8989      badInput = true;
    9090    }
    9191
    9292  }while(badInput);
    93   cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
     93  std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    9494  return !aborted;
    9595}

  • src/UIElements/TextUI/Query/ElementsTextQuery.cpp

    r5eebbc rd754bb  
    4545  std::string shorthand;
    4646  int Z=-1;
    47   Log() << Verbose(0) << getTitle();
     47  std::cout << getDescription() << ": ";
    4848  std::string line;
    49   getline(cin,line);
     49  getline(std::cin,line);
    5050  // dissect by " "
    5151  std::string::iterator olditer = line.begin();
    … …  
    6161      };
    6262      if(!temp && Z!=-1){
    63         Log() << Verbose(0) << "Invalid Element" << shorthand << endl;
     63        std::cout << "Invalid Element" << shorthand << std::endl;
    6464        break;
    6565      }
    … …  
    7878    };
    7979    if(!temp && Z!=-1) {
    80       Log() << Verbose(0) << "Invalid Element" << shorthand << endl;
     80      std::cout << "Invalid Element" << shorthand << std::endl;
    8181      tmp.push_back(temp);
    8282    }

  • src/UIElements/TextUI/Query/FileTextQuery.cpp

    r5eebbc rd754bb  
    4242  do{
    4343    badInput = false;
    44     std::cout << getTitle();
     44    std::cout << getDescription() << ": ";
    4545    std::cin >> tempstring;
    4646    if(std::cin.fail()){

  • src/UIElements/TextUI/Query/IntTextQuery.cpp

    r5eebbc rd754bb  
    3838  do{
    3939    badInput = false;
    40     Log() << Verbose(0) << getTitle();
    41     cin >> tmp;
    42     if(cin.fail()){
     40    std::cout << getDescription() << ": ";
     41    std::cin >> tmp;
     42    if(std::cin.fail()){
    4343      badInput=true;
    44       cin.clear();
    45       cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    46       Log() << Verbose(0) << "Input was not a number!" << endl;
     44      std::cin.clear();
     45      std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
     46      std::cout << "Input was not a number!" << std::endl;
    4747    }
    4848  } while(badInput);
    4949  // clear the input buffer of anything still in the line
    50   cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
     50  std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    5151  return true;
    5252}

  • src/UIElements/TextUI/Query/IntsTextQuery.cpp

    r5eebbc rd754bb  
    3535
    3636bool TextDialog::IntsTextQuery::handle() {
    37   Log() << Verbose(0) << getTitle();
     37  std::cout << getDescription() << ": ";
    3838  std::string line;
    39   getline(cin,line);
     39  getline(std::cin,line);
    4040  // dissect by " "
    4141  std::string::iterator olditer = line.begin();

  • src/UIElements/TextUI/Query/MoleculeTextQuery.cpp

    r5eebbc rd754bb  
    4242  do{
    4343    badInput = false;
    44     Log() << Verbose(0) << getTitle();
    45     cin >> idxOfMol;
    46     if(cin.fail()){
     44    std::cout << getDescription() << ": ";
     45    std::cin >> idxOfMol;
     46    if(std::cin.fail()){
    4747      badInput = true;
    48       cin.clear();
    49       cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    50       Log() << Verbose(0) << "Input was not a number!" << endl;
     48      std::cin.clear();
     49      std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
     50      std::cout << "Input was not a number!" << std::endl;
    5151      continue;
    5252    }
    … …  
    5454    tmp = World::getInstance().getMolecule(MoleculeById(idxOfMol));
    5555    if(!tmp && idxOfMol!=-1){
    56       Log() << Verbose(0) << "Invalid Molecule Index" << endl;
     56      std::cout << "Invalid Molecule Index" << std::endl;
    5757      badInput = true;
    5858    }
    5959
    6060  } while(badInput);
    61   cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
     61  std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    6262  return (idxOfMol!=-1);
    6363}

  • src/UIElements/TextUI/Query/MoleculesTextQuery.cpp

    r5eebbc rd754bb  
    3939bool TextDialog::MoleculesTextQuery::handle() {
    4040  int idxOfMol=-1;
    41   Log() << Verbose(0) << getTitle();
     41  std::cout << getDescription() << ": ";
    4242  std::string line;
    43   getline(cin,line);
     43  getline(std::cin,line);
    4444  // dissect by " "
    4545  std::string::iterator olditer = line.begin();
    … …  
    5050      temp = World::getInstance().getMolecule(MoleculeById(idxOfMol));
    5151      if(!temp && idxOfMol!=-1){
    52         Log() << Verbose(0) << "Invalid Molecule Index" << idxOfMol << endl;
     52        std::cout << "Invalid Molecule Index" << idxOfMol << std::endl;
    5353        break;
    5454      }
    … …  
    6262    temp = World::getInstance().getMolecule(MoleculeById(idxOfMol));
    6363    if(!temp && idxOfMol!=-1){
    64       Log() << Verbose(0) << "Invalid Molecule Index" << idxOfMol << endl;
     64      std::cout << "Invalid Molecule Index" << idxOfMol << std::endl;
    6565      tmp.push_back(temp);
    6666    }

  • src/UIElements/TextUI/Query/StringTextQuery.cpp

    r5eebbc rd754bb  
    3535
    3636bool TextDialog::StringTextQuery::handle() {
    37   Log() << Verbose(0) << getTitle();
    38   getline(cin,tmp);
     37  std::cout << getDescription() << ": ";
     38  getline(std::cin,tmp);
    3939  return true;
    4040}

  • src/UIElements/TextUI/Query/StringsTextQuery.cpp

    r5eebbc rd754bb  
    3535
    3636bool TextDialog::StringsTextQuery::handle() {
    37   Log() << Verbose(0) << getTitle();
    38   getline(cin,temp);
     37  std::cout << getDescription() << ": ";
     38  getline(std::cin,temp);
    3939  // dissect by " "
    4040  std::string::iterator olditer = temp.begin();

  • src/UIElements/TextUI/Query/VectorTextQuery.cpp

    r5eebbc rd754bb  
    3939
    4040bool TextDialog::VectorTextQuery::handle() {
    41   std::cout << getTitle();
     41  std::cout << getDescription() << std::endl;
    4242  const Matrix &M = World::getInstance().getDomain().getM();
    4343  char coords[3] = {'x', 'y', 'z'};
    … …  
    4646
    4747  std::string line;
    48   getline(cin,line);
     48  getline(std::cin,line);
    4949
    5050  // dissect by ","

  • src/UIElements/TextUI/Query/VectorsTextQuery.cpp

    r5eebbc rd754bb  
    3939
    4040bool TextDialog::VectorsTextQuery::handle() {
    41   std::cout << getTitle();
     41  std::cout << getDescription() << std::endl;
    4242  char coords[3] = {'x', 'y', 'z'};
    4343  const Matrix &M = World::getInstance().getDomain().getM();
    … …  
    4646
    4747  std::string line;
    48   getline(cin,line);
     48  getline(std::cin,line);
    4949
    5050  // dissect by ","
Note: See TracChangeset for help on using the changeset viewer.