Changeset 0ac85c3 for src/Actions/Makefile.am

Timestamp:

Jan 29, 2015, 7:37:57 AM (11 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, Candidate_v1.7.0, Candidate_v1.7.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:

27e464

Parents:

7b38d3 (diff), 4f2895 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'GUI_TesselatedLargeMolecules' into Candidate_v1.4.10

File:

• src/Actions/Makefile.am (modified) (12 diffs)

src/Actions/Makefile.am

@@ -297 +297 @@
   Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.cpp \
   Actions/MoleculeAction/LoadAction.cpp \
+  Actions/MoleculeAction/RemoveAction.cpp \
   Actions/MoleculeAction/RotateAroundSelfByAngleAction.cpp \
   Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.cpp \
@@ -304 +305 @@
   Actions/MoleculeAction/SaveTemperatureAction.cpp \
   Actions/MoleculeAction/StretchBondAction.cpp \
+  Actions/MoleculeAction/TranslateAction.cpp \
   Actions/MoleculeAction/VerletIntegrationAction.cpp
 MOLECULEACTIONHEADER = \
@@ -313 +315 @@
   Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.hpp \
   Actions/MoleculeAction/LoadAction.hpp \
+  Actions/MoleculeAction/RemoveAction.hpp \
   Actions/MoleculeAction/RotateAroundSelfByAngleAction.hpp \
   Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.hpp \
@@ -320 +323 @@
   Actions/MoleculeAction/SaveTemperatureAction.hpp \
   Actions/MoleculeAction/StretchBondAction.hpp \
+  Actions/MoleculeAction/TranslateAction.hpp \
   Actions/MoleculeAction/VerletIntegrationAction.hpp
 MOLECULEACTIONDEFS = \
@@ -329 +333 @@
   Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.def \
   Actions/MoleculeAction/LoadAction.def \
+  Actions/MoleculeAction/RemoveAction.def \
   Actions/MoleculeAction/RotateAroundSelfByAngleAction.def \
   Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.def \
@@ -336 +341 @@
   Actions/MoleculeAction/SaveTemperatureAction.def \
   Actions/MoleculeAction/StretchBondAction.def \
+  Actions/MoleculeAction/TranslateAction.def \
   Actions/MoleculeAction/VerletIntegrationAction.def
 
@@ -412 +418 @@
   Actions/SelectionAction/Atoms/NotAtomByElementAction.cpp \
   Actions/SelectionAction/Atoms/NotAtomByIdAction.cpp \
-  Actions/SelectionAction/Atoms/NotAtomByOrderAction.cpp
+  Actions/SelectionAction/Atoms/NotAtomByOrderAction.cpp \
+  Actions/SelectionAction/Atoms/PopAtomsAction.cpp \
+  Actions/SelectionAction/Atoms/PushAtomsAction.cpp
 SELECTIONATOMACTIONHEADER = \
   Actions/SelectionAction/Atoms/AllAtomsAction.hpp \
@@ -427 +435 @@
   Actions/SelectionAction/Atoms/NotAtomByElementAction.hpp \
   Actions/SelectionAction/Atoms/NotAtomByIdAction.hpp \
-  Actions/SelectionAction/Atoms/NotAtomByOrderAction.hpp
+  Actions/SelectionAction/Atoms/NotAtomByOrderAction.hpp \
+  Actions/SelectionAction/Atoms/PopAtomsAction.hpp \
+  Actions/SelectionAction/Atoms/PushAtomsAction.hpp
 SELECTIONATOMACTIONDEFS = \
   Actions/SelectionAction/Atoms/AllAtomsAction.def \
@@ -442 +452 @@
   Actions/SelectionAction/Atoms/NotAtomByElementAction.def \
   Actions/SelectionAction/Atoms/NotAtomByIdAction.def \
-  Actions/SelectionAction/Atoms/NotAtomByOrderAction.def
+  Actions/SelectionAction/Atoms/NotAtomByOrderAction.def \
+  Actions/SelectionAction/Atoms/PopAtomsAction.def \
+  Actions/SelectionAction/Atoms/PushAtomsAction.def
 
 SELECTIONMOLECULEACTIONSOURCE = \
@@ -458 +470 @@
   Actions/SelectionAction/Molecules/NotMoleculeByNameAction.cpp \
   Actions/SelectionAction/Molecules/NotMoleculeByOrderAction.cpp \
-  Actions/SelectionAction/Molecules/NotMoleculeOfAtomAction.cpp
+  Actions/SelectionAction/Molecules/NotMoleculeOfAtomAction.cpp \
+  Actions/SelectionAction/Molecules/PopMoleculesAction.cpp \
+  Actions/SelectionAction/Molecules/PushMoleculesAction.cpp
 SELECTIONMOLECULEACTIONHEADER = \
   Actions/SelectionAction/Molecules/AllMoleculesAction.hpp \
@@ -473 +487 @@
   Actions/SelectionAction/Molecules/NotMoleculeByNameAction.hpp \
   Actions/SelectionAction/Molecules/NotMoleculeByOrderAction.hpp \
-  Actions/SelectionAction/Molecules/NotMoleculeOfAtomAction.hpp
+  Actions/SelectionAction/Molecules/NotMoleculeOfAtomAction.hpp \
+  Actions/SelectionAction/Molecules/PopMoleculesAction.hpp \
+  Actions/SelectionAction/Molecules/PushMoleculesAction.hpp
 SELECTIONMOLECULEACTIONDEFS = \
   Actions/SelectionAction/Molecules/AllMoleculesAction.def \
@@ -488 +504 @@
   Actions/SelectionAction/Molecules/NotMoleculeByNameAction.def \
   Actions/SelectionAction/Molecules/NotMoleculeByOrderAction.def \
-  Actions/SelectionAction/Molecules/NotMoleculeOfAtomAction.def
+  Actions/SelectionAction/Molecules/NotMoleculeOfAtomAction.def \
+  Actions/SelectionAction/Molecules/PopMoleculesAction.def \
+  Actions/SelectionAction/Molecules/PushMoleculesAction.def
                  
 SELECTIONSHAPEACTIONSOURCE = \