Changes in src/Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.cpp [112b09:047878]

File:

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

src/Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.cpp

@@ -9 +9 @@
 
 #include "Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.hpp"
+#include "Actions/ActionRegistry.hpp"
+#include "log.hpp"
+#include "molecule.hpp"
+#include "verbose.hpp"
+
 
 #include <iostream>
@@ -18 +23 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
-
-#include "log.hpp"
-#include "molecule.hpp"
-#include "verbose.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 /****** MoleculeRotateToPrincipalAxisSystemAction *****/
@@ -47 +48 @@
 {}
 
+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->queryEmpty(NAME, MapOfActions::getInstance().getDescription(NAME));
+
+  return dialog;
+}
+
 Action::state_ptr MoleculeRotateToPrincipalAxisSystemAction::performCall() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
   molecule *mol = NULL;
 
-  dialog->queryMolecule(NAME, &mol, MapOfActions::getInstance().getDescription(NAME));
-
-  if(dialog->display()) {
+  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);
     mol->PrincipalAxisSystem(true);
-    delete dialog;
-    return Action::success;
   }
-  delete dialog;
-  return Action::failure;
+  return Action::success;
 }