Changes in src/Actions/FragmentationAction/DepthFirstSearchAction.cpp [623e89:047878]

File:

• src/Actions/FragmentationAction/DepthFirstSearchAction.cpp (modified) (3 diffs)

src/Actions/FragmentationAction/DepthFirstSearchAction.cpp

@@ -6 +6 @@
  */
 
+#include "Helpers/MemDebug.hpp"
+
 #include "Actions/FragmentationAction/DepthFirstSearchAction.hpp"
+#include "Actions/ActionRegistry.hpp"
 #include "atom.hpp"
+#include "bondgraph.hpp"
 #include "config.hpp"
 #include "log.hpp"
@@ -24 +28 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/MapOfActions.hpp"
+#include "UIElements/ValueStorage.hpp"
 
 const char FragmentationDepthFirstSearchAction::NAME[] = "depth-first-search";
@@ -35 +39 @@
 {}
 
+void FragmentationDepthFirstSearch(double distance) {
+  ValueStorage::getInstance().setCurrentValue(FragmentationDepthFirstSearchAction::NAME, distance);
+  ActionRegistry::getInstance().getActionByName(FragmentationDepthFirstSearchAction::NAME)->call(Action::NonInteractive);
+};
+
+Dialog* FragmentationDepthFirstSearchAction::fillDialog(Dialog *dialog) {
+  ASSERT(dialog,"No Dialog given when filling action dialog");
+
+  dialog->queryDouble(NAME, ValueStorage::getInstance().getDescription(NAME));
+
+  return dialog;
+}
+
 Action::state_ptr FragmentationDepthFirstSearchAction::performCall() {
-  Dialog *dialog = UIFactory::getInstance().makeDialog();
   double distance;
 
-  dialog->queryDouble(NAME, &distance, MapOfActions::getInstance().getDescription(NAME));
+  ValueStorage::getInstance().queryCurrentValue(NAME, distance);
 
-  if(dialog->display()) {
-    DoLog(1) && (Log() << Verbose(1) << "Depth-First-Search Analysis." << endl);
-    molecule * const mol = World::getInstance().getMolecule(MoleculeById(0));
-    MoleculeLeafClass *Subgraphs = NULL;      // list of subgraphs from DFS analysis
-    int *MinimumRingSize = new int[mol->getAtomCount()];
-    atom ***ListOfLocalAtoms = NULL;
-    class StackClass<bond *> *BackEdgeStack = NULL;
-    class StackClass<bond *> *LocalBackEdgeStack = NULL;
-    mol->CreateAdjacencyList(distance, World::getInstance().getConfig()->GetIsAngstroem(), &BondGraph::CovalentMinMaxDistance, NULL);
-    Subgraphs = mol->DepthFirstSearchAnalysis(BackEdgeStack);
-    if (Subgraphs != NULL) {
-      int FragmentCounter = 0;
-      while (Subgraphs->next != NULL) {
-        Subgraphs = Subgraphs->next;
-        Subgraphs->FillBondStructureFromReference(mol, FragmentCounter, ListOfLocalAtoms, false);  // we want to keep the created ListOfLocalAtoms
-        LocalBackEdgeStack = new StackClass<bond *> (Subgraphs->Leaf->BondCount);
-        Subgraphs->Leaf->PickLocalBackEdges(ListOfLocalAtoms[FragmentCounter], BackEdgeStack, LocalBackEdgeStack);
-        Subgraphs->Leaf->CyclicStructureAnalysis(LocalBackEdgeStack, MinimumRingSize);
-        delete(LocalBackEdgeStack);
-        delete(Subgraphs->previous);
-        FragmentCounter++;
-      }
-      delete(Subgraphs);
-      for (int i=0;i<FragmentCounter;i++)
-        delete[](ListOfLocalAtoms[i]);
-      delete[](ListOfLocalAtoms);
+  DoLog(1) && (Log() << Verbose(1) << "Depth-First-Search Analysis." << endl);
+  molecule * const mol = World::getInstance().getMolecule(MoleculeById(0));
+  MoleculeLeafClass *Subgraphs = NULL;      // list of subgraphs from DFS analysis
+  int *MinimumRingSize = new int[mol->getAtomCount()];
+  atom **ListOfAtoms = NULL;
+  class StackClass<bond *> *BackEdgeStack = NULL;
+  class StackClass<bond *> *LocalBackEdgeStack = NULL;
+  mol->CreateAdjacencyList(distance, World::getInstance().getConfig()->GetIsAngstroem(), &BondGraph::CovalentMinMaxDistance, NULL);
+  Subgraphs = mol->DepthFirstSearchAnalysis(BackEdgeStack);
+  if (Subgraphs != NULL) {
+    int FragmentCounter = 0;
+    while (Subgraphs->next != NULL) {
+      Subgraphs = Subgraphs->next;
+      ListOfAtoms = NULL;
+      Subgraphs->FillBondStructureFromReference(mol, ListOfAtoms, false);  // we want to keep the created ListOfLocalAtoms
+      LocalBackEdgeStack = new StackClass<bond *> (Subgraphs->Leaf->BondCount);
+      Subgraphs->Leaf->PickLocalBackEdges(ListOfAtoms, BackEdgeStack, LocalBackEdgeStack);
+      Subgraphs->Leaf->CyclicStructureAnalysis(LocalBackEdgeStack, MinimumRingSize);
+      delete(LocalBackEdgeStack);
+      delete(Subgraphs->previous);
+      delete[](ListOfAtoms);  // and here we remove it
+      FragmentCounter++;
     }
-    delete(BackEdgeStack);
-    delete[](MinimumRingSize);
-    delete dialog;
-    return Action::success;
-  } else {
-    delete dialog;
-    return Action::failure;
+    delete(Subgraphs);
   }
+  delete(BackEdgeStack);
+  delete[](MinimumRingSize);
+  return Action::success;
 }
 
 Action::state_ptr FragmentationDepthFirstSearchAction::performUndo(Action::state_ptr _state) {
-//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
-
-  return Action::failure;
-//  string newName = state->mol->getName();
-//  state->mol->setName(state->lastName);
-//
-//  return Action::state_ptr(new ParserLoadXyzState(state->mol,newName));
+  return Action::success;
 }
 
 Action::state_ptr FragmentationDepthFirstSearchAction::performRedo(Action::state_ptr _state){
-  return Action::failure;
+  return Action::success;
 }
 
 bool FragmentationDepthFirstSearchAction::canUndo() {
-  return false;
+  return true;
 }
 
 bool FragmentationDepthFirstSearchAction::shouldUndo() {
-  return false;
+  return true;
 }