Changes in src/Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.cpp [6e5084:0430e3]

File:

• src/Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.cpp (modified) (4 diffs)

src/Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.cpp

@@ -10 +10 @@
 #include "Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.hpp"
 #include "Actions/ActionRegistry.hpp"
-#include "Helpers/Log.hpp"
-#include "Helpers/Verbose.hpp"
-#include "LinearAlgebra/Line.hpp"
-#include "LinearAlgebra/Matrix.hpp"
-#include "LinearAlgebra/Vector.hpp"
-#include "element.hpp"
+#include "log.hpp"
 #include "molecule.hpp"
+#include "verbose.hpp"
 
 
@@ -27 +23 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/ValueStorage.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 /****** MoleculeRotateToPrincipalAxisSystemAction *****/
@@ -52 +48 @@
 {}
 
-void MoleculeRotateToPrincipalAxisSystem(Vector &Axis) {
-  ValueStorage::getInstance().setCurrentValue(MoleculeRotateToPrincipalAxisSystemAction::NAME, Axis);
+void MoleculeRotateToPrincipalAxisSystem() {
   ActionRegistry::getInstance().getActionByName(MoleculeRotateToPrincipalAxisSystemAction::NAME)->call(Action::NonInteractive);
 };
 
-Dialog* MoleculeRotateToPrincipalAxisSystemAction::fillDialog(Dialog *dialog) {
-  ASSERT(dialog,"No Dialog given when filling action dialog");
+Dialog* MoleculeRotateToPrincipalAxisSystemAction::createDialog() {
+  Dialog *dialog = UIFactory::getInstance().makeDialog();
 
-  dialog->queryVector(NAME, false, MapOfActions::getInstance().getDescription(NAME));
+  dialog->queryEmpty(NAME, MapOfActions::getInstance().getDescription(NAME));
 
   return dialog;
@@ -67 +62 @@
 Action::state_ptr MoleculeRotateToPrincipalAxisSystemAction::performCall() {
   molecule *mol = NULL;
-  Vector Axis;
-
-  // obtain axis to rotate to
-  ValueStorage::getInstance().queryCurrentValue(NAME, Axis);
 
   for (World::MoleculeSelectionIterator iter = World::getInstance().beginMoleculeSelection(); iter != World::getInstance().endMoleculeSelection(); ++iter) {
     mol = iter->second;
     DoLog(0) && (Log() << Verbose(0) << "Converting to prinicipal axis system." << endl);
-    Matrix InertiaTensor;
-    Vector *CenterOfGravity = mol->DetermineCenterOfGravity();
-
-    // reset inertia tensor
-    InertiaTensor.zero();
-
-    // sum up inertia tensor
-    for (molecule::const_iterator iter = mol->begin(); iter != mol->end(); ++iter) {
-      Vector x = (*iter)->x;
-      x -= *CenterOfGravity;
-      InertiaTensor.at(0,0) += (*iter)->type->mass*(x[1]*x[1] + x[2]*x[2]);
-      InertiaTensor.at(0,1) += (*iter)->type->mass*(-x[0]*x[1]);
-      InertiaTensor.at(0,2) += (*iter)->type->mass*(-x[0]*x[2]);
-      InertiaTensor.at(1,0) += (*iter)->type->mass*(-x[1]*x[0]);
-      InertiaTensor.at(1,1) += (*iter)->type->mass*(x[0]*x[0] + x[2]*x[2]);
-      InertiaTensor.at(1,2) += (*iter)->type->mass*(-x[1]*x[2]);
-      InertiaTensor.at(2,0) += (*iter)->type->mass*(-x[2]*x[0]);
-      InertiaTensor.at(2,1) += (*iter)->type->mass*(-x[2]*x[1]);
-      InertiaTensor.at(2,2) += (*iter)->type->mass*(x[0]*x[0] + x[1]*x[1]);
-    }
-    // print InertiaTensor for debugging
-    DoLog(0) && (Log() << Verbose(0) << "The inertia tensor is:" << InertiaTensor << endl);
-
-    // diagonalize to determine principal axis system
-    Vector Eigenvalues = InertiaTensor.transformToEigenbasis();
-
-    for(int i=0;i<NDIM;i++)
-      DoLog(0) && (Log() << Verbose(0) << "eigenvalue = " << Eigenvalues[i] << ", eigenvector = " << InertiaTensor.column(i) << endl);
-
-    // check whether we rotate or not
-    DoLog(0) && (Log() << Verbose(0) << "Transforming molecule into PAS ... ");
-
-    // obtain first column, eigenvector to biggest eigenvalue
-    Vector BiggestEigenvector(InertiaTensor.column(Eigenvalues.SmallestComponent()));
-    Vector DesiredAxis(Axis);
-
-    // Creation Line that is the rotation axis
-    DesiredAxis.VectorProduct(BiggestEigenvector);
-    Line RotationAxis(Vector(0.,0.,0.), DesiredAxis);
-
-    // determine angle
-    const double alpha = BiggestEigenvector.Angle(Axis);
-
-    DoLog(0) && (Log() << Verbose(0) << alpha << endl);
-
-    for (molecule::iterator iter = mol->begin(); iter != mol->end(); ++iter) {
-      *((*iter)->node) -= *CenterOfGravity;
-      *((*iter)->node) = RotationAxis.rotateVector(*((*iter)->node), alpha);
-      *((*iter)->node) += *CenterOfGravity;
-    }
-    DoLog(0) && (Log() << Verbose(0) << "done." << endl);
-
-    // summing anew for debugging (resulting matrix has to be diagonal!)
-    // reset inertia tensor
-    InertiaTensor.zero();
-
-    // sum up inertia tensor
-    for (molecule::const_iterator iter = mol->begin(); iter != mol->end(); ++iter) {
-      Vector x = (*iter)->x;
-      x -= *CenterOfGravity;
-      InertiaTensor.at(0,0) += (*iter)->type->mass*(x[1]*x[1] + x[2]*x[2]);
-      InertiaTensor.at(0,1) += (*iter)->type->mass*(-x[0]*x[1]);
-      InertiaTensor.at(0,2) += (*iter)->type->mass*(-x[0]*x[2]);
-      InertiaTensor.at(1,0) += (*iter)->type->mass*(-x[1]*x[0]);
-      InertiaTensor.at(1,1) += (*iter)->type->mass*(x[0]*x[0] + x[2]*x[2]);
-      InertiaTensor.at(1,2) += (*iter)->type->mass*(-x[1]*x[2]);
-      InertiaTensor.at(2,0) += (*iter)->type->mass*(-x[2]*x[0]);
-      InertiaTensor.at(2,1) += (*iter)->type->mass*(-x[2]*x[1]);
-      InertiaTensor.at(2,2) += (*iter)->type->mass*(x[0]*x[0] + x[1]*x[1]);
-      // print InertiaTensor for debugging
-      DoLog(0) && (Log() << Verbose(0) << "The inertia tensor is:" << InertiaTensor << endl);
-    }
-
-    // free everything
-    delete(CenterOfGravity);
+    mol->PrincipalAxisSystem(true);
   }
   return Action::success;