Ignore:
Timestamp:
Jun 7, 2010, 11:53:44 PM (15 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:
19c0e3
Parents:
3610bb
git-author:
Frederik Heber <heber@…> (06/07/10 23:48:31)
git-committer:
Frederik Heber <heber@…> (06/07/10 23:53:44)
Message:

BUGFIX: ListOfDoubles changed to Box and Vector.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/UIElements/CommandLineUI/CommandLineDialog.cpp

    r3610bb r0286bc  
    1515#include <Descriptors/MoleculeIdDescriptor.hpp>
    1616#include "CommandLineUI/CommandLineDialog.hpp"
     17
     18#include "Actions/Values.hpp"
    1719
    1820#include "element.hpp"
     
    116118
    117119bool CommandLineDialog::BooleanCommandLineQuery::handle() {
    118   bool badInput = false;
    119   char input = ' ';
    120   do{
    121     badInput = false;
    122     Log() << Verbose(0) << getTitle();
    123     cin >> input;
    124     if ((input == 'y' ) || (input == 'Y')) {
    125       tmp = true;
    126     } else if ((input == 'n' ) || (input == 'N')) {
    127       tmp = false;
    128     } else {
    129       badInput=true;
    130       cin.clear();
    131       cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    132       Log() << Verbose(0) << "Input was not of [yYnN]!" << endl;
    133     }
    134   } while(badInput);
    135   // clear the input buffer of anything still in the line
    136   cin.ignore(std::numeric_limits<streamsize>::max(),'\n');
    137   return true;
     120  if (CommandLineParser::getInstance().vm.count(getTitle())) {
     121    tmp = CommandLineParser::getInstance().vm[getTitle()].as<bool>();
     122    return true;
     123  } else
     124    return false;
    138125}
    139126
     
    210197
    211198bool CommandLineDialog::VectorCommandLineQuery::handle() {
    212   vector<double> temp;
    213   if (CommandLineParser::getInstance().vm.count(getTitle())) {
    214     temp = CommandLineParser::getInstance().vm[getTitle()].as<vector<double> >();
    215     assert((temp.size() == 3) && "Vector from command line does not have three components.");
    216     for (int i=0;i<NDIM;i++)
    217       tmp->at(i) = temp[i];
     199  VectorValue temp;
     200  if (CommandLineParser::getInstance().vm.count(getTitle())) {
     201    temp = CommandLineParser::getInstance().vm[getTitle()].as< VectorValue >();
     202    tmp->at(0) = temp.x;
     203    tmp->at(1) = temp.y;
     204    tmp->at(2) = temp.z;
    218205    return true;
    219206  } else
     
    230217
    231218bool CommandLineDialog::BoxCommandLineQuery::handle() {
    232   vector<double> temp;
    233   if (CommandLineParser::getInstance().vm.count(getTitle())) {
    234     temp = CommandLineParser::getInstance().vm[getTitle()].as<vector<double> >();
    235     assert((temp.size() == 6) && "Symmetric box matrix from command line does not have six components.");
    236     for (int i=0;i<6;i++) {
    237       tmp[i] = temp[i];
    238     }
     219  BoxValue temp;
     220  if (CommandLineParser::getInstance().vm.count(getTitle())) {
     221    temp = CommandLineParser::getInstance().vm[getTitle()].as< BoxValue >();
     222    tmp[0] = temp.xx;
     223    tmp[1] = temp.xy;
     224    tmp[2] = temp.xz;
     225    tmp[3] = temp.yy;
     226    tmp[4] = temp.yz;
     227    tmp[5] = temp.zz;
    239228    return true;
    240229  } else
Note: See TracChangeset for help on using the changeset viewer.