Changeset 7e19060 for src

Timestamp:

Dec 14, 2012, 5:40:13 PM (12 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:

216dad

Parents:

a2bbb1

git-author:

Michael Ankele <ankele@…> (11/21/12 13:44:36)

git-committer:

Frederik Heber <heber@…> (12/14/12 17:40:13)

Message:

use degrees as angle input in shape actions

Location:

src/Actions/ShapeAction

Files:

• CreateShapeAction.cpp (modified) (2 diffs)
• RotateShapeAction.cpp (modified) (3 diffs)

src/Actions/ShapeAction/CreateShapeAction.cpp

@@ -56 +56 @@
   Shape s = ShapeFactory::getInstance().produce(ShapeFactory::getInstance().getShapeByName(params.shape_type.get()),
       params.translation.get(), params.stretch.get(),
-      params.angle_x.get(), params.angle_y.get(), params.angle_z.get());
+      params.angle_x.get() * M_PI/180., params.angle_y.get() * M_PI/180., params.angle_z.get() * M_PI/180.);
   if (params.shape_name.get() != "")
     s.setName(params.shape_name.get());
@@ -84 +84 @@
   Shape s = ShapeFactory::getInstance().produce(ShapeFactory::getInstance().getShapeByName(state->params.shape_type.get()),
       state->params.translation.get(), state->params.stretch.get(),
-      state->params.angle_x.get(), state->params.angle_y.get(), state->params.angle_z.get());
+      state->params.angle_x.get() * M_PI/180., state->params.angle_y.get() * M_PI/180., state->params.angle_z.get() * M_PI/180.);
   if (state->params.shape_name.get() != "")
     s.setName(state->params.shape_name.get());

src/Actions/ShapeAction/RotateShapeAction.cpp

@@ -57 +57 @@
 
   RealSpaceMatrix rotation;
-  rotation.setRotation(params.angle_x.get(), params.angle_y.get(), params.angle_z.get());
+  rotation.setRotation(params.angle_x.get() * M_PI/180., params.angle_y.get() * M_PI/180., params.angle_z.get() * M_PI/180.);
 
   for (unsigned int i=0;i<selectedShapes.size();i++){
@@ -77 +77 @@
 
   RealSpaceMatrix rotation;
-  rotation.setRotation(state->params.angle_x.get(), state->params.angle_y.get(), state->params.angle_z.get());
+  rotation.setRotation(state->params.angle_x.get() * M_PI/180., state->params.angle_y.get() * M_PI/180., state->params.angle_z.get() * M_PI/180.);
   rotation = rotation.invert();
 
@@ -98 +98 @@
 
   RealSpaceMatrix rotation;
-  rotation.setRotation(state->params.angle_x.get(), state->params.angle_y.get(), state->params.angle_z.get());
+  rotation.setRotation(state->params.angle_x.get() * M_PI/180., state->params.angle_y.get() * M_PI/180., state->params.angle_z.get() * M_PI/180.);
 
   for (unsigned int i=0;i<selectedShapes.size();i++){