Changes in src/Actions/AtomAction/RotateAroundOriginByAngleAction.cpp [be21fa:d555b8]

File:

• src/Actions/AtomAction/RotateAroundOriginByAngleAction.cpp (modified) (3 diffs)

src/Actions/AtomAction/RotateAroundOriginByAngleAction.cpp

@@ -44 +44 @@
 
   // 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.;
+  double radian = params.angle.get() * M_PI/180.;
 
   // Creation Line that is the rotation axis
-  Line RotationAxis(Vector(0.,0.,0.), params.Axis);
+  Line RotationAxis(Vector(0.,0.,0.), params.Axis.get());
 
-  LOG(0, "Rotate around origin by " << params.angle << " radian, axis from origin to " << params.Axis << ".");
+  LOG(0, "Rotate around origin by " << radian << " radian, axis from origin to " << params.Axis.get() << ".");
   // TODO: use AtomSet::rotate?
   for (std::vector<atom *>::iterator iter = selectedAtoms.begin(); iter != selectedAtoms.end(); ++iter) {
-    (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), params.angle));
+    (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), radian));
   }
   LOG(0, "done.");
@@ -65 +65 @@
   AtomRotateAroundOriginByAngleState *state = assert_cast<AtomRotateAroundOriginByAngleState*>(_state.get());
 
+  // convert from degrees to radian
+  double radian = params.angle.get() * M_PI/180.;
+
   // Creation Line that is the rotation axis
-  Line RotationAxis(Vector(0.,0.,0.), state->params.Axis);
+  Line RotationAxis(Vector(0.,0.,0.), state->params.Axis.get());
 
   for (std::vector<atom *>::iterator iter = state->selectedAtoms.begin(); iter != state->selectedAtoms.end(); ++iter) {
-    (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), -state->params.angle));
+    (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), -radian));
   }
 
@@ -78 +81 @@
   AtomRotateAroundOriginByAngleState *state = assert_cast<AtomRotateAroundOriginByAngleState*>(_state.get());
 
+  // convert from degrees to radian
+  double radian = params.angle.get() * M_PI/180.;
+
   // Creation Line that is the rotation axis
-  Line RotationAxis(Vector(0.,0.,0.), state->params.Axis);
+  Line RotationAxis(Vector(0.,0.,0.), state->params.Axis.get());
 
   for (std::vector<atom *>::iterator iter = state->selectedAtoms.begin(); iter != state->selectedAtoms.end(); ++iter) {
-    (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), state->params.angle));
+    (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), radian));
   }