Changes in src/Actions/MoleculeAction/RotateAroundSelfByAngleAction.cpp [be21fa:f10b0c]

File:

• src/Actions/MoleculeAction/RotateAroundSelfByAngleAction.cpp (modified) (3 diffs)

src/Actions/MoleculeAction/RotateAroundSelfByAngleAction.cpp

@@ -48 +48 @@
   BOOST_FOREACH(molecule *mol, selectedMolecules) {
     // check whether Axis is valid
-    if (params.Axis.IsZero())
+    if (params.Axis.get().IsZero())
       return Action::failure;
 
     // convert from degrees to radian
-    params.angle *= M_PI/180.;
+    params.angle.set(params.angle.get() * M_PI/180.);
 
     // Creation Line that is the rotation axis
     Vector *CenterOfGravity = mol->DetermineCenterOfGravity();
     LOG(0,  "Center of gravity is " << *CenterOfGravity << ".");
-    Line RotationAxis(*CenterOfGravity, params.Axis);
+    Line RotationAxis(*CenterOfGravity, params.Axis.get());
     delete(CenterOfGravity);
-    LOG(0, "Rotate " << mol->getName() << " around self by " << params.angle << " radian around axis " << RotationAxis << ".");
+    LOG(0, "Rotate " << mol->getName() << " around self by " << params.angle.get() << " radian around axis " << RotationAxis << ".");
 
     for (molecule::iterator iter = mol->begin(); iter != mol->end(); ++iter) {
-      (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), params.angle));
+      (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), params.angle.get()));
     }
     LOG(0, "done.");
@@ -76 +76 @@
     Vector *CenterOfGravity = mol->DetermineCenterOfGravity();
     LOG(0,  "Center of gravity is " << *CenterOfGravity << ".");
-    Line RotationAxis(*CenterOfGravity, state->params.Axis);
+    Line RotationAxis(*CenterOfGravity, state->params.Axis.get());
     delete(CenterOfGravity);
-    LOG(0, "Rotate " << mol->getName() << " around self by " << -state->params.angle << " radian around axis " << RotationAxis << ".");
+    LOG(0, "Rotate " << mol->getName() << " around self by " << -state->params.angle.get() << " radian around axis " << RotationAxis << ".");
 
     for (molecule::iterator iter = mol->begin(); iter != mol->end(); ++iter) {
-      (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), -state->params.angle));
+      (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), -state->params.angle.get()));
     }
   }
@@ -94 +94 @@
     Vector *CenterOfGravity = mol->DetermineCenterOfGravity();
     LOG(0,  "Center of gravity is " << *CenterOfGravity << ".");
-    Line RotationAxis(*CenterOfGravity, state->params.Axis);
+    Line RotationAxis(*CenterOfGravity, state->params.Axis.get());
     delete(CenterOfGravity);
-    LOG(0, "Rotate " << mol->getName() << " around self by " << state->params.angle << " radian around axis " << RotationAxis << ".");
+    LOG(0, "Rotate " << mol->getName() << " around self by " << state->params.angle.get() << " radian around axis " << RotationAxis << ".");
 
     for (molecule::iterator iter = mol->begin(); iter != mol->end(); ++iter) {
-      (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), state->params.angle));
+      (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), state->params.angle.get()));
     }
   }