Ignore:
Timestamp:
Jul 18, 2012, 2:02:13 PM (13 years ago)
Author:
Michael Ankele <ankele@…>
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:
b3a54d
Parents:
30cd0d
git-author:
Michael Ankele <ankele@…> (07/04/12 13:49:18)
git-committer:
Michael Ankele <ankele@…> (07/18/12 14:02:13)
Message:

VectorQuery: removed obsolete _check parameter

Location:
src/UIElements/TextUI
Files:
24 edited

Legend:

Unmodified
Added
Removed

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

    r30cd0d r9d5531  
    3030#include "World.hpp"
    3131
    32 TextDialog::AtomTextQuery::AtomTextQuery(Parameter<const atom *> &param, std::string title, std::string _description) :
    33     Dialog::AtomQuery(param, title,_description)
     32TextDialog::AtomTextQuery::AtomTextQuery(Parameter<const atom *> &_param, std::string title, std::string _description) :
     33    Dialog::AtomQuery(_param, title,_description)
    3434{}
    3535
    … …  
    5151    }
    5252
    53     const atom * temp_atom = World::getInstance().getAtom(AtomById(idxOfAtom));
    54     if(!temp_atom && idxOfAtom!=-1){
     53    temp = World::getInstance().getAtom(AtomById(idxOfAtom));
     54    if(!temp && idxOfAtom!=-1){
    5555      std::cout << "Invalid Atom Index" << idxOfAtom << std::endl;
    5656      badInput = true;
    57     }
    58     tmp.set(temp_atom);
     57    }else
     58      param.set(temp);
    5959
    6060  } while(badInput);

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

    r30cd0d r9d5531  
    3131
    3232
    33 TextDialog::AtomsTextQuery::AtomsTextQuery(Parameter<std::vector<const atom *> > &param, std::string title, std::string _description) :
    34     Dialog::AtomsQuery(param, title,_description)
     33TextDialog::AtomsTextQuery::AtomsTextQuery(Parameter<std::vector<const atom *> > &_param, std::string title, std::string _description) :
     34    Dialog::AtomsQuery(_param, title,_description)
    3535{}
    3636
    … …  
    4444  // dissect by " "
    4545  std::string::iterator olditer = line.begin();
    46   std::vector<const atom *> temp_atoms;
    4746  for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {
    4847    if (*iter == ' ') {
    4948      std::istringstream stream(std::string(iter, olditer));
    5049      stream >> idxOfAtom;
    51       temp = World::getInstance().getAtom(AtomById(idxOfAtom));
    52       if(!temp && idxOfAtom!=-1){
     50      temp_element = World::getInstance().getAtom(AtomById(idxOfAtom));
     51      if(!temp_element && idxOfAtom!=-1){
    5352        std::cout << "Invalid Atom Index" << idxOfAtom << std::endl;
    5453        break;
    5554      }
    56       temp_atoms.push_back(temp);
     55      temp.push_back(temp_element);
    5756      olditer = iter;
    5857    }
    … …  
    6160    std::istringstream stream(std::string(olditer, line.end()));
    6261    stream >> idxOfAtom;
    63     temp = World::getInstance().getAtom(AtomById(idxOfAtom));
    64     if(!temp && idxOfAtom!=-1) {
     62    temp_element = World::getInstance().getAtom(AtomById(idxOfAtom));
     63    if(!temp_element && idxOfAtom!=-1) {
    6564      std::cout << "Invalid Atom Index" << idxOfAtom << std::endl;
    66       temp_atoms.push_back(temp);
     65      temp.push_back(temp_element);
    6766    }
    6867  }
    69   tmp.set(temp_atoms);
     68  param.set(temp);
    7069
    7170  return (idxOfAtom!=-1);

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

    r30cd0d r9d5531  
    2828
    2929
    30 TextDialog::BooleanTextQuery::BooleanTextQuery(Parameter<bool> &param, std::string title, std::string _description) :
    31     Dialog::BooleanQuery(param, title,_description)
     30TextDialog::BooleanTextQuery::BooleanTextQuery(Parameter<bool> &_param, std::string title, std::string _description) :
     31    Dialog::BooleanQuery(_param, title,_description)
    3232{}
    3333
    … …  
    4242    std::cin >> input;
    4343    if ((input == 'y' ) || (input == 'Y')) {
    44       tmp.set(true);
     44      param.set(true);
    4545    } else if ((input == 'n' ) || (input == 'N')) {
    46       tmp.set(false);
     46      param.set(false);
    4747    } else {
    4848      badInput=true;

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

    r30cd0d r9d5531  
    2828
    2929
    30 TextDialog::DoubleTextQuery::DoubleTextQuery(Parameter<double> &param, std::string title, std::string _description) :
    31     Dialog::DoubleQuery(param, title,_description)
     30TextDialog::DoubleTextQuery::DoubleTextQuery(Parameter<double> &_param, std::string title, std::string _description) :
     31    Dialog::DoubleQuery(_param, title,_description)
    3232{}
    3333
    … …  
    3939    badInput = false;
    4040    std::cout << getDescription() << ": ";\
    41     double temp_double;
    42     std::cin >> temp_double;
     41    std::cin >> temp;
    4342    if(std::cin.fail()){
    4443      badInput = true;
    … …  
    4645      std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    4746      std::cout << "Input was not a number!" << std::endl;
    48     }
    49     tmp.set(temp_double);
     47    }else
     48      param.set(temp);
    5049  }while(badInput);
    5150  std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');

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

    r30cd0d r9d5531  
    2828
    2929
    30 TextDialog::DoublesTextQuery::DoublesTextQuery(Parameter<std::vector<double> > &param, std::string title, std::string _description) :
    31     Dialog::DoublesQuery(param, title,_description)
     30TextDialog::DoublesTextQuery::DoublesTextQuery(Parameter<std::vector<double> > &_param, std::string title, std::string _description) :
     31    Dialog::DoublesQuery(_param, title,_description)
    3232{}
    3333
    … …  
    4040  // dissect by " "
    4141  std::string::iterator olditer = line.begin();
    42   std::vector<double> temp_doubles;
    4342  for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {
    4443    if (*iter == ' ') {
    4544      std::istringstream stream(std::string(iter, olditer));
    46       stream >> temp;
    47       temp_doubles.push_back(temp);
     45      stream >> temp_element;
     46      temp.push_back(temp_element);
    4847      olditer = iter;
    4948    }
    … …  
    5150  if (olditer != line.begin()) { // insert last part also
    5251    std::istringstream stream(std::string(olditer, line.end()));
    53     stream >> temp;
    54     temp_doubles.push_back(temp);
     52    stream >> temp_element;
     53    temp.push_back(temp_element);
    5554  }
    56   tmp.set(temp_doubles);
     55  param.set(temp);
    5756
    5857  return true;

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

    r30cd0d r9d5531  
    3131
    3232
    33 TextDialog::ElementTextQuery::ElementTextQuery(Parameter<const element *> &param, std::string title, std::string _description) :
    34     Dialog::ElementQuery(param, title,_description)
     33TextDialog::ElementTextQuery::ElementTextQuery(Parameter<const element *> &_param, std::string title, std::string _description) :
     34    Dialog::ElementQuery(_param, title,_description)
    3535{}
    3636
    … …  
    4141  bool badInput=false;
    4242  bool aborted = false;
    43   const element * temp = NULL;
     43  temp = NULL;
    4444  do{
    4545    badInput = false;

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

    r30cd0d r9d5531  
    3535
    3636
    37 TextDialog::ElementsTextQuery::ElementsTextQuery(Parameter<std::vector<const element *> > &param, std::string title, std::string _description) :
    38     Dialog::ElementsQuery(param, title,_description)
     37TextDialog::ElementsTextQuery::ElementsTextQuery(Parameter<std::vector<const element *> > &_param, std::string title, std::string _description) :
     38    Dialog::ElementsQuery(_param, title,_description)
    3939{}
    4040
    … …  
    5050  // dissect by " "
    5151  std::string::iterator olditer = line.begin();
    52   std::vector<const element *> temp_elements;
    5352  for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {
    5453    if (*iter == ' ') {
    … …  
    5756      try {
    5857        Z = lexical_cast<int>(shorthand);
    59         temp = World::getInstance().getPeriode()->FindElement(Z);
     58        temp_element = World::getInstance().getPeriode()->FindElement(Z);
    6059      } catch (bad_lexical_cast) {
    61         temp = World::getInstance().getPeriode()->FindElement(shorthand.c_str());
     60        temp_element = World::getInstance().getPeriode()->FindElement(shorthand.c_str());
    6261      };
    63       if(!temp && Z!=-1){
     62      if(!temp_element && Z!=-1){
    6463        std::cout << "Invalid Element" << shorthand << std::endl;
    6564        break;
    6665      }
    67       temp_elements.push_back(temp);
     66      temp.push_back(temp_element);
    6867      olditer = iter;
    6968    }
    … …  
    7473    try {
    7574      Z = lexical_cast<int>(shorthand);
    76       temp = World::getInstance().getPeriode()->FindElement(Z);
     75      temp_element = World::getInstance().getPeriode()->FindElement(Z);
    7776    } catch (bad_lexical_cast) {
    78       temp = World::getInstance().getPeriode()->FindElement(shorthand.c_str());
     77      temp_element = World::getInstance().getPeriode()->FindElement(shorthand.c_str());
    7978    };
    80     if(!temp && Z!=-1) {
     79    if(!temp_element && Z!=-1) {
    8180      std::cout << "Invalid Element" << shorthand << std::endl;
    82       temp_elements.push_back(temp);
     81      temp.push_back(temp_element);
    8382    }
    8483  }
    85   tmp.set(temp_elements);
     84  param.set(temp);
    8685
    8786  return (Z!=-1);

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

    r30cd0d r9d5531  
    3131
    3232
    33 TextDialog::FileTextQuery::FileTextQuery(Parameter<boost::filesystem::path> &param, std::string title, std::string _description) :
    34     Dialog::FileQuery(param, title,_description)
     33TextDialog::FileTextQuery::FileTextQuery(Parameter<boost::filesystem::path> &_param, std::string title, std::string _description) :
     34    Dialog::FileQuery(_param, title,_description)
    3535{}
    3636
    … …  
    3939bool TextDialog::FileTextQuery::handle() {
    4040  bool badInput = false;
    41   std::string tempstring;
    4241  do{
    4342    badInput = false;
    4443    std::cout << getDescription() << ": ";
    45     std::cin >> tempstring;
     44    std::cin >> temp;
    4645    if(std::cin.fail()){
    4746      badInput = true;
    … …  
    5352  } while(badInput);
    5453  std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    55   tmp.set(tempstring);
     54  param.set(temp);
    5655  return true;
    5756}

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

    r30cd0d r9d5531  
    3131
    3232
    33 TextDialog::FilesTextQuery::FilesTextQuery(Parameter<std::vector< boost::filesystem::path> > &param, std::string title, std::string _description) :
    34     Dialog::FilesQuery(param, title,_description)
     33TextDialog::FilesTextQuery::FilesTextQuery(Parameter<std::vector< boost::filesystem::path> > &_param, std::string title, std::string _description) :
     34    Dialog::FilesQuery(_param, title,_description)
    3535{}
    3636
    … …  
    6464  } while(continueflag);
    6565  std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    66   tmp.set(tempfiles);
     66  param.set(tempfiles);
    6767  return true;
    6868}

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

    r30cd0d r9d5531  
    2828
    2929
    30 TextDialog::IntTextQuery::IntTextQuery(Parameter<int> &param, std::string title, std::string _description) :
    31     Dialog::IntQuery(param, title,_description)
     30TextDialog::IntTextQuery::IntTextQuery(Parameter<int> &_param, std::string title, std::string _description) :
     31    Dialog::IntQuery(_param, title,_description)
    3232{}
    3333
    … …  
    3939    badInput = false;
    4040    std::cout << getDescription() << ": ";
    41     int temp_int;
    42     std::cin >> temp_int;
    43     tmp.set(temp_int);
     41    std::cin >> temp;
    4442    if(std::cin.fail()){
    4543      badInput=true;
    … …  
    4745      std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    4846      std::cout << "Input was not a number!" << std::endl;
    49     }
     47    }else
     48      param.set(temp);
    5049  } while(badInput);
    5150  // clear the input buffer of anything still in the line

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

    r30cd0d r9d5531  
    2828
    2929
    30 TextDialog::IntsTextQuery::IntsTextQuery(Parameter<std::vector<int> > &param, std::string title, std::string _description) :
    31     Dialog::IntsQuery(param, title,_description)
     30TextDialog::IntsTextQuery::IntsTextQuery(Parameter<std::vector<int> > &_param, std::string title, std::string _description) :
     31    Dialog::IntsQuery(_param, title,_description)
    3232{}
    3333
    … …  
    3939  getline(std::cin,line);
    4040  // dissect by " "
    41   std::vector<int> temp_int;
    4241  std::string::iterator olditer = line.begin();
    4342  for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {
    4443    if (*iter == ' ') {
    4544      std::istringstream stream(std::string(iter, olditer));
    46       stream >> temp;
    47       temp_int.push_back(temp);
     45      stream >> temp_element;
     46      temp.push_back(temp_element);
    4847      olditer = iter;
    4948    }
    … …  
    5150  if (olditer != line.begin()) { // insert last part also
    5251    std::istringstream stream(std::string(olditer, line.end()));
    53     stream >> temp;
    54     temp_int.push_back(temp);
     52    stream >> temp_element;
     53    temp.push_back(temp_element);
    5554  }
    56   tmp.set(temp_int);
     55  param.set(temp);
    5756
    5857  return true;

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

    r30cd0d r9d5531  
    3131
    3232
    33 TextDialog::MoleculeTextQuery::MoleculeTextQuery(Parameter<const molecule *> &param, std::string title, std::string _description) :
    34     Dialog::MoleculeQuery(param, title,_description)
     33TextDialog::MoleculeTextQuery::MoleculeTextQuery(Parameter<const molecule *> &_param, std::string title, std::string _description) :
     34    Dialog::MoleculeQuery(_param, title,_description)
    3535{}
    3636
    … …  
    5252    }
    5353
    54     const molecule *temp_mol = World::getInstance().getMolecule(MoleculeById(idxOfMol));
    55     if(!temp_mol && idxOfMol!=-1){
     54    temp = World::getInstance().getMolecule(MoleculeById(idxOfMol));
     55    if(!temp && idxOfMol!=-1){
    5656      std::cout << "Invalid Molecule Index" << std::endl;
    5757      badInput = true;
    5858    }
    59     tmp.set(temp_mol);
     59    param.set(temp);
    6060
    6161  } while(badInput);

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

    r30cd0d r9d5531  
    3131
    3232
    33 TextDialog::MoleculesTextQuery::MoleculesTextQuery(Parameter<std::vector<const molecule *> > &param, std::string title, std::string _description) :
    34     Dialog::MoleculesQuery(param, title,_description)
     33TextDialog::MoleculesTextQuery::MoleculesTextQuery(Parameter<std::vector<const molecule *> > &_param, std::string title, std::string _description) :
     34    Dialog::MoleculesQuery(_param, title,_description)
    3535{}
    3636
    … …  
    4343  getline(std::cin,line);
    4444  // dissect by " "
    45   std::vector<const molecule *> temp_mols;
    4645  std::string::iterator olditer = line.begin();
    4746  for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {
    … …  
    4948      std::istringstream stream(std::string(iter, olditer));
    5049      stream >> idxOfMol;
    51       temp = World::getInstance().getMolecule(MoleculeById(idxOfMol));
    52       if(!temp && idxOfMol!=-1){
     50      temp_element = World::getInstance().getMolecule(MoleculeById(idxOfMol));
     51      if(!temp_element && idxOfMol!=-1){
    5352        std::cout << "Invalid Molecule Index" << idxOfMol << std::endl;
    5453        break;
    5554      }
    56       temp_mols.push_back(temp);
     55      temp.push_back(temp_element);
    5756      olditer = iter;
    5857    }
    … …  
    6160    std::istringstream stream(std::string(olditer, line.end()));
    6261    stream >> idxOfMol;
    63     temp = World::getInstance().getMolecule(MoleculeById(idxOfMol));
    64     if(!temp && idxOfMol!=-1){
     62    temp_element = World::getInstance().getMolecule(MoleculeById(idxOfMol));
     63    if(!temp_element && idxOfMol!=-1){
    6564      std::cout << "Invalid Molecule Index" << idxOfMol << std::endl;
    66       temp_mols.push_back(temp);
     65      temp.push_back(temp_element);
    6766    }
    6867  }
    69   tmp.set(temp_mols);
     68  param.set(temp);
    7069
    7170  return (idxOfMol!=-1);

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

    r30cd0d r9d5531  
    3030#include "RandomNumbers/RandomNumberDistribution_Parameters.hpp"
    3131
    32 TextDialog::RandomNumberDistribution_ParametersTextQuery::RandomNumberDistribution_ParametersTextQuery(Parameter<RandomNumberDistribution_Parameters> &param, std::string title, std::string _description) :
    33     Dialog::RandomNumberDistribution_ParametersQuery(param, title,_description)
     32TextDialog::RandomNumberDistribution_ParametersTextQuery::RandomNumberDistribution_ParametersTextQuery(Parameter<RandomNumberDistribution_Parameters> &_param, std::string title, std::string _description) :
     33    Dialog::RandomNumberDistribution_ParametersQuery(_param, title,_description)
    3434{}
    3535
    … …  
    4343    std::cout << "Please enter parameters as follows: 'p=0.5;'";
    4444    std::cout << "Empty line terminates." << std::endl;
    45     RandomNumberDistribution_Parameters temp_params;
    46     std::cin >> temp_params;
    47     tmp.set(temp_params);
     45    std::cin >> temp;
    4846    if(std::cin.fail()){
    4947      badInput = true;
    … …  
    5351      continue;
    5452    }
     53    param.set(temp);
    5554
    5655  } while(badInput);

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

    r30cd0d r9d5531  
    2929
    3030
    31 TextDialog::RealSpaceMatrixTextQuery::RealSpaceMatrixTextQuery(Parameter<RealSpaceMatrix> &param, std::string title, std::string _description) :
    32     Dialog::RealSpaceMatrixQuery(param, title,_description)
     31TextDialog::RealSpaceMatrixTextQuery::RealSpaceMatrixTextQuery(Parameter<RealSpaceMatrix> &_param, std::string title, std::string _description) :
     32    Dialog::RealSpaceMatrixQuery(_param, title,_description)
    3333{}
    3434
    … …  
    3939  std::cout << getTitle();
    4040
    41   double temp[6];
     41  double dtemp[6];
    4242  std::cout << getDescription() << " - ";
    4343  std::string coords[6] = {"xx","yx","yy", "zx", "zy", "zz"};
    4444  for (int i=0;i<6;i++) {
    4545    std::cout << coords[i] << ": ";
    46     std::cin >> temp[i];
     46    std::cin >> dtemp[i];
    4747  }
    48   RealSpaceMatrix M;
    49   M.set(0,0, temp[0]);
    50   M.set(0,1, temp[1]);
    51   M.set(0,2, temp[2]);
    52   M.set(1,0, temp[1]);
    53   M.set(1,1, temp[3]);
    54   M.set(1,2, temp[4]);
    55   M.set(2,0, temp[2]);
    56   M.set(2,1, temp[4]);
    57   M.set(2,2, temp[5]);
    58   tmp.set(M);
     48  temp.set(0,0, dtemp[0]);
     49  temp.set(0,1, dtemp[1]);
     50  temp.set(0,2, dtemp[2]);
     51  temp.set(1,0, dtemp[1]);
     52  temp.set(1,1, dtemp[3]);
     53  temp.set(1,2, dtemp[4]);
     54  temp.set(2,0, dtemp[2]);
     55  temp.set(2,1, dtemp[4]);
     56  temp.set(2,2, dtemp[5]);
     57  param.set(temp);
    5958  return true;
    6059}

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

    r30cd0d r9d5531  
    2828
    2929
    30 TextDialog::StringTextQuery::StringTextQuery(Parameter<std::string> &param, std::string title, std::string _description) :
    31     Dialog::StringQuery(param, title,_description)
     30TextDialog::StringTextQuery::StringTextQuery(Parameter<std::string> &_param, std::string title, std::string _description) :
     31    Dialog::StringQuery(_param, title,_description)
    3232{}
    3333
    … …  
    3636bool TextDialog::StringTextQuery::handle() {
    3737  std::cout << getDescription() << ": ";
    38   std::string temp_string;
    39   getline(std::cin,temp_string);
    40   tmp.set(temp_string);
     38  getline(std::cin,temp);
     39  param.set(temp);
    4140  return true;
    4241}

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

    r30cd0d r9d5531  
    2828
    2929
    30 TextDialog::StringsTextQuery::StringsTextQuery(Parameter<std::vector<std::string> > &param, std::string title, std::string _description) :
    31     Dialog::StringsQuery(param, title,_description)
     30TextDialog::StringsTextQuery::StringsTextQuery(Parameter<std::vector<std::string> > &_param, std::string title, std::string _description) :
     31    Dialog::StringsQuery(_param, title,_description)
    3232{}
    3333
    … …  
    3636bool TextDialog::StringsTextQuery::handle() {
    3737  std::cout << getDescription() << ": ";
    38   getline(std::cin,temp);
     38  getline(std::cin,temp_element);
    3939  // dissect by " "
    40   std::vector<std::string> temp_strings;
    41   std::string::iterator olditer = temp.begin();
    42   for(std::string::iterator iter = temp.begin(); iter != temp.end(); ++iter) {
     40  std::string::iterator olditer = temp_element.begin();
     41  for(std::string::iterator iter = temp_element.begin(); iter != temp_element.end(); ++iter) {
    4342    if (*iter == ' ') {
    44       temp_strings.push_back(std::string(iter, olditer));
     43      temp.push_back(std::string(iter, olditer));
    4544      olditer = iter;
    4645    }
    4746  }
    48   if (olditer != temp.begin())  // insert last part also
    49     temp_strings.push_back(std::string(olditer, temp.end()));
    50   tmp.set(temp_strings);
     47  if (olditer != temp_element.begin())  // insert last part also
     48    temp.push_back(std::string(olditer, temp_element.end()));
     49  param.set(temp);
    5150
    5251  return true;

  • src/UIElements/TextUI/Query/TextQuery.hpp

    r30cd0d r9d5531  
    152152class TextDialog::VectorTextQuery : public Dialog::VectorQuery {
    153153public:
    154   VectorTextQuery(Parameter<Vector> &, std::string title,bool _check, std::string _description = NULL);
     154  VectorTextQuery(Parameter<Vector> &, std::string title, std::string _description = NULL);
    155155  virtual ~VectorTextQuery();
    156156  virtual bool handle();
    … …  
    159159class TextDialog::VectorsTextQuery : public Dialog::VectorsQuery {
    160160public:
    161   VectorsTextQuery(Parameter<std::vector<Vector> > &, std::string title,bool _check, std::string _description = NULL);
     161  VectorsTextQuery(Parameter<std::vector<Vector> > &, std::string title, std::string _description = NULL);
    162162  virtual ~VectorsTextQuery();
    163163  virtual bool handle();

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

    r30cd0d r9d5531  
    2828
    2929
    30 TextDialog::UnsignedIntTextQuery::UnsignedIntTextQuery(Parameter<unsigned int> &param, std::string title, std::string _description) :
    31     Dialog::UnsignedIntQuery(param, title,_description)
     30TextDialog::UnsignedIntTextQuery::UnsignedIntTextQuery(Parameter<unsigned int> &_param, std::string title, std::string _description) :
     31    Dialog::UnsignedIntQuery(_param, title,_description)
    3232{}
    3333
    … …  
    3939    badInput = false;
    4040    std::cout << getDescription() << ": ";
    41     unsigned int temp_uint;
    42     std::cin >> temp_uint;
     41    std::cin >> temp;
    4342    if(std::cin.fail()){
    4443      badInput=true;
    … …  
    4645      std::cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    4746      std::cout << "Input was not a number!" << std::endl;
    48     }
    49     tmp.set(temp_uint);
     47    }else
     48      param.set(temp);
    5049  } while(badInput);
    5150  // clear the input buffer of anything still in the line

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

    r30cd0d r9d5531  
    2828
    2929
    30 TextDialog::UnsignedIntsTextQuery::UnsignedIntsTextQuery(Parameter<std::vector<unsigned int> > &param, std::string title, std::string _description) :
    31     Dialog::UnsignedIntsQuery(param, title,_description)
     30TextDialog::UnsignedIntsTextQuery::UnsignedIntsTextQuery(Parameter<std::vector<unsigned int> > &_param, std::string title, std::string _description) :
     31    Dialog::UnsignedIntsQuery(_param, title,_description)
    3232{}
    3333
    … …  
    3939  getline(std::cin,line);
    4040  // dissect by " "
    41   std::vector<unsigned int> temp_uints;
    4241  std::string::iterator olditer = line.begin();
    4342  for(std::string::iterator iter = line.begin(); iter != line.end(); ++iter) {
    4443    if (*iter == ' ') {
    4544      std::istringstream stream(std::string(iter, olditer));
    46       stream >> temp;
    47       temp_uints.push_back(temp);
     45      stream >> temp_element;
     46      temp.push_back(temp_element);
    4847      olditer = iter;
    4948    }
    … …  
    5150  if (olditer != line.begin()) { // insert last part also
    5251    std::istringstream stream(std::string(olditer, line.end()));
    53     stream >> temp;
    54     temp_uints.push_back(temp);
     52    stream >> temp_element;
     53    temp.push_back(temp_element);
    5554  }
    56   tmp.set(temp_uints);
     55  param.set(temp);
    5756
    5857  return true;

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

    r30cd0d r9d5531  
    3131
    3232
    33 TextDialog::VectorTextQuery::VectorTextQuery(Parameter<Vector> &param, std::string title, bool _check, std::string _description) :
    34     Dialog::VectorQuery(param, title,_check,_description)
     33TextDialog::VectorTextQuery::VectorTextQuery(Parameter<Vector> &_param, std::string title, std::string _description) :
     34    Dialog::VectorQuery(_param, title,_description)
    3535{}
    3636
    … …  
    4848  getline(std::cin,line);
    4949
    50   Vector temp_vector;
    51 
    5250  // dissect by ","
    5351  double coord = 0.;
    … …  
    5856      std::istringstream stream(std::string(iter, olditer));
    5957      stream >> coord;
    60       temp_vector[counter++] = coord;
     58      temp[counter++] = coord;
    6159      olditer = iter;
    6260    }
    … …  
    6563    std::istringstream stream(std::string(olditer, line.end()));
    6664    stream >> coord;
    67     temp_vector[counter++] = coord;
     65    temp[counter++] = coord;
    6866  }
    69   tmp.set(temp_vector);
     67  param.set(temp);
    7068
    7169  // check vector
    72   return World::getInstance().getDomain().isValid(temp_vector);
     70  return World::getInstance().getDomain().isValid(temp);
    7371}
    7472

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

    r30cd0d r9d5531  
    3131
    3232
    33 TextDialog::VectorsTextQuery::VectorsTextQuery(Parameter<std::vector<Vector> > &param, std::string title, bool _check, std::string _description) :
    34     Dialog::VectorsQuery(param, title,_check,_description)
     33TextDialog::VectorsTextQuery::VectorsTextQuery(Parameter<std::vector<Vector> > &_param, std::string title, std::string _description) :
     34    Dialog::VectorsQuery(_param, title,_description)
    3535{}
    3636
    … …  
    5050  // dissect by ","
    5151  double coord = 0.;
    52   std::vector<Vector> temp_vectors;
    5352  std::string::iterator olditerspace = line.begin();
    5453  std::string::iterator olditercomma = line.begin();
    … …  
    6362          std::istringstream stream(std::string(componentiter, olditercomma));
    6463          stream >> coord;
    65           temp[counter++] = coord;
     64          temp_element[counter++] = coord;
    6665          olditercomma = componentiter;
    6766        }
    … …  
    7069        std::istringstream stream(std::string(olditercomma, vectoriter));
    7170        stream >> coord;
    72         temp[counter++] = coord;
     71        temp_element[counter++] = coord;
    7372      }
    74       if (World::getInstance().getDomain().isValid(temp))
    75         temp_vectors.push_back(temp);
     73      if (World::getInstance().getDomain().isValid(temp_element))
     74        temp.push_back(temp_element);
    7675      olditerspace = vectoriter;
    7776    }
    7877  }
    79   tmp.set(temp_vectors);
     78  param.set(temp);
    8079
    8180  return true;

  • src/UIElements/TextUI/TextDialog.cpp

    r30cd0d r9d5531  
    3838}
    3939
    40 void TextDialog::queryBoolean(Parameter<bool> &param, const char* title, std::string description){
    41   registerQuery(new BooleanTextQuery(param, title,description));
     40void TextDialog::queryBoolean(Parameter<bool> &_param, const char* title, std::string description){
     41  registerQuery(new BooleanTextQuery(_param, title,description));
    4242}
    4343
    44 void TextDialog::queryInt(Parameter<int> &param, const char* title, std::string description){
    45   registerQuery(new IntTextQuery(param, title,description));
     44void TextDialog::queryInt(Parameter<int> &_param, const char* title, std::string description){
     45  registerQuery(new IntTextQuery(_param, title,description));
    4646}
    4747
    48 void TextDialog::queryInts(Parameter<std::vector<int> > &param, const char* title, std::string description){
    49   registerQuery(new IntsTextQuery(param, title,description));
     48void TextDialog::queryInts(Parameter<std::vector<int> > &_param, const char* title, std::string description){
     49  registerQuery(new IntsTextQuery(_param, title,description));
    5050}
    5151
    52 void TextDialog::queryUnsignedInt(Parameter<unsigned int> &param, const char* title, std::string description){
    53   registerQuery(new UnsignedIntTextQuery(param, title,description));
     52void TextDialog::queryUnsignedInt(Parameter<unsigned int> &_param, const char* title, std::string description){
     53  registerQuery(new UnsignedIntTextQuery(_param, title,description));
    5454}
    5555
    56 void TextDialog::queryUnsignedInts(Parameter<std::vector<unsigned int> > &param, const char* title, std::string description){
    57   registerQuery(new UnsignedIntsTextQuery(param, title,description));
     56void TextDialog::queryUnsignedInts(Parameter<std::vector<unsigned int> > &_param, const char* title, std::string description){
     57  registerQuery(new UnsignedIntsTextQuery(_param, title,description));
    5858}
    5959
    60 void TextDialog::queryDouble(Parameter<double> &param, const char* title, std::string description){
    61   registerQuery(new DoubleTextQuery(param, title,description));
     60void TextDialog::queryDouble(Parameter<double> &_param, const char* title, std::string description){
     61  registerQuery(new DoubleTextQuery(_param, title,description));
    6262}
    6363
    64 void TextDialog::queryDoubles(Parameter<std::vector<double> > &param, const char* title, std::string description){
    65   registerQuery(new DoublesTextQuery(param, title,description));
     64void TextDialog::queryDoubles(Parameter<std::vector<double> > &_param, const char* title, std::string description){
     65  registerQuery(new DoublesTextQuery(_param, title,description));
    6666}
    6767
    68 void TextDialog::queryString(Parameter<std::string> &param, const char* title, std::string description){
    69   registerQuery(new StringTextQuery(param, title,description));
     68void TextDialog::queryString(Parameter<std::string> &_param, const char* title, std::string description){
     69  registerQuery(new StringTextQuery(_param, title,description));
    7070}
    7171
    72 void TextDialog::queryStrings(Parameter<std::vector<std::string> > &param, const char* title, std::string description){
    73   registerQuery(new StringsTextQuery(param, title,description));
     72void TextDialog::queryStrings(Parameter<std::vector<std::string> > &_param, const char* title, std::string description){
     73  registerQuery(new StringsTextQuery(_param, title,description));
    7474}
    7575
    76 void TextDialog::queryAtom(Parameter<const atom *> &param, const char* title, std::string description) {
    77   registerQuery(new AtomTextQuery(param, title,description));
     76void TextDialog::queryAtom(Parameter<const atom *> &_param, const char* title, std::string description) {
     77  registerQuery(new AtomTextQuery(_param, title,description));
    7878}
    7979
    80 void TextDialog::queryAtoms(Parameter<std::vector<const atom *> > &param, const char* title, std::string description) {
    81   registerQuery(new AtomsTextQuery(param, title,description));
     80void TextDialog::queryAtoms(Parameter<std::vector<const atom *> > &_param, const char* title, std::string description) {
     81  registerQuery(new AtomsTextQuery(_param, title,description));
    8282}
    8383
    84 void TextDialog::queryMolecule(Parameter<const molecule *> &param, const char* title, std::string description) {
    85   registerQuery(new MoleculeTextQuery(param, title,description));
     84void TextDialog::queryMolecule(Parameter<const molecule *> &_param, const char* title, std::string description) {
     85  registerQuery(new MoleculeTextQuery(_param, title,description));
    8686}
    8787
    88 void TextDialog::queryMolecules(Parameter<std::vector<const molecule *> > &param, const char* title, std::string description) {
    89   registerQuery(new MoleculesTextQuery(param, title,description));
     88void TextDialog::queryMolecules(Parameter<std::vector<const molecule *> > &_param, const char* title, std::string description) {
     89  registerQuery(new MoleculesTextQuery(_param, title,description));
    9090}
    9191
    92 void TextDialog::queryVector(Parameter<Vector> &param, const char* title, bool check, std::string description) {
    93   registerQuery(new VectorTextQuery(param, title,check,description));
     92void TextDialog::queryVector(Parameter<Vector> &_param, const char* title, std::string description) {
     93  registerQuery(new VectorTextQuery(_param, title,description));
    9494}
    9595
    96 void TextDialog::queryVectors(Parameter<std::vector<Vector> > &param, const char* title, bool check, std::string description) {
    97   registerQuery(new VectorsTextQuery(param, title,check,description));
     96void TextDialog::queryVectors(Parameter<std::vector<Vector> > &_param, const char* title, std::string description) {
     97  registerQuery(new VectorsTextQuery(_param, title,description));
    9898}
    9999
    100 void TextDialog::queryRealSpaceMatrix(Parameter<RealSpaceMatrix> &param, const char* title, std::string description) {
    101   registerQuery(new RealSpaceMatrixTextQuery(param, title,description));
     100void TextDialog::queryRealSpaceMatrix(Parameter<RealSpaceMatrix> &_param, const char* title, std::string description) {
     101  registerQuery(new RealSpaceMatrixTextQuery(_param, title,description));
    102102}
    103103
    104 void TextDialog::queryElement(Parameter<const element *> &param, const char* title, std::string description){
    105   registerQuery(new ElementTextQuery(param, title,description));
     104void TextDialog::queryElement(Parameter<const element *> &_param, const char* title, std::string description){
     105  registerQuery(new ElementTextQuery(_param, title,description));
    106106}
    107107
    108 void TextDialog::queryElements(Parameter<std::vector<const element *> > &param, const char* title, std::string description){
    109   registerQuery(new ElementsTextQuery(param, title,description));
     108void TextDialog::queryElements(Parameter<std::vector<const element *> > &_param, const char* title, std::string description){
     109  registerQuery(new ElementsTextQuery(_param, title,description));
    110110}
    111111
    112 void TextDialog::queryFile(Parameter<boost::filesystem::path> &param, const char* title, std::string description){
    113   registerQuery(new FileTextQuery(param, title,description));
     112void TextDialog::queryFile(Parameter<boost::filesystem::path> &_param, const char* title, std::string description){
     113  registerQuery(new FileTextQuery(_param, title,description));
    114114}
    115115
    116 void TextDialog::queryFiles(Parameter<std::vector< boost::filesystem::path> > &param, const char* title, std::string description){
    117   registerQuery(new FilesTextQuery(param, title,description));
     116void TextDialog::queryFiles(Parameter<std::vector< boost::filesystem::path> > &_param, const char* title, std::string description){
     117  registerQuery(new FilesTextQuery(_param, title,description));
    118118}
    119119
    120 void TextDialog::queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &param, const char* title, std::string description){
    121   registerQuery(new RandomNumberDistribution_ParametersTextQuery(param, title,description));
     120void TextDialog::queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &_param, const char* title, std::string description){
     121  registerQuery(new RandomNumberDistribution_ParametersTextQuery(_param, title,description));
    122122}
     123
    123124
    124125/************************** Query Infrastructure ************************/

  • src/UIElements/TextUI/TextDialog.hpp

    r30cd0d r9d5531  
    4545  virtual void queryMolecule(Parameter<const molecule *> &, const char*,std::string = "");
    4646  virtual void queryMolecules(Parameter<std::vector<const molecule *> > &, const char*,std::string = "");
    47   virtual void queryVector(Parameter<Vector> &, const char*,bool, std::string = "");
    48   virtual void queryVectors(Parameter<std::vector<Vector> > &, const char*,bool, std::string = "");
     47  virtual void queryVector(Parameter<Vector> &, const char*, std::string = "");
     48  virtual void queryVectors(Parameter<std::vector<Vector> > &, const char*, std::string = "");
    4949  virtual void queryRealSpaceMatrix(Parameter<RealSpaceMatrix> &, const char*, std::string = "");
    5050  virtual void queryElement(Parameter<const element *> &, const char*, std::string = "");
Note: See TracChangeset for help on using the changeset viewer.