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

File:

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

src/UIElements/CommandLineUI/CommandLineWindow.cpp

@@ -6 +6 @@
  */
 
-#include "Helpers/MemDebug.hpp"
-
 #include <boost/bind.hpp>
 
@@ -14 +12 @@
 
 #include "Actions/ActionRegistry.hpp"
+#include "Actions/AnalysisAction/MolecularVolumeAction.hpp"
 #include "Actions/AnalysisAction/PairCorrelationAction.hpp"
-#include "Actions/AnalysisAction/PairCorrelationToPointAction.hpp"
-#include "Actions/AnalysisAction/PairCorrelationToSurfaceAction.hpp"
+#include "Actions/AnalysisAction/PrincipalAxisSystemAction.hpp"
 #include "Actions/AtomAction/AddAction.hpp"
 #include "Actions/AtomAction/ChangeElementAction.hpp"
@@ -28 +26 @@
 #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"
@@ -35 +34 @@
 #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;
 }
@@ -86 +80 @@
 void CommandLineWindow::display() {
   // go through all possible actions
-  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();
-    }
+  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();
   }
 }
@@ -96 +89 @@
 void CommandLineWindow::populateAnalysisActions()
 {
+  new AnalysisMolecularVolumeAction();
   new AnalysisPairCorrelationAction();
-  new AnalysisPairCorrelationToPointAction();
-  new AnalysisPairCorrelationToSurfaceAction();
+  new AnalysisPrincipalAxisSystemAction();
 }
 
@@ -121 +114 @@
 {
   new FragmentationDepthFirstSearchAction();
+  new FragmentationFragmentationAction();
+  new FragmentationSubgraphDissectionAction();
 }
 
@@ -132 +127 @@
   new MoleculeSaveBondsAction();
   new MoleculeSaveTemperatureAction();
+  new MoleculeTranslateAction();
   new MoleculeVerletIntegrationAction();
 }