Ignore:
Timestamp:
Oct 30, 2010, 8:42: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:
76cec6, c38826
Parents:
23359f
git-author:
Frederik Heber <heber@…> (10/30/10 19:55:54)
git-committer:
Frederik Heber <heber@…> (10/30/10 20:42:44)
Message:

Huge refactoring: Introduction of Traits to Actions.

This change is really big but the introduction of the Trait concept (at least
in its current light form) is so fundamental that lots of pieces had to be
changed in order to get everything working.

The main point why it was necessary to add these traits in the first place was
to comfortably allow for adding extension of Actions information-wise, i.e.
with stuff that is only important for the QtUI, such as icons, or tooltips, ...
This extra information should not be stored with Action itself, as it has
nothing to do with the workings of the Action. And neither should it get
stored with some blown-out-of-proportions MapOfActions class ...

The gist of the change is as follows:

  • OptionTrait contains the token, description, shortform and type of an option, such as ("position", "position in space, none, typeid(Vector)).
  • ActionTrait is the derived form for actions where additionally MenuPosition and MenuName are stored (and probably more to come for the GUI), also we have a set of OptionTrait instances, one for each option of the Action.
  • Action then contains this ActionTrait, specialized for each Action.
  • the preprocessor macros have been enhanced to gather all this information from the .def files.
  • MapOfActions is gone. Completely. Most of its use was to store this extra information and the ValueStorage part now is just in class ValueStorage.
  • ValueStorage is no more an interface to MapOfActions but as the name says a (type-safe) ValueStorage.

Listing the (remaining) changes in alphabetical order of the class:

  • Action
    • member value ::name dropped, ::getName() uses ActionTraits::getName()
    • new define NODEFAULT which is used in paramdefaults in .def files
    • all derived actions classes such as Process, Calculations, MakroAction,... have been adapated to use the ActionTrait concept as well.
  • ActionHistory
    • extraced RedoAction and UndoAction, shifted implementation into their own object files and they use .def files as well (i.e. streamlined with method used for other actions)
  • MenuDescription
    • contain information on Menus such as name, ...
    • new unit test checks for consistency
  • molecule
    • const member functions: Copy(), Output() and OutputBonds()
  • OptionRegistry
    • new registry class for options only
    • we want the same type throughout the code for each token, e.g. "position"
    • the registry containts checks for consistency
  • OptionTrait
    • default values are specified in paramdefaults, none are given by NODEFAULT
    • introduced default for translate-atoms, point-correlation, pair-correlation
  • Registry pattern
    • new unit test, but only sceleton code so far
  • ...Query, also ...Pipe
    • atoms, molecule and elements are now all const
    • also ValueStorage's signatures all have const therein
  • ValueStorage
    • set/queryCurrentValue from MapOfActions
    • at times VectorValue has been in .def files where Vector was in the signature. This is cleared. Such stuff is only present for e.g. BoxVector being queried as a Vector. But this is a feature and intended.
  • World
    • most of the (un)selection functions now work on const atoms and molecules
    • in one case we need a const_cast to remove this, but this is intentional, as the vector of selected atoms stores non-const pointers and this is ok.

There is only one test which had to be changed slightly because a specific
option token as "position" must now have the same type everywhere, e.g. always
Vector.

  • TESTFIX: Simple_configuration/2: --position -> --domain-position (and associated to BoxVector)
Location:
src/Actions/SelectionAction
Files:
44 edited

Legend:

Unmodified
Added
Removed
  • src/Actions/SelectionAction/AllAtomsAction.cpp

    r23359f re4afb4  
    7272  return true;
    7373}
    74 
    75 const string SelectionAllAtomsAction::getName() {
    76   return NAME;
    77 }
    7874/** =========== end of function ====================== */
  • src/Actions/SelectionAction/AllAtomsAction.def

    r23359f re4afb4  
    1111// i.e. there is an integer with variable name Z that can be found in
    1212// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    13 // "undefine" if no parameters are required
     13// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
    1414#undef paramtypes
    1515#undef paramtokens
    1616#undef paramdescriptions
     17#undef paramdefaults
    1718#undef paramreferences
    1819
     
    2930
    3031// finally the information stored in the ActionTrait specialization
    31 #undef DEFAULTVALUE
    3232#define DESCRIPTION "select all atoms"
    3333#undef SHORTFORM
    34 #define TYPEINFO &typeid(void)
  • src/Actions/SelectionAction/AllAtomsInsideCuboidAction.cpp

    r23359f re4afb4  
    8686  return true;
    8787}
    88 
    89 const string SelectionAllAtomsInsideCuboidAction::getName() {
    90   return NAME;
    91 }
    9288/** =========== end of function ====================== */
  • src/Actions/SelectionAction/AllAtomsInsideCuboidAction.def

    r23359f re4afb4  
    1313// i.e. there is an integer with variable name Z that can be found in
    1414// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    15 // "undefine" if no parameters are required
     15// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
    1616#define paramtypes (Vector)(Vector)(double)(double)(double)
    1717#define paramtokens ("select-atoms-inside-cuboid")("position")("angle-x")("angle-y")("angle-z")
    18 #define paramdescriptions ("select all atoms inside a cuboid")("position in R^3 space")("angle of a rotation around x axis")("angle of a rotation around y axis")("angle of a rotation around z axis")
     18#define paramdescriptions ("dimensions of cuboid")("position in R^3 space")("angle of a rotation around x axis")("angle of a rotation around y axis")("angle of a rotation around z axis")
     19#undef paramdefaults
    1920#define paramreferences (extension)(position)(Xangle)(Yangle)(Zangle)
    2021
     
    3132
    3233// finally the information stored in the ActionTrait specialization
    33 #undef DEFAULTVALUE
    3434#define DESCRIPTION "select all atoms inside a cuboid"
    3535#undef SHORTFORM
    36 #define TYPEINFO &typeid(VectorValue)
  • src/Actions/SelectionAction/AllAtomsInsideSphereAction.cpp

    r23359f re4afb4  
    8080  return true;
    8181}
    82 
    83 const string SelectionAllAtomsInsideSphereAction::getName() {
    84   return NAME;
    85 }
    8682/** =========== end of function ====================== */
  • src/Actions/SelectionAction/AllAtomsInsideSphereAction.def

    r23359f re4afb4  
    1111// i.e. there is an integer with variable name Z that can be found in
    1212// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    13 // "undefine" if no parameters are required
     13// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
    1414#define paramtypes (double)(Vector)
    1515#define paramtokens ("select-atoms-inside-sphere")("position")
    16 #define paramdescriptions ("select all atoms inside a sphere")("position in R^3 space")
     16#define paramdescriptions ("sphere radius")("position in R^3 space")
     17#undef paramdefaults
    1718#define paramreferences (radius)(position)
    1819
     
    2930
    3031// finally the information stored in the ActionTrait specialization
    31 #undef DEFAULTVALUE
    3232#define DESCRIPTION "select all atoms inside a sphere"
    3333#undef SHORTFORM
    34 #define TYPEINFO &typeid(double)
  • src/Actions/SelectionAction/AllAtomsOfMoleculeAction.cpp

    r23359f re4afb4  
    7474  return true;
    7575}
    76 
    77 const string SelectionAllAtomsOfMoleculeAction::getName() {
    78   return NAME;
    79 }
    8076/** =========== end of function ====================== */
  • src/Actions/SelectionAction/AllAtomsOfMoleculeAction.def

    r23359f re4afb4  
    1111// i.e. there is an integer with variable name Z that can be found in
    1212// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    13 // "undefine" if no parameters are required
    14 #define paramtypes (molecule *)
     13// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
     14#define paramtypes (const molecule *)
    1515#define paramtokens ("select-molecules-atoms")
    16 #define paramdescriptions ("select all atoms of a molecule")
     16#define paramdescriptions ("molecule to select")
     17#undef paramdefaults
    1718#define paramreferences (mol)
    1819
     
    2930
    3031// finally the information stored in the ActionTrait specialization
    31 #undef DEFAULTVALUE
    3232#define DESCRIPTION "select all atoms of a molecule"
    3333#undef SHORTFORM
    34 #define TYPEINFO &typeid(molecule)
  • src/Actions/SelectionAction/AllMoleculesAction.cpp

    r23359f re4afb4  
    7272  return true;
    7373}
    74 
    75 const string SelectionAllMoleculesAction::getName() {
    76   return NAME;
    77 }
    7874/** =========== end of function ====================== */
  • src/Actions/SelectionAction/AllMoleculesAction.def

    r23359f re4afb4  
    1010// i.e. there is an integer with variable name Z that can be found in
    1111// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    12 // "undefine" if no parameters are required
     12// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
    1313#undef paramtypes
    1414#undef paramtokens
    1515#undef paramdescriptions
     16#undef paramdefaults
    1617#undef paramreferences
    1718
     
    2829
    2930// finally the information stored in the ActionTrait specialization
    30 #undef DEFAULTVALUE
    3131#define DESCRIPTION "select all molecules"
    3232#undef SHORTFORM
    33 #define TYPEINFO &typeid(void)
  • src/Actions/SelectionAction/AtomByElementAction.cpp

    r23359f re4afb4  
    7474  return true;
    7575}
    76 
    77 const string SelectionAtomByElementAction::getName() {
    78   return NAME;
    79 }
    8076/** =========== end of function ====================== */
  • src/Actions/SelectionAction/AtomByElementAction.def

    r23359f re4afb4  
    1111// i.e. there is an integer with variable name Z that can be found in
    1212// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    13 // "undefine" if no parameters are required
     13// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
    1414#define paramtypes (const element*)
    1515#define paramtokens ("select-atom-by-element")
    16 #define paramdescriptions ("select an atom by element")
     16#define paramdescriptions ("element")
     17#undef paramdefaults
    1718#define paramreferences (elemental)
    1819
     
    2930
    3031// finally the information stored in the ActionTrait specialization
    31 #undef DEFAULTVALUE
    3232#define DESCRIPTION "select an atom by element"
    3333#undef SHORTFORM
    34 #define TYPEINFO &typeid(const element)
  • src/Actions/SelectionAction/AtomByIdAction.cpp

    r23359f re4afb4  
    7474  return true;
    7575}
    76 
    77 const string SelectionAtomByIdAction::getName() {
    78   return NAME;
    79 }
    8076/** =========== end of function ====================== */
  • src/Actions/SelectionAction/AtomByIdAction.def

    r23359f re4afb4  
    1111// i.e. there is an integer with variable name Z that can be found in
    1212// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    13 // "undefine" if no parameters are required
    14 #define paramtypes (atom*)
     13// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
     14#define paramtypes (const atom*)
    1515#define paramtokens ("select-atom-by-id")
    16 #define paramdescriptions ("select an atom by index")
     16#define paramdescriptions ("atom index")
     17#undef paramdefaults
    1718#define paramreferences (Walker)
    1819
     
    2930
    3031// finally the information stored in the ActionTrait specialization
    31 #undef DEFAULTVALUE
    3232#define DESCRIPTION "select an atom by index"
    3333#undef SHORTFORM
    34 #define TYPEINFO &typeid(atom)
  • src/Actions/SelectionAction/ClearAllAtomsAction.cpp

    r23359f re4afb4  
    7272  return true;
    7373}
    74 
    75 const string SelectionClearAllAtomsAction::getName() {
    76   return NAME;
    77 }
    7874/** =========== end of function ====================== */
  • src/Actions/SelectionAction/ClearAllAtomsAction.def

    r23359f re4afb4  
    1010// i.e. there is an integer with variable name Z that can be found in
    1111// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    12 // "undefine" if no parameters are required
     12// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
    1313#undef paramtypes
    1414#undef paramtokens
    1515#undef paramdescriptions
     16#undef paramdefaults
    1617#undef paramreferences
    1718
     
    2829
    2930// finally the information stored in the ActionTrait specialization
    30 #undef DEFAULTVALUE
    3131#define DESCRIPTION "clear the atom selection"
    3232#undef SHORTFORM
    33 #define TYPEINFO &typeid(void)
  • src/Actions/SelectionAction/ClearAllMoleculesAction.cpp

    r23359f re4afb4  
    7272  return true;
    7373}
    74 
    75 const string SelectionClearAllMoleculesAction::getName() {
    76   return NAME;
    77 }
    7874/** =========== end of function ====================== */
  • src/Actions/SelectionAction/ClearAllMoleculesAction.def

    r23359f re4afb4  
    1010// i.e. there is an integer with variable name Z that can be found in
    1111// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    12 // "undefine" if no parameters are required
     12// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
    1313#undef paramtypes
    1414#undef paramtokens
    1515#undef paramdescriptions
     16#undef paramdefaults
    1617#undef paramreferences
    1718
     
    2829
    2930// finally the information stored in the ActionTrait specialization
    30 #undef DEFAULTVALUE
    3131#define DESCRIPTION "clear the molecule selection"
    3232#undef SHORTFORM
    33 #define TYPEINFO &typeid(void)
  • src/Actions/SelectionAction/MoleculeByFormulaAction.cpp

    r23359f re4afb4  
    7777  return true;
    7878}
    79 
    80 const string SelectionMoleculeByFormulaAction::getName() {
    81   return NAME;
    82 }
    8379/** =========== end of function ====================== */
  • src/Actions/SelectionAction/MoleculeByFormulaAction.def

    r23359f re4afb4  
    1111// i.e. there is an integer with variable name Z that can be found in
    1212// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    13 // "undefine" if no parameters are required
     13// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
    1414#define paramtypes (std::string)
    1515#define paramtokens ("select-molecule-by-formula")
    16 #define paramdescriptions ("select a molecule by chemical formula")
     16#define paramdescriptions ("chemical formula")
     17#undef paramdefaults
    1718#define paramreferences (formula)
    1819
     
    2930
    3031// finally the information stored in the ActionTrait specialization
    31 #undef DEFAULTVALUE
    3232#define DESCRIPTION "select a molecule by chemical formula"
    3333#undef SHORTFORM
    34 #define TYPEINFO &typeid(std::string)
  • src/Actions/SelectionAction/MoleculeByIdAction.cpp

    r23359f re4afb4  
    7474  return true;
    7575}
    76 
    77 const string SelectionMoleculeByIdAction::getName() {
    78   return NAME;
    79 }
    8076/** =========== end of function ====================== */
  • src/Actions/SelectionAction/MoleculeByIdAction.def

    r23359f re4afb4  
    1111// i.e. there is an integer with variable name Z that can be found in
    1212// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    13 // "undefine" if no parameters are required
    14 #define paramtypes (molecule*)
     13// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
     14#define paramtypes (const molecule*)
    1515#define paramtokens ("select-molecule-by-id")
    16 #define paramdescriptions ("select a molecule by index")
     16#define paramdescriptions ("molecule index")
     17#undef paramdefaults
    1718#define paramreferences (mol)
    1819
     
    2930
    3031// finally the information stored in the ActionTrait specialization
    31 #undef DEFAULTVALUE
    3232#define DESCRIPTION "select a molecule by index"
    3333#undef SHORTFORM
    34 #define TYPEINFO &typeid(molecule)
  • src/Actions/SelectionAction/MoleculeOfAtomAction.cpp

    r23359f re4afb4  
    7272  return true;
    7373}
    74 
    75 const string SelectionMoleculeOfAtomAction::getName() {
    76   return NAME;
    77 }
    7874/** =========== end of function ====================== */
  • src/Actions/SelectionAction/MoleculeOfAtomAction.def

    r23359f re4afb4  
    1010// i.e. there is an integer with variable name Z that can be found in
    1111// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    12 // "undefine" if no parameters are required
    13 #define paramtypes (atom*)
     12// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
     13#define paramtypes (const atom*)
    1414#define paramtokens ("select-molecule-of-atom")
    15 #define paramdescriptions ("select a molecule to which a given atom belongs")
     15#define paramdescriptions ("one atom of desired molecule")
     16#undef paramdefaults
    1617#define paramreferences (Walker)
    1718
     
    2829
    2930// finally the information stored in the ActionTrait specialization
    30 #undef DEFAULTVALUE
    3131#define DESCRIPTION "select a molecule to which a given atom belongs"
    3232#undef SHORTFORM
    33 #define TYPEINFO &typeid(atom)
  • src/Actions/SelectionAction/NotAllAtomsAction.cpp

    r23359f re4afb4  
    7272  return true;
    7373}
    74 
    75 const string SelectionNotAllAtomsAction::getName() {
    76   return NAME;
    77 }
    7874/** =========== end of function ====================== */
  • src/Actions/SelectionAction/NotAllAtomsAction.def

    r23359f re4afb4  
    1111// i.e. there is an integer with variable name Z that can be found in
    1212// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    13 // "undefine" if no parameters are required
     13// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
    1414#undef paramtypes
    1515#undef paramtokens
    1616#undef paramdescriptions
     17#undef paramdefaults
    1718#undef paramreferences
    1819
     
    2930
    3031// finally the information stored in the ActionTrait specialization
    31 #undef DEFAULTVALUE
    3232#define DESCRIPTION "unselect all atoms"
    3333#undef SHORTFORM
    34 #define TYPEINFO &typeid(void)
  • src/Actions/SelectionAction/NotAllAtomsInsideCuboidAction.cpp

    r23359f re4afb4  
    8686  return true;
    8787}
    88 
    89 const string SelectionNotAllAtomsInsideCuboidAction::getName() {
    90   return NAME;
    91 }
    9288/** =========== end of function ====================== */
  • src/Actions/SelectionAction/NotAllAtomsInsideCuboidAction.def

    r23359f re4afb4  
    1313// i.e. there is an integer with variable name Z that can be found in
    1414// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    15 // "undefine" if no parameters are required
     15// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
    1616#define paramtypes (Vector)(Vector)(double)(double)(double)
    1717#define paramtokens ("unselect-atoms-inside-cuboid")("position")("angle-x")("angle-y")("angle-z")
    18 #define paramdescriptions ("unselect all atoms inside a cuboid")("position in R^3 space")("angle of a rotation around x axis")("angle of a rotation around y axis")("angle of a rotation around z axis")
     18#define paramdescriptions ("dimension of cuboid")("position in R^3 space")("angle of a rotation around x axis")("angle of a rotation around y axis")("angle of a rotation around z axis")
     19#undef paramdefaults
    1920#define paramreferences (extension)(position)(Xangle)(Yangle)(Zangle)
    2021
     
    3132
    3233// finally the information stored in the ActionTrait specialization
    33 #undef DEFAULTVALUE
    3434#define DESCRIPTION "unselect all atoms inside a cuboid"
    3535#undef SHORTFORM
    36 #define TYPEINFO &typeid(VectorValue)
  • src/Actions/SelectionAction/NotAllAtomsInsideSphereAction.cpp

    r23359f re4afb4  
    8080  return true;
    8181}
    82 
    83 const string SelectionNotAllAtomsInsideSphereAction::getName() {
    84   return NAME;
    85 }
    8682/** =========== end of function ====================== */
  • src/Actions/SelectionAction/NotAllAtomsInsideSphereAction.def

    r23359f re4afb4  
    1111// i.e. there is an integer with variable name Z that can be found in
    1212// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    13 // "undefine" if no parameters are required
     13// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
    1414#define paramtypes (double)(Vector)
    1515#define paramtokens ("unselect-atoms-inside-sphere")("position")
    16 #define paramdescriptions ("unselect all atoms inside a sphere")("position in R^3 space")
     16#define paramdescriptions ("radius of sphere")("position in R^3 space")
     17#undef paramdefaults
    1718#define paramreferences (radius)(position)
    1819
     
    2930
    3031// finally the information stored in the ActionTrait specialization
    31 #undef DEFAULTVALUE
    3232#define DESCRIPTION "unselect all atoms inside a sphere"
    3333#undef SHORTFORM
    34 #define TYPEINFO &typeid(double)
  • src/Actions/SelectionAction/NotAllAtomsOfMoleculeAction.cpp

    r23359f re4afb4  
    7474  return true;
    7575}
    76 
    77 const string SelectionNotAllAtomsOfMoleculeAction::getName() {
    78   return NAME;
    79 }
    8076/** =========== end of function ====================== */
  • src/Actions/SelectionAction/NotAllAtomsOfMoleculeAction.def

    r23359f re4afb4  
    1111// i.e. there is an integer with variable name Z that can be found in
    1212// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    13 // "undefine" if no parameters are required
    14 #define paramtypes (molecule*)
     13// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
     14#define paramtypes (const molecule*)
    1515#define paramtokens ("unselect-molecules-atoms")
    16 #define paramdescriptions ("unselect all atoms of a molecule")
     16#define paramdescriptions ("molecule")
     17#undef paramdefaults
    1718#define paramreferences (mol)
    1819
     
    2930
    3031// finally the information stored in the ActionTrait specialization
    31 #undef DEFAULTVALUE
    3232#define DESCRIPTION "unselect all atoms of a molecule"
    3333#undef SHORTFORM
    34 #define TYPEINFO &typeid(molecule)
  • src/Actions/SelectionAction/NotAllMoleculesAction.cpp

    r23359f re4afb4  
    7272  return true;
    7373}
    74 
    75 const string SelectionNotAllMoleculesAction::getName() {
    76   return NAME;
    77 }
    7874/** =========== end of function ====================== */
  • src/Actions/SelectionAction/NotAllMoleculesAction.def

    r23359f re4afb4  
    1010// i.e. there is an integer with variable name Z that can be found in
    1111// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    12 // "undefine" if no parameters are required
     12// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
    1313#undef paramtypes
    1414#undef paramtokens
    1515#undef paramdescriptions
     16#undef paramdefaults
    1617#undef paramreferences
    1718
     
    2829
    2930// finally the information stored in the ActionTrait specialization
    30 #undef DEFAULTVALUE
    3131#define DESCRIPTION "unselect all molecules"
    3232#undef SHORTFORM
    33 #define TYPEINFO &typeid(void)
  • src/Actions/SelectionAction/NotAtomByElementAction.cpp

    r23359f re4afb4  
    7474  return true;
    7575}
    76 
    77 const string SelectionNotAtomByElementAction::getName() {
    78   return NAME;
    79 }
    8076/** =========== end of function ====================== */
  • src/Actions/SelectionAction/NotAtomByElementAction.def

    r23359f re4afb4  
    1111// i.e. there is an integer with variable name Z that can be found in
    1212// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    13 // "undefine" if no parameters are required
     13// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
    1414#define paramtypes (const element*)
    1515#define paramtokens ("unselect-atom-by-element")
    16 #define paramdescriptions ("unselect an atom by element")
     16#define paramdescriptions ("element")
     17#undef paramdefaults
    1718#define paramreferences (elemental)
    1819
     
    2930
    3031// finally the information stored in the ActionTrait specialization
    31 #undef DEFAULTVALUE
    3232#define DESCRIPTION "unselect an atom by element"
    3333#undef SHORTFORM
    34 #define TYPEINFO &typeid(const element)
  • src/Actions/SelectionAction/NotAtomByIdAction.cpp

    r23359f re4afb4  
    7474  return true;
    7575}
    76 
    77 const string SelectionNotAtomByIdAction::getName() {
    78   return NAME;
    79 }
    8076/** =========== end of function ====================== */
  • src/Actions/SelectionAction/NotAtomByIdAction.def

    r23359f re4afb4  
    1111// i.e. there is an integer with variable name Z that can be found in
    1212// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    13 // "undefine" if no parameters are required
    14 #define paramtypes (atom*)
     13// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
     14#define paramtypes (const atom*)
    1515#define paramtokens ("unselect-atom-by-id")
    16 #define paramdescriptions ("unselect an atom by index")
     16#define paramdescriptions ("atom index")
     17#undef paramdefaults
    1718#define paramreferences (Walker)
    1819
     
    2930
    3031// finally the information stored in the ActionTrait specialization
    31 #undef DEFAULTVALUE
    3232#define DESCRIPTION "unselect an atom by index"
    3333#undef SHORTFORM
    34 #define TYPEINFO &typeid(atom)
  • src/Actions/SelectionAction/NotMoleculeByFormulaAction.cpp

    r23359f re4afb4  
    7777  return true;
    7878}
    79 
    80 const string SelectionNotMoleculeByFormulaAction::getName() {
    81   return NAME;
    82 }
    8379/** =========== end of function ====================== */
  • src/Actions/SelectionAction/NotMoleculeByFormulaAction.def

    r23359f re4afb4  
    1111// i.e. there is an integer with variable name Z that can be found in
    1212// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    13 // "undefine" if no parameters are required
     13// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
    1414#define paramtypes (std::string)
    1515#define paramtokens ("unselect-molecule-by-formula")
    16 #define paramdescriptions ("unselect a molecule by chemical formula")
     16#define paramdescriptions ("chemical formula")
     17#undef paramdefaults
    1718#define paramreferences (formula)
    1819
     
    2930
    3031// finally the information stored in the ActionTrait specialization
    31 #undef DEFAULTVALUE
    3232#define DESCRIPTION "unselect a molecule by chemical formula"
    3333#undef SHORTFORM
    34 #define TYPEINFO &typeid(std::string)
  • src/Actions/SelectionAction/NotMoleculeByIdAction.cpp

    r23359f re4afb4  
    7474  return true;
    7575}
    76 
    77 const string SelectionNotMoleculeByIdAction::getName() {
    78   return NAME;
    79 }
    8076/** =========== end of function ====================== */
  • src/Actions/SelectionAction/NotMoleculeByIdAction.def

    r23359f re4afb4  
    1111// i.e. there is an integer with variable name Z that can be found in
    1212// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    13 // "undefine" if no parameters are required
    14 #define paramtypes (molecule*)
     13// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
     14#define paramtypes (const molecule*)
    1515#define paramtokens ("unselect-molecule-by-id")
    16 #define paramdescriptions ("unselect a molecule by index")
     16#define paramdescriptions ("molecule index")
     17#undef paramdefaults
    1718#define paramreferences (mol)
    1819
     
    2930
    3031// finally the information stored in the ActionTrait specialization
    31 #undef DEFAULTVALUE
    3232#define DESCRIPTION "unselect a molecule by index"
    3333#undef SHORTFORM
    34 #define TYPEINFO &typeid(molecule)
  • src/Actions/SelectionAction/NotMoleculeOfAtomAction.cpp

    r23359f re4afb4  
    7272  return true;
    7373}
    74 
    75 const string SelectionNotMoleculeOfAtomAction::getName() {
    76   return NAME;
    77 }
    7874/** =========== end of function ====================== */
  • src/Actions/SelectionAction/NotMoleculeOfAtomAction.def

    r23359f re4afb4  
    1010// i.e. there is an integer with variable name Z that can be found in
    1111// ValueStorage by the token "Z" -> first column: int, Z, "Z"
    12 // "undefine" if no parameters are required
    13 #define paramtypes (atom*)
     12// "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
     13#define paramtypes (const atom*)
    1414#define paramtokens ("unselect-molecule-of-atom")
    15 #define paramdescriptions ("unselect a molecule to which a given atom belongs")
     15#define paramdescriptions ("one atom of desired molecule")
     16#undef paramdefaults
    1617#define paramreferences (Walker)
    1718
     
    2829
    2930// finally the information stored in the ActionTrait specialization
    30 #undef DEFAULTVALUE
    3131#define DESCRIPTION "unselect a molecule to which a given atom belongs"
    3232#undef SHORTFORM
    33 #define TYPEINFO &typeid(atom)
Note: See TracChangeset for help on using the changeset viewer.