Changeset eff536
- Timestamp:
- Nov 15, 2012, 5:31:07 PM (13 years ago)
- 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:
- d0cd6d
- Parents:
- 09eaac
- git-author:
- Michael Ankele <ankele@…> (09/07/12 13:55:53)
- git-committer:
- Frederik Heber <heber@…> (11/15/12 17:31:07)
- Files:
-
- 4 added
- 10 deleted
- 12 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
src/Actions/GlobalListOfActions.hpp
r09eaac reff536 101 101 (SelectionNotAtomById) \ 102 102 (SelectionNotAtomByOrder) \ 103 (SelectionAllAtomsInsideCuboid) \104 103 (SelectionAllAtoms) \ 105 104 (SelectionClearAllAtoms) \ … … 107 106 (SelectionNotAllAtoms) \ 108 107 (SelectionNotAtomByElement) \ 109 (SelectionAllAtomsInside Sphere) \108 (SelectionAllAtomsInsideVolume) \ 110 109 (SelectionAllAtomsOfMolecule) \ 111 (SelectionNotAllAtomsInside Sphere) \110 (SelectionNotAllAtomsInsideVolume) \ 112 111 (SelectionAtomByElement) \ 113 112 (SelectionNotAllAtomsOfMolecule) \ 114 (SelectionNotAllAtomsInsideCuboid) \115 113 (SelectionAtomById) \ 116 114 (SelectionAtomByOrder) \ -
src/Actions/Makefile.am
r09eaac reff536 306 306 SELECTIONATOMACTIONSOURCE = \ 307 307 Actions/SelectionAction/Atoms/AllAtomsAction.cpp \ 308 Actions/SelectionAction/Atoms/AllAtomsInsideCuboidAction.cpp \ 309 Actions/SelectionAction/Atoms/AllAtomsInsideSphereAction.cpp \ 308 Actions/SelectionAction/Atoms/AllAtomsInsideVolumeAction.cpp \ 310 309 Actions/SelectionAction/Atoms/AllAtomsOfMoleculeAction.cpp \ 311 310 Actions/SelectionAction/Atoms/AtomByElementAction.cpp \ … … 315 314 Actions/SelectionAction/Atoms/InvertAtomsAction.cpp \ 316 315 Actions/SelectionAction/Atoms/NotAllAtomsAction.cpp \ 317 Actions/SelectionAction/Atoms/NotAllAtomsInsideCuboidAction.cpp \ 318 Actions/SelectionAction/Atoms/NotAllAtomsInsideSphereAction.cpp \ 316 Actions/SelectionAction/Atoms/NotAllAtomsInsideVolumeAction.cpp \ 319 317 Actions/SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.cpp \ 320 318 Actions/SelectionAction/Atoms/NotAtomByElementAction.cpp \ … … 323 321 SELECTIONATOMACTIONHEADER = \ 324 322 Actions/SelectionAction/Atoms/AllAtomsAction.hpp \ 325 Actions/SelectionAction/Atoms/AllAtomsInsideCuboidAction.hpp \ 326 Actions/SelectionAction/Atoms/AllAtomsInsideSphereAction.hpp \ 323 Actions/SelectionAction/Atoms/AllAtomsInsideVolumeAction.hpp \ 327 324 Actions/SelectionAction/Atoms/AllAtomsOfMoleculeAction.hpp \ 328 325 Actions/SelectionAction/Atoms/AtomByElementAction.hpp \ … … 332 329 Actions/SelectionAction/Atoms/InvertAtomsAction.hpp \ 333 330 Actions/SelectionAction/Atoms/NotAllAtomsAction.hpp \ 334 Actions/SelectionAction/Atoms/NotAllAtomsInsideCuboidAction.hpp \ 335 Actions/SelectionAction/Atoms/NotAllAtomsInsideSphereAction.hpp \ 331 Actions/SelectionAction/Atoms/NotAllAtomsInsideVolumeAction.hpp \ 336 332 Actions/SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.hpp \ 337 333 Actions/SelectionAction/Atoms/NotAtomByElementAction.hpp \ … … 340 336 SELECTIONATOMACTIONDEFS = \ 341 337 Actions/SelectionAction/Atoms/AllAtomsAction.def \ 342 Actions/SelectionAction/Atoms/AllAtomsInsideCuboidAction.def \ 343 Actions/SelectionAction/Atoms/AllAtomsInsideSphereAction.def \ 338 Actions/SelectionAction/Atoms/AllAtomsInsideVolumeAction.def \ 344 339 Actions/SelectionAction/Atoms/AllAtomsOfMoleculeAction.def \ 345 340 Actions/SelectionAction/Atoms/AtomByElementAction.def \ … … 349 344 Actions/SelectionAction/Atoms/InvertAtomsAction.def \ 350 345 Actions/SelectionAction/Atoms/NotAllAtomsAction.def \ 351 Actions/SelectionAction/Atoms/NotAllAtomsInsideCuboidAction.def \ 352 Actions/SelectionAction/Atoms/NotAllAtomsInsideSphereAction.def \ 346 Actions/SelectionAction/Atoms/NotAllAtomsInsideVolumeAction.def \ 353 347 Actions/SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.def \ 354 348 Actions/SelectionAction/Atoms/NotAtomByElementAction.def \ -
src/Actions/SelectionAction/Atoms/AllAtomsInsideVolumeAction.cpp
r09eaac reff536 22 22 23 23 /* 24 * AllAtomsInside SphereAction.cpp24 * AllAtomsInsideVolumeAction.cpp 25 25 * 26 26 * Created on: Aug 9, 2010 27 * Author: heber 27 * Author: heber, ankele 28 28 */ 29 29 … … 41 41 #include "CodePatterns/Verbose.hpp" 42 42 #include "LinearAlgebra/Vector.hpp" 43 #include "Shapes/BaseShapes.hpp" 44 #include "Shapes/Shape.hpp" 45 #include "Shapes/ShapeOps.hpp" 43 #include "Shapes/ShapeFactory.hpp" 46 44 #include "World.hpp" 47 45 … … 50 48 #include <string> 51 49 52 #include "AllAtomsInside SphereAction.hpp"50 #include "AllAtomsInsideVolumeAction.hpp" 53 51 54 52 using namespace MoleCuilder; 55 53 56 54 // and construct the stuff 57 #include "AllAtomsInside SphereAction.def"55 #include "AllAtomsInsideVolumeAction.def" 58 56 #include "Action_impl_pre.hpp" 59 57 /** =========== define the function ====================== */ 60 Action::state_ptr SelectionAllAtomsInside SphereAction::performCall() {61 LOG(1, "Selecting all atoms inside a sphere at " << params.position.get() << " with radius " << params.radius.get() << ".");62 Shape s = translate(resize(Sphere(),params.radius.get()),params.position.get());58 Action::state_ptr SelectionAllAtomsInsideVolumeAction::performCall() { 59 LOG(1, "Selecting all atoms inside a volume."); 60 Shape s = ShapeFactory::getInstance().produce(); 63 61 std::vector<atom *> selectedAtoms = World::getInstance().getAllAtoms(AtomsBySelection() && AtomsByShape(s)); 64 62 World::getInstance().selectAllAtoms(AtomsByShape(s)); 65 63 LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected."); 66 return Action::state_ptr(new SelectionAllAtomsInside SphereState(selectedAtoms,s, params));64 return Action::state_ptr(new SelectionAllAtomsInsideVolumeState(selectedAtoms, params)); 67 65 } 68 66 69 Action::state_ptr SelectionAllAtomsInside SphereAction::performUndo(Action::state_ptr _state) {70 SelectionAllAtomsInside SphereState *state = assert_cast<SelectionAllAtomsInsideSphereState*>(_state.get());67 Action::state_ptr SelectionAllAtomsInsideVolumeAction::performUndo(Action::state_ptr _state) { 68 SelectionAllAtomsInsideVolumeState *state = assert_cast<SelectionAllAtomsInsideVolumeState*>(_state.get()); 71 69 72 World::getInstance().unselectAllAtoms(AtomsByShape(state->s)); 70 Shape s = ShapeFactory::getInstance().produce(); 71 World::getInstance().unselectAllAtoms(AtomsByShape(s)); 73 72 BOOST_FOREACH(atom *_atom, state->selectedAtoms) 74 73 World::getInstance().selectAtom(_atom); … … 77 76 } 78 77 79 Action::state_ptr SelectionAllAtomsInside SphereAction::performRedo(Action::state_ptr _state){80 SelectionAllAtomsInsideSphereState *state = assert_cast<SelectionAllAtomsInsideSphereState*>(_state.get());78 Action::state_ptr SelectionAllAtomsInsideVolumeAction::performRedo(Action::state_ptr _state){ 79 //SelectionAllAtomsInsideVolumeState *state = assert_cast<SelectionAllAtomsInsideVolumeState*>(_state.get()); 81 80 82 World::getInstance().selectAllAtoms(AtomsByShape(state->s)); 81 Shape s = ShapeFactory::getInstance().produce(); 82 World::getInstance().selectAllAtoms(AtomsByShape(s)); 83 83 84 84 return Action::state_ptr(_state); 85 85 } 86 86 87 bool SelectionAllAtomsInside SphereAction::canUndo() {87 bool SelectionAllAtomsInsideVolumeAction::canUndo() { 88 88 return true; 89 89 } 90 90 91 bool SelectionAllAtomsInside SphereAction::shouldUndo() {91 bool SelectionAllAtomsInsideVolumeAction::shouldUndo() { 92 92 return true; 93 93 } -
src/Actions/SelectionAction/Atoms/NotAllAtomsInsideVolumeAction.cpp
r09eaac reff536 22 22 23 23 /* 24 * NotAllAtomsInside SphereAction.cpp24 * NotAllAtomsInsideVolumeAction.cpp 25 25 * 26 26 * Created on: Aug 9, 2010 … … 41 41 #include "CodePatterns/Verbose.hpp" 42 42 #include "LinearAlgebra/Vector.hpp" 43 #include "Shapes/BaseShapes.hpp" 44 #include "Shapes/Shape.hpp" 45 #include "Shapes/ShapeOps.hpp" 43 #include "Shapes/ShapeFactory.hpp" 46 44 #include "World.hpp" 47 45 … … 50 48 #include <string> 51 49 52 #include "NotAllAtomsInside SphereAction.hpp"50 #include "NotAllAtomsInsideVolumeAction.hpp" 53 51 54 52 using namespace MoleCuilder; 55 53 56 54 // and construct the stuff 57 #include "NotAllAtomsInside SphereAction.def"55 #include "NotAllAtomsInsideVolumeAction.def" 58 56 #include "Action_impl_pre.hpp" 59 57 /** =========== define the function ====================== */ 60 Action::state_ptr SelectionNotAllAtomsInside SphereAction::performCall() {61 LOG(1, "Unselecting all atoms inside a sphere at " << params.position.get() << " with radius " << params.radius.get() << ".");62 Shape s = translate(resize(Sphere(),params.radius.get()),params.position.get());58 Action::state_ptr SelectionNotAllAtomsInsideVolumeAction::performCall() { 59 LOG(1, "Unselecting all atoms inside a volume."); 60 Shape s = ShapeFactory::getInstance().produce(); 63 61 std::vector<atom *> unselectedAtoms = World::getInstance().getAllAtoms((!AtomsBySelection()) && AtomsByShape(s)); 64 62 World::getInstance().unselectAllAtoms(AtomsByShape(s)); 65 63 LOG(0, World::getInstance().countSelectedAtoms() << " atoms remain selected."); 66 return Action::state_ptr(new SelectionNotAllAtomsInside SphereState(unselectedAtoms,s, params));64 return Action::state_ptr(new SelectionNotAllAtomsInsideVolumeState(unselectedAtoms, params)); 67 65 } 68 66 69 Action::state_ptr SelectionNotAllAtomsInside SphereAction::performUndo(Action::state_ptr _state) {70 SelectionNotAllAtomsInside SphereState *state = assert_cast<SelectionNotAllAtomsInsideSphereState*>(_state.get());67 Action::state_ptr SelectionNotAllAtomsInsideVolumeAction::performUndo(Action::state_ptr _state) { 68 SelectionNotAllAtomsInsideVolumeState *state = assert_cast<SelectionNotAllAtomsInsideVolumeState*>(_state.get()); 71 69 72 World::getInstance().selectAllAtoms(AtomsByShape(state->s)); 70 Shape s = ShapeFactory::getInstance().produce(); 71 World::getInstance().selectAllAtoms(AtomsByShape(s)); 73 72 BOOST_FOREACH(atom *_atom, state->unselectedAtoms) 74 73 World::getInstance().unselectAtom(_atom); … … 77 76 } 78 77 79 Action::state_ptr SelectionNotAllAtomsInside SphereAction::performRedo(Action::state_ptr _state){80 SelectionNotAllAtomsInsideSphereState *state = assert_cast<SelectionNotAllAtomsInsideSphereState*>(_state.get());78 Action::state_ptr SelectionNotAllAtomsInsideVolumeAction::performRedo(Action::state_ptr _state){ 79 //SelectionNotAllAtomsInsideVolumeState *state = assert_cast<SelectionNotAllAtomsInsideVolumeState*>(_state.get()); 81 80 82 World::getInstance().unselectAllAtoms(AtomsByShape(state->s)); 81 Shape s = ShapeFactory::getInstance().produce(); 82 World::getInstance().unselectAllAtoms(AtomsByShape(s)); 83 83 84 84 return Action::state_ptr(_state); 85 85 } 86 86 87 bool SelectionNotAllAtomsInside SphereAction::canUndo() {87 bool SelectionNotAllAtomsInsideVolumeAction::canUndo() { 88 88 return true; 89 89 } 90 90 91 bool SelectionNotAllAtomsInside SphereAction::shouldUndo() {91 bool SelectionNotAllAtomsInsideVolumeAction::shouldUndo() { 92 92 return true; 93 93 } -
tests/regression/Analysis/DipoleCorrelation-DiscreteAngles/testsuite-analysis-dipole-correlation-discrete-angles.at
r09eaac reff536 51 51 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Analysis/DipoleCorrelation-DiscreteAngles/pre/water.xyz .], 0) 52 52 AT_CHECK([../../molecuilder -i waterbox-mirrored.xyz -o xyz --fill-void water.xyz --distances "3.1,3.1,3.1" --distance-to-boundary "1." --DoRotate 0], 0, [stdout], [stderr]) 53 AT_CHECK([../../molecuilder -i waterbox-mirrored.xyz -I -v 3 --select-atoms-inside-sphere 0.2 --position "5.63,5.71,5.71"--select-atoms-molecules --rotate-around-self 180 --axis "0,1,0"], 0, [stdout], [stderr])53 AT_CHECK([../../molecuilder -i waterbox-mirrored.xyz -I -v 3 --set-shape --shape-type "sphere" --translation "5.63,5.71,5.71" --stretch "0.2,0.2,0.2" --select-atoms-inside-volume --select-atoms-molecules --rotate-around-self 180 --axis "0,1,0"], 0, [stdout], [stderr]) 54 54 AT_CHECK([../../molecuilder -i waterbox-mirrored.xyz -o xyz -I --select-all-molecules --dipole-correlation --bin-start -0.5 --bin-width 1. --bin-end 359.5 --output-file waterbox-mirrored_values.dat --bin-output-file waterbox-mirrored_histogram.dat], 0, [stdout], [stderr]) 55 55 AT_CHECK([file=waterbox-mirrored_histogram.dat; diff $file ${abs_top_srcdir}/tests/regression/Analysis/DipoleCorrelation-DiscreteAngles/post/waterbox-mirrored_histogram.dat], 0, [ignore], [ignore]) -
tests/regression/Atoms/RemoveCuboid/testsuite-atoms-remove-cuboid.at
r09eaac reff536 41 41 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Atoms/RemoveCuboid/pre/test.xyz $file], 0) 42 42 AT_CHECK([chmod u+w $file], 0) 43 AT_CHECK([../../molecuilder -i $file --se lect-atoms-inside-cuboid "2,2,2" --position "9.78,2.64,2.64" --angle-x 0. --angle-y 0. --angle-z 0.-r], 0, [stdout], [stderr])43 AT_CHECK([../../molecuilder -i $file --set-shape --shape-type "cube" --translation "9.78,2.64,2.64" --stretch "2,2,2" --angle-x 0. --angle-y 0. --angle-z 0. --select-atoms-inside-volume -r], 0, [stdout], [stderr]) 44 44 AT_CHECK([sort -n $file | grep -v -E "^[[[:digit:]]]+" | grep -v "Created by" >test-withoutcuboid.xyz-sorted], 0, [ignore], [ignore]) 45 45 AT_CHECK([file=test-withoutcuboid.xyz-sorted; diff $file ${abs_top_srcdir}/tests/regression/Atoms/RemoveCuboid/post/test-withoutcuboid.xyz-sorted], 0, [ignore], [ignore]) … … 48 48 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Atoms/RemoveCuboid/pre/test.xyz $file], 0) 49 49 AT_CHECK([chmod u+w $file], 0) 50 AT_CHECK([../../molecuilder -i $file --select-all-atoms -- unselect-atoms-inside-cuboid "2,2,2" --position "9.78,2.64,2.64" --angle-x 0. --angle-y 0. --angle-z 0.-r], 0, [stdout], [stderr])50 AT_CHECK([../../molecuilder -i $file --select-all-atoms --set-shape --shape-type "cube" --translation "9.78,2.64,2.64" --stretch "2,2,2" --angle-x 0. --angle-y 0. --angle-z 0. --unselect-atoms-inside-volume -r], 0, [stdout], [stderr]) 51 51 AT_CHECK([sort -n $file | grep -v -E "^[[[:digit:]]]+" | grep -v "Created by" >test-cuboid.xyz-sorted], 0, [ignore], [ignore]) 52 52 AT_CHECK([file=test-cuboid.xyz-sorted; diff $file ${abs_top_srcdir}/tests/regression/Atoms/RemoveCuboid/post/test-cuboid.xyz-sorted], 0, [ignore], [ignore]) … … 63 63 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Atoms/RemoveCuboid/pre/test.xyz $file], 0) 64 64 AT_CHECK([chmod u+w $file], 0) 65 AT_CHECK([../../molecuilder -i $file --select-all-atoms -- unselect-atoms-inside-cuboid "2,2,2" --position "9.78,2.64,2.64" --angle-x 0. --angle-y 0. --angle-z 0.-r --undo], 0, [stdout], [stderr])65 AT_CHECK([../../molecuilder -i $file --select-all-atoms --set-shape --shape-type "cube" --translation "9.78,2.64,2.64" --stretch "2,2,2" --angle-x 0. --angle-y 0. --angle-z 0. --unselect-atoms-inside-volume -r --undo], 0, [stdout], [stderr]) 66 66 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Atoms/RemoveCuboid/pre/$file], 0, [ignore], [ignore]) 67 67 … … 69 69 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Atoms/RemoveCuboid/pre/test.xyz $file], 0) 70 70 AT_CHECK([chmod u+w $file], 0) 71 AT_CHECK([../../molecuilder -i $file --se lect-atoms-inside-cuboid "2,2,2" --position "9.78,2.64,2.64" --angle-x 0. --angle-y 0. --angle-z 0.-r --undo], 0, [stdout], [stderr])71 AT_CHECK([../../molecuilder -i $file --set-shape --shape-type "cube" --translation "9.78,2.64,2.64" --stretch "2,2,2" --angle-x 0. --angle-y 0. --angle-z 0. --select-atoms-inside-volume -r --undo], 0, [stdout], [stderr]) 72 72 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Atoms/RemoveCuboid/pre/$file], 0, [ignore], [ignore]) 73 73 … … 81 81 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Atoms/RemoveCuboid/pre/test.xyz $file], 0) 82 82 AT_CHECK([chmod u+w $file], 0) 83 AT_CHECK([../../molecuilder -i $file --se lect-atoms-inside-cuboid "2,2,2" --position "9.78,2.64,2.64" --angle-x 0. --angle-y 0. --angle-z 0.-r --undo --redo], 0, [stdout], [stderr])83 AT_CHECK([../../molecuilder -i $file --set-shape --shape-type "cube" --translation "9.78,2.64,2.64" --stretch "2,2,2" --angle-x 0. --angle-y 0. --angle-z 0. --select-atoms-inside-volume -r --undo --redo], 0, [stdout], [stderr]) 84 84 AT_CHECK([sort -n $file | grep -v -E "^[[[:digit:]]]+" | grep -v "Created by" >test-withoutcuboid.xyz-sorted], 0, [ignore], [ignore]) 85 85 AT_CHECK([file=test-withoutcuboid.xyz-sorted; diff $file ${abs_top_srcdir}/tests/regression/Atoms/RemoveCuboid/post/test-withoutcuboid.xyz-sorted], 0, [ignore], [ignore]) … … 88 88 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Atoms/RemoveCuboid/pre/test.xyz $file], 0) 89 89 AT_CHECK([chmod u+w $file], 0) 90 AT_CHECK([../../molecuilder -i $file --select-all-atoms -- unselect-atoms-inside-cuboid "2,2,2" --position "9.78,2.64,2.64" --angle-x 0. --angle-y 0. --angle-z 0.-r --undo --redo], 0, [stdout], [stderr])90 AT_CHECK([../../molecuilder -i $file --select-all-atoms --set-shape --shape-type "cube" --translation "9.78,2.64,2.64" --stretch "2,2,2" --angle-x 0. --angle-y 0. --angle-z 0. --unselect-atoms-inside-volume -r --undo --redo], 0, [stdout], [stderr]) 91 91 AT_CHECK([sort -n $file | grep -v -E "^[[[:digit:]]]+" | grep -v "Created by" >test-cuboid.xyz-sorted], 0, [ignore], [ignore]) 92 92 AT_CHECK([file=test-cuboid.xyz-sorted; diff $file ${abs_top_srcdir}/tests/regression/Atoms/RemoveCuboid/post/test-cuboid.xyz-sorted], 0, [ignore], [ignore]) -
tests/regression/Atoms/RemoveSphere/testsuite-atoms-remove-sphere.at
r09eaac reff536 41 41 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Atoms/RemoveSphere/pre/test.xyz $file], 0) 42 42 AT_CHECK([chmod u+w $file], 0) 43 AT_CHECK([../../molecuilder -i $file --se lect-atoms-inside-sphere 7. --position "7.283585982, 3.275186040, 3.535886037" --angle-x 0. --angle-y 0. --angle-z 0.-r], 0, [stdout], [stderr])43 AT_CHECK([../../molecuilder -i $file --set-shape --shape-type "sphere" --translation "7.283585982, 3.275186040, 3.535886037" --stretch "7., 7., 7." --angle-x 0. --angle-y 0. --angle-z 0. --select-atoms-inside-volume -r], 0, [stdout], [stderr]) 44 44 AT_CHECK([sort -n $file | grep -v -E "^[[[:digit:]]]+" | grep -v "Created by" >test-withoutsphere.xyz-sorted], 0, [ignore], [ignore]) 45 45 AT_CHECK([file=test-withoutsphere.xyz-sorted; diff $file ${abs_top_srcdir}/tests/regression/Atoms/RemoveSphere/post/test-withoutsphere.xyz-sorted], 0, [ignore], [ignore]) … … 48 48 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Atoms/RemoveSphere/pre/test.xyz $file], 0) 49 49 AT_CHECK([chmod u+w $file], 0) 50 AT_CHECK([../../molecuilder -i $file --select-all-atoms -- unselect-atoms-inside-sphere 7. --position "7.283585982, 3.275186040, 3.535886037" --angle-x 0. --angle-y 0. --angle-z 0.-r], 0, [stdout], [stderr])50 AT_CHECK([../../molecuilder -i $file --select-all-atoms --set-shape --shape-type "sphere" --translation "7.283585982, 3.275186040, 3.535886037" --stretch "7., 7., 7." --angle-x 0. --angle-y 0. --angle-z 0. --unselect-atoms-inside-volume -r], 0, [stdout], [stderr]) 51 51 AT_CHECK([sort -n $file | grep -v -E "^[[[:digit:]]]+" | grep -v "Created by" >test-sphere.xyz-sorted], 0, [ignore], [ignore]) 52 52 AT_CHECK([file=test-sphere.xyz-sorted; diff $file ${abs_top_srcdir}/tests/regression/Atoms/RemoveSphere/post/test-sphere.xyz-sorted], 0, [ignore], [ignore]) … … 63 63 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Atoms/RemoveSphere/pre/test.xyz $file], 0) 64 64 AT_CHECK([chmod u+w $file], 0) 65 AT_CHECK([../../molecuilder -i $file --se lect-atoms-inside-sphere 7. --position "7.283585982, 3.275186040, 3.535886037" --angle-x 0. --angle-y 0. --angle-z 0.-r --undo], 0, [stdout], [stderr])65 AT_CHECK([../../molecuilder -i $file --set-shape --shape-type "sphere" --translation "7.283585982, 3.275186040, 3.535886037" --stretch "7., 7., 7." --angle-x 0. --angle-y 0. --angle-z 0. --select-atoms-inside-volume -r --undo], 0, [stdout], [stderr]) 66 66 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Atoms/RemoveSphere/pre/$file], 0, [ignore], [ignore]) 67 67 … … 69 69 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Atoms/RemoveSphere/pre/test.xyz $file], 0) 70 70 AT_CHECK([chmod u+w $file], 0) 71 AT_CHECK([../../molecuilder -i $file --select-all-atoms -- unselect-atoms-inside-sphere 7. --position "7.283585982, 3.275186040, 3.535886037" --angle-x 0. --angle-y 0. --angle-z 0.-r --undo], 0, [stdout], [stderr])71 AT_CHECK([../../molecuilder -i $file --select-all-atoms --set-shape --shape-type "sphere" --translation "7.283585982, 3.275186040, 3.535886037" --stretch "7., 7., 7." --angle-x 0. --angle-y 0. --angle-z 0. --unselect-atoms-inside-volume -r --undo], 0, [stdout], [stderr]) 72 72 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Atoms/RemoveSphere/pre/$file], 0, [ignore], [ignore]) 73 73 … … 81 81 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Atoms/RemoveSphere/pre/test.xyz $file], 0) 82 82 AT_CHECK([chmod u+w $file], 0) 83 AT_CHECK([../../molecuilder -i $file --se lect-atoms-inside-sphere 7. --position "7.283585982, 3.275186040, 3.535886037" --angle-x 0. --angle-y 0. --angle-z 0.-r --undo --redo], 0, [stdout], [stderr])83 AT_CHECK([../../molecuilder -i $file --set-shape --shape-type "sphere" --translation "7.283585982, 3.275186040, 3.535886037" --stretch "7., 7., 7." --angle-x 0. --angle-y 0. --angle-z 0. --select-atoms-inside-volume -r --undo --redo], 0, [stdout], [stderr]) 84 84 AT_CHECK([sort -n $file | grep -v -E "^[[[:digit:]]]+" | grep -v "Created by" >test-withoutsphere.xyz-sorted], 0, [ignore], [ignore]) 85 85 AT_CHECK([file=test-withoutsphere.xyz-sorted; diff $file ${abs_top_srcdir}/tests/regression/Atoms/RemoveSphere/post/test-withoutsphere.xyz-sorted], 0, [ignore], [ignore]) … … 88 88 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Atoms/RemoveSphere/pre/test.xyz $file], 0) 89 89 AT_CHECK([chmod u+w $file], 0) 90 AT_CHECK([../../molecuilder -i $file --select-all-atoms -- unselect-atoms-inside-sphere 7. --position "7.283585982, 3.275186040, 3.535886037" --angle-x 0. --angle-y 0. --angle-z 0.-r --undo --redo], 0, [stdout], [stderr])90 AT_CHECK([../../molecuilder -i $file --select-all-atoms --set-shape --shape-type "sphere" --translation "7.283585982, 3.275186040, 3.535886037" --stretch "7., 7., 7." --angle-x 0. --angle-y 0. --angle-z 0. --unselect-atoms-inside-volume -r --undo --redo], 0, [stdout], [stderr]) 91 91 AT_CHECK([sort -n $file | grep -v -E "^[[[:digit:]]]+" | grep -v "Created by" >test-sphere.xyz-sorted], 0, [ignore], [ignore]) 92 92 AT_CHECK([file=test-sphere.xyz-sorted; diff $file ${abs_top_srcdir}/tests/regression/Atoms/RemoveSphere/post/test-sphere.xyz-sorted], 0, [ignore], [ignore]) -
tests/regression/Selection/Atoms/AtomsInsideCuboid/testsuite-selection-select-atoms-inside-cuboid-with-defaults.at
r09eaac reff536 42 42 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/pre/box.xyz $file], 0) 43 43 AT_CHECK([chmod u+w $file], 0) 44 AT_CHECK([../../molecuilder -i $file -v 5 --se lect-atoms-inside-cuboid "10,10,10" --position "0,0,0"-r], 0, [stdout], [stderr])44 AT_CHECK([../../molecuilder -i $file -v 5 --set-shape --shape-type "cube" --translation "0,0,0" --stretch "10, 10, 10" --select-atoms-inside-volume -r], 0, [stdout], [stderr]) 45 45 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/post/allatomsoutsidecuboid.xyz], 0, [ignore], [ignore]) 46 46 … … 63 63 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/pre/box.xyz $file], 0) 64 64 AT_CHECK([chmod u+w $file], 0) 65 AT_CHECK([../../molecuilder -i $file -v 5 --se lect-atoms-inside-cuboid "10,10,10" --position "0,0,0"--undo -r], 0, [stdout], [stderr])65 AT_CHECK([../../molecuilder -i $file -v 5 --set-shape --shape-type "cube" --translation "0,0,0" --stretch "10, 10, 10" --select-atoms-inside-volume --undo -r], 0, [stdout], [stderr]) 66 66 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/pre/box.xyz], 0, [ignore], [ignore]) 67 67 … … 75 75 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/pre/box.xyz $file], 0) 76 76 AT_CHECK([chmod u+w $file], 0) 77 AT_CHECK([../../molecuilder -i $file -v 5 --se lect-atoms-inside-cuboid "10,10,10" --position "0,0,0"--undo --redo -r], 0, [stdout], [stderr])77 AT_CHECK([../../molecuilder -i $file -v 5 --set-shape --shape-type "cube" --translation "0,0,0" --stretch "10, 10, 10" --select-atoms-inside-volume --undo --redo -r], 0, [stdout], [stderr]) 78 78 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/post/allatomsoutsidecuboid.xyz], 0, [ignore], [ignore]) 79 79 -
tests/regression/Selection/Atoms/AtomsInsideCuboid/testsuite-selection-select-atoms-inside-cuboid.at
r09eaac reff536 41 41 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/pre/box.xyz $file], 0) 42 42 AT_CHECK([chmod u+w $file], 0) 43 AT_CHECK([../../molecuilder -i $file -v 5 --se lect-atoms-inside-cuboid "10,10,10" --position "0,0,0" --angle-x 0 --angle-y 0 --angle-z 0-r], 0, [stdout], [stderr])43 AT_CHECK([../../molecuilder -i $file -v 5 --set-shape --shape-type "cube" --translation "0,0,0" --stretch "10, 10, 10" --angle-x 0. --angle-y 0. --angle-z 0. --select-atoms-inside-volume -r], 0, [stdout], [stderr]) 44 44 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/post/allatomsoutsidecuboid.xyz], 0, [ignore], [ignore]) 45 45 … … 62 62 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/pre/box.xyz $file], 0) 63 63 AT_CHECK([chmod u+w $file], 0) 64 AT_CHECK([../../molecuilder -i $file -v 5 --se lect-atoms-inside-cuboid "10,10,10" --position "0,0,0" --angle-x 0 --angle-y 0 --angle-z 0--undo -r], 0, [stdout], [stderr])64 AT_CHECK([../../molecuilder -i $file -v 5 --set-shape --shape-type "cube" --translation "0,0,0" --stretch "10, 10, 10" --angle-x 0. --angle-y 0. --angle-z 0. --select-atoms-inside-volume --undo -r], 0, [stdout], [stderr]) 65 65 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/pre/box.xyz], 0, [ignore], [ignore]) 66 66 … … 74 74 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/pre/box.xyz $file], 0) 75 75 AT_CHECK([chmod u+w $file], 0) 76 AT_CHECK([../../molecuilder -i $file -v 5 --se lect-atoms-inside-cuboid "10,10,10" --position "0,0,0" --angle-x 0 --angle-y 0 --angle-z 0--undo --redo -r], 0, [stdout], [stderr])76 AT_CHECK([../../molecuilder -i $file -v 5 --set-shape --shape-type "cube" --translation "0,0,0" --stretch "10, 10, 10" --angle-x 0. --angle-y 0. --angle-z 0. --select-atoms-inside-volume --undo --redo -r], 0, [stdout], [stderr]) 77 77 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/post/allatomsoutsidecuboid.xyz], 0, [ignore], [ignore]) 78 78 -
tests/regression/Selection/Atoms/AtomsInsideCuboid/testsuite-selection-unselect-atoms-inside-cuboid.at
r09eaac reff536 42 42 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/pre/box.xyz $file], 0) 43 43 AT_CHECK([chmod u+w $file], 0) 44 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms -- unselect-atoms-inside-cuboid "10,10,10" --position "0,0,0" --angle-x 0 --angle-y 0 --angle-z0 -r], 0, [stdout], [stderr])44 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms --set-shape --shape-type "cube" --translation "0,0,0" --stretch "10, 10, 10" --angle-x 0. --angle-y 0. --angle-z 0. --unselect-atoms-inside-volume 0 -r], 0, [stdout], [stderr]) 45 45 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/post/allatomsinsidecuboid.xyz], 0, [ignore], [ignore]) 46 46 … … 63 63 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/pre/box.xyz $file], 0) 64 64 AT_CHECK([chmod u+w $file], 0) 65 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms -- unselect-atoms-inside-cuboid "10,10,10" --position "0,0,0" --angle-x 0 --angle-y 0 --angle-z 0--undo -r], 0, [stdout], [stderr])65 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms --set-shape --shape-type "cube" --translation "0,0,0" --stretch "10, 10, 10" --angle-x 0. --angle-y 0. --angle-z 0. --unselect-atoms-inside-volume --undo -r], 0, [stdout], [stderr]) 66 66 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/post/empty.xyz], 0, [ignore], [ignore]) 67 67 … … 75 75 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/pre/box.xyz $file], 0) 76 76 AT_CHECK([chmod u+w $file], 0) 77 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms -- unselect-atoms-inside-cuboid "10,10,10" --position "0,0,0" --angle-x 0 --angle-y 0 --angle-z 0--undo --redo -r], 0, [stdout], [stderr])77 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms --set-shape --shape-type "cube" --translation "0,0,0" --stretch "10, 10, 10" --angle-x 0. --angle-y 0. --angle-z 0. --unselect-atoms-inside-volume --undo --redo -r], 0, [stdout], [stderr]) 78 78 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideCuboid/post/allatomsinsidecuboid.xyz], 0, [ignore], [ignore]) 79 79 -
tests/regression/Selection/Atoms/AtomsInsideSphere/testsuite-selection-select-atoms-inside-sphere.at
r09eaac reff536 41 41 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/pre/box.xyz $file], 0) 42 42 AT_CHECK([chmod u+w $file], 0) 43 AT_CHECK([../../molecuilder -i $file -v 5 --se lect-atoms-inside-sphere 10 --position "10,10,10"-r], 0, [stdout], [stderr])43 AT_CHECK([../../molecuilder -i $file -v 5 --set-shape --shape-type "sphere" --translation "10,10,10" --stretch "10., 10., 10." --angle-x 0. --angle-y 0. --angle-z 0. --select-atoms-inside-volume -r], 0, [stdout], [stderr]) 44 44 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/post/allatomsoutsidesphere.xyz], 0, [ignore], [ignore]) 45 45 … … 62 62 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/pre/box.xyz $file], 0) 63 63 AT_CHECK([chmod u+w $file], 0) 64 AT_CHECK([../../molecuilder -i $file -v 5 --se lect-atoms-inside-sphere 10 --position "10,10,10"--undo -r], 0, [stdout], [stderr])64 AT_CHECK([../../molecuilder -i $file -v 5 --set-shape --shape-type "sphere" --translation "10,10,10" --stretch "10., 10., 10." --angle-x 0. --angle-y 0. --angle-z 0. --select-atoms-inside-volume --undo -r], 0, [stdout], [stderr]) 65 65 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/pre/box.xyz], 0, [ignore], [ignore]) 66 66 … … 74 74 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/pre/box.xyz $file], 0) 75 75 AT_CHECK([chmod u+w $file], 0) 76 AT_CHECK([../../molecuilder -i $file -v 5 --se lect-atoms-inside-sphere 10 --position "10,10,10"--undo --redo -r], 0, [stdout], [stderr])76 AT_CHECK([../../molecuilder -i $file -v 5 --set-shape --shape-type "sphere" --translation "10,10,10" --stretch "10., 10., 10." --angle-x 0. --angle-y 0. --angle-z 0. --select-atoms-inside-volume --undo --redo -r], 0, [stdout], [stderr]) 77 77 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/post/allatomsoutsidesphere.xyz], 0, [ignore], [ignore]) 78 78 -
tests/regression/Selection/Atoms/AtomsInsideSphere/testsuite-selection-select-atoms-inside-tiny-sphere.at
r09eaac reff536 41 41 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/pre/box.xyz $file], 0) 42 42 AT_CHECK([chmod u+w $file], 0) 43 AT_CHECK([../../molecuilder -i $file -v 5 --se lect-atoms-inside-sphere 1.65 --position "10,10,10"-r], 0, [stdout], [stderr])43 AT_CHECK([../../molecuilder -i $file -v 5 --set-shape --shape-type "sphere" --translation "10,10,10" --stretch "1.65, 1.65, 1.65" --angle-x 0. --angle-y 0. --angle-z 0. --select-atoms-inside-volume -r], 0, [stdout], [stderr]) 44 44 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/post/allatomsoutsidetinysphere.xyz], 0, [ignore], [ignore]) 45 45 … … 62 62 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/pre/box.xyz $file], 0) 63 63 AT_CHECK([chmod u+w $file], 0) 64 AT_CHECK([../../molecuilder -i $file -v 5 --se lect-atoms-inside-sphere 1.65 --position "10,10,10"--undo -r], 0, [stdout], [stderr])64 AT_CHECK([../../molecuilder -i $file -v 5 --set-shape --shape-type "sphere" --translation "10,10,10" --stretch "1.65, 1.65, 1.65" --angle-x 0. --angle-y 0. --angle-z 0. --select-atoms-inside-volume --undo -r], 0, [stdout], [stderr]) 65 65 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/pre/box.xyz], 0, [ignore], [ignore]) 66 66 … … 74 74 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/pre/box.xyz $file], 0) 75 75 AT_CHECK([chmod u+w $file], 0) 76 AT_CHECK([../../molecuilder -i $file -v 5 --se lect-atoms-inside-sphere 1.65 --position "10,10,10"--undo --redo -r], 0, [stdout], [stderr])76 AT_CHECK([../../molecuilder -i $file -v 5 --set-shape --shape-type "sphere" --translation "10,10,10" --stretch "1.65, 1.65, 1.65" --angle-x 0. --angle-y 0. --angle-z 0. --select-atoms-inside-volume --undo --redo -r], 0, [stdout], [stderr]) 77 77 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/post/allatomsoutsidetinysphere.xyz], 0, [ignore], [ignore]) 78 78 -
tests/regression/Selection/Atoms/AtomsInsideSphere/testsuite-selection-unselect-atoms-inside-sphere.at
r09eaac reff536 42 42 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/pre/box.xyz $file], 0) 43 43 AT_CHECK([chmod u+w $file], 0) 44 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms -- unselect-atoms-inside-sphere 10 --position "10,10,10"-r], 0, [stdout], [stderr])44 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms --set-shape --shape-type "sphere" --translation "10,10,10" --stretch "10,10,10" --angle-x 0. --angle-y 0. --angle-z 0. --unselect-atoms-inside-volume -r], 0, [stdout], [stderr]) 45 45 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/post/allatomsinsidesphere.xyz], 0, [ignore], [ignore]) 46 46 … … 63 63 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/pre/box.xyz $file], 0) 64 64 AT_CHECK([chmod u+w $file], 0) 65 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms -- unselect-atoms-inside-sphere 10 --position "10,10,10"--undo -r], 0, [stdout], [stderr])65 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms --set-shape --shape-type "sphere" --translation "10,10,10" --stretch "10,10,10" --angle-x 0. --angle-y 0. --angle-z 0. --unselect-atoms-inside-volume --undo -r], 0, [stdout], [stderr]) 66 66 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/post/empty.xyz], 0, [ignore], [ignore]) 67 67 … … 75 75 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/pre/box.xyz $file], 0) 76 76 AT_CHECK([chmod u+w $file], 0) 77 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms -- unselect-atoms-inside-sphere 10 --position "10,10,10"--undo --redo -r], 0, [stdout], [stderr])77 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms --set-shape --shape-type "sphere" --translation "10,10,10" --stretch "10,10,10" --angle-x 0. --angle-y 0. --angle-z 0. --unselect-atoms-inside-volume --undo --redo -r], 0, [stdout], [stderr]) 78 78 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/post/allatomsinsidesphere.xyz], 0, [ignore], [ignore]) 79 79 -
tests/regression/Selection/Atoms/AtomsInsideSphere/testsuite-selection-unselect-atoms-inside-tiny-sphere.at
r09eaac reff536 41 41 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/pre/box.xyz $file], 0) 42 42 AT_CHECK([chmod u+w $file], 0) 43 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms -- unselect-atoms-inside-sphere 1.65 --position "10,10,10"-r], 0, [stdout], [stderr])43 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms --set-shape --shape-type "sphere" --translation "10,10,10" --stretch "1.65, 1.65, 1.65" --angle-x 0. --angle-y 0. --angle-z 0. --unselect-atoms-inside-volume -r], 0, [stdout], [stderr]) 44 44 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/post/allatomsinsidetinysphere.xyz], 0, [ignore], [ignore]) 45 45 … … 62 62 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/pre/box.xyz $file], 0) 63 63 AT_CHECK([chmod u+w $file], 0) 64 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms -- unselect-atoms-inside-sphere 1.65 --position "10,10,10"--undo -r], 0, [stdout], [stderr])64 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms --set-shape --shape-type "sphere" --translation "10,10,10" --stretch "1.65, 1.65, 1.65" --angle-x 0. --angle-y 0. --angle-z 0. --unselect-atoms-inside-volume --undo -r], 0, [stdout], [stderr]) 65 65 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/post/empty.xyz], 0, [ignore], [ignore]) 66 66 … … 74 74 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/pre/box.xyz $file], 0) 75 75 AT_CHECK([chmod u+w $file], 0) 76 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms -- unselect-atoms-inside-sphere 1.65 --position "10,10,10"--undo --redo -r], 0, [stdout], [stderr])76 AT_CHECK([../../molecuilder -i $file -v 5 --select-all-atoms --set-shape --shape-type "sphere" --translation "10,10,10" --stretch "1.65, 1.65, 1.65" --angle-x 0. --angle-y 0. --angle-z 0. --unselect-atoms-inside-volume --undo --redo -r], 0, [stdout], [stderr]) 77 77 AT_CHECK([diff -I '.*Created by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Selection/Atoms/AtomsInsideSphere/post/allatomsinsidetinysphere.xyz], 0, [ignore], [ignore]) 78 78
Note:
See TracChangeset
for help on using the changeset viewer.