Changes in src/UIElements/CommandLineUI/CommandLineWindow.cpp [77b2d7:112b09]

File:

• src/UIElements/CommandLineUI/CommandLineWindow.cpp (modified) (9 diffs)

src/UIElements/CommandLineUI/CommandLineWindow.cpp

@@ -6 +6 @@
  */
 
+#include "Helpers/MemDebug.hpp"
+
 #include <boost/bind.hpp>
 
@@ -12 +14 @@
 
 #include "Actions/ActionRegistry.hpp"
-#include "Actions/AnalysisAction/MolecularVolumeAction.hpp"
 #include "Actions/AnalysisAction/PairCorrelationAction.hpp"
-#include "Actions/AnalysisAction/PrincipalAxisSystemAction.hpp"
+#include "Actions/AnalysisAction/PairCorrelationToPointAction.hpp"
+#include "Actions/AnalysisAction/PairCorrelationToSurfaceAction.hpp"
 #include "Actions/AtomAction/AddAction.hpp"
 #include "Actions/AtomAction/ChangeElementAction.hpp"
@@ -26 +28 @@
 #include "Actions/FragmentationAction/DepthFirstSearchAction.hpp"
 #include "Actions/FragmentationAction/SubgraphDissectionAction.hpp"
-#include "Actions/FragmentationAction/FragmentationAction.hpp"
 #include "Actions/MoleculeAction/BondFileAction.hpp"
 #include "Actions/MoleculeAction/ChangeNameAction.hpp"
@@ -34 +35 @@
 #include "Actions/MoleculeAction/SaveBondsAction.hpp"
 #include "Actions/MoleculeAction/SaveTemperatureAction.hpp"
-#include "Actions/MoleculeAction/TranslateAction.hpp"
 #include "Actions/MoleculeAction/VerletIntegrationAction.hpp"
 #include "Actions/ParserAction/LoadXyzAction.hpp"
@@ -75 +75 @@
 CommandLineWindow::~CommandLineWindow()
 {
+//  // go through all possible actions
+//  for(std::map<const std::string,Action*>::iterator ActionRunner = ActionRegistry::getInstance().getBeginIter(); ActionRegistry::getInstance().getBeginIter() != ActionRegistry::getInstance().getEndIter(); ActionRunner = ActionRegistry::getInstance().getBeginIter()) {
+//    ActionRegistry::getInstance().unregisterAction(ActionRunner->second);
+//    delete(ActionRunner->second);
+//  }
+
   delete statusIndicator;
 }
@@ -80 +86 @@
 void CommandLineWindow::display() {
   // go through all possible actions
-  for (std::list<std::string>::iterator CommandRunner = CommandLineParser::getInstance().SequenceOfActions.begin(); CommandRunner != CommandLineParser::getInstance().SequenceOfActions.end(); ++CommandRunner) {
-    cout << "Checking presence of " << *CommandRunner << endl;
-    if (ActionRegistry::getInstance().isActionByNamePresent(*CommandRunner))
-      ActionRegistry::getInstance().getActionByName(*CommandRunner)->call();
+  for(std::map<const std::string,Action*>::iterator ActionRunner = ActionRegistry::getInstance().getBeginIter(); ActionRunner != ActionRegistry::getInstance().getEndIter(); ActionRunner++) {
+    // check whether action is present in command line
+    if (CommandLineParser::getInstance().vm.count(ActionRunner->first)) {
+      ActionRunner->second->call();
+    }
   }
 }
@@ -89 +96 @@
 void CommandLineWindow::populateAnalysisActions()
 {
-  new AnalysisMolecularVolumeAction();
   new AnalysisPairCorrelationAction();
-  new AnalysisPrincipalAxisSystemAction();
+  new AnalysisPairCorrelationToPointAction();
+  new AnalysisPairCorrelationToSurfaceAction();
 }
 
@@ -114 +121 @@
 {
   new FragmentationDepthFirstSearchAction();
-  new FragmentationFragmentationAction();
-  new FragmentationSubgraphDissectionAction();
 }
 
@@ -127 +132 @@
   new MoleculeSaveBondsAction();
   new MoleculeSaveTemperatureAction();
-  new MoleculeTranslateAction();
   new MoleculeVerletIntegrationAction();
 }