Changeset 53d01c for src


Ignore:
Timestamp:
Aug 28, 2010, 12:57:56 AM (15 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
1fd675
Parents:
8bb05e
git-author:
Frederik Heber <heber@…> (08/26/10 18:59:34)
git-committer:
Frederik Heber <heber@…> (08/28/10 00:57:56)
Message:

Renamed dir Actions/CmdAction -> Actions/CommandAction, renamed class CommandLine... -> Command...

  • this is necessary to get the naming scheme consistent.
Location:
src
Files:
4 edited
12 moved

Legend:

Unmodified
Added
Removed

  • src/Actions/CommandAction/BondLengthTableAction.cpp

    r8bb05e r53d01c  
    2020#include "Helpers/MemDebug.hpp"
    2121
    22 #include "Actions/CmdAction/BondLengthTableAction.hpp"
     22#include "Actions/CommandAction/BondLengthTableAction.hpp"
    2323#include "Actions/ActionRegistry.hpp"
    2424#include "bondgraph.hpp"
    … …  
    3737#include "Actions/ValueStorage.hpp"
    3838
    39 const char CommandLineBondLengthTableAction::NAME[] = "bond-table";
     39const char CommandBondLengthTableAction::NAME[] = "bond-table";
    4040
    41 CommandLineBondLengthTableAction::CommandLineBondLengthTableAction() :
     41CommandBondLengthTableAction::CommandBondLengthTableAction() :
    4242  Action(NAME)
    4343{}
    4444
    45 CommandLineBondLengthTableAction::~CommandLineBondLengthTableAction()
     45CommandBondLengthTableAction::~CommandBondLengthTableAction()
    4646{}
    4747
    4848void CommandBondLengthTable(std::string &BondGraphFileName) {
    49   ValueStorage::getInstance().setCurrentValue(CommandLineBondLengthTableAction::NAME, BondGraphFileName);
    50   ActionRegistry::getInstance().getActionByName(CommandLineBondLengthTableAction::NAME)->call(Action::NonInteractive);
     49  ValueStorage::getInstance().setCurrentValue(CommandBondLengthTableAction::NAME, BondGraphFileName);
     50  ActionRegistry::getInstance().getActionByName(CommandBondLengthTableAction::NAME)->call(Action::NonInteractive);
    5151};
    5252
    53 void CommandLineBondLengthTableAction::getParametersfromValueStorage()
     53void CommandBondLengthTableAction::getParametersfromValueStorage()
    5454{};
    5555
    56 Dialog* CommandLineBondLengthTableAction::fillDialog(Dialog *dialog) {
     56Dialog* CommandBondLengthTableAction::fillDialog(Dialog *dialog) {
    5757  ASSERT(dialog,"No Dialog given when filling action dialog");
    5858
    … …  
    6262}
    6363
    64 Action::state_ptr CommandLineBondLengthTableAction::performCall() {
     64Action::state_ptr CommandBondLengthTableAction::performCall() {
    6565  ostringstream usage;
    6666  string BondGraphFileName;
    … …  
    8484}
    8585
    86 Action::state_ptr CommandLineBondLengthTableAction::performUndo(Action::state_ptr _state) {
     86Action::state_ptr CommandBondLengthTableAction::performUndo(Action::state_ptr _state) {
    8787//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
    8888
    … …  
    9494}
    9595
    96 Action::state_ptr CommandLineBondLengthTableAction::performRedo(Action::state_ptr _state){
     96Action::state_ptr CommandBondLengthTableAction::performRedo(Action::state_ptr _state){
    9797  return Action::failure;
    9898}
    9999
    100 bool CommandLineBondLengthTableAction::canUndo() {
     100bool CommandBondLengthTableAction::canUndo() {
    101101  return false;
    102102}
    103103
    104 bool CommandLineBondLengthTableAction::shouldUndo() {
     104bool CommandBondLengthTableAction::shouldUndo() {
    105105  return false;
    106106}
    107107
    108 const string CommandLineBondLengthTableAction::getName() {
     108const string CommandBondLengthTableAction::getName() {
    109109  return NAME;
    110110}

  • src/Actions/CommandAction/BondLengthTableAction.hpp

    r8bb05e r53d01c  
    1313void CommandBondLengthTable(std::string &BondGraphFileName);
    1414
    15 class CommandLineBondLengthTableAction : public Action {
     15class CommandBondLengthTableAction : public Action {
    1616  friend void CommandBondLengthTable(std::string &BondGraphFileName);
    1717
    1818public:
    19   CommandLineBondLengthTableAction();
    20   virtual ~CommandLineBondLengthTableAction();
     19  CommandBondLengthTableAction();
     20  virtual ~CommandBondLengthTableAction();
    2121
    2222  bool canUndo();

  • src/Actions/CommandAction/ElementDbAction.cpp

    r8bb05e r53d01c  
    2020#include "Helpers/MemDebug.hpp"
    2121
    22 #include "Actions/CmdAction/ElementDbAction.hpp"
     22#include "Actions/CommandAction/ElementDbAction.hpp"
    2323#include "Actions/ActionRegistry.hpp"
    2424#include "config.hpp"
    … …  
    3737#include "Actions/ValueStorage.hpp"
    3838
    39 const char CommandLineElementDbAction::NAME[] = "element-db";
     39const char CommandElementDbAction::NAME[] = "element-db";
    4040
    41 CommandLineElementDbAction::CommandLineElementDbAction() :
     41CommandElementDbAction::CommandElementDbAction() :
    4242  Action(NAME)
    4343{}
    4444
    45 CommandLineElementDbAction::~CommandLineElementDbAction()
     45CommandElementDbAction::~CommandElementDbAction()
    4646{}
    4747
    4848void CommandElementDb(std::string &databasepath) {
    49   ValueStorage::getInstance().setCurrentValue(CommandLineElementDbAction::NAME, databasepath);
    50   ActionRegistry::getInstance().getActionByName(CommandLineElementDbAction::NAME)->call(Action::NonInteractive);
     49  ValueStorage::getInstance().setCurrentValue(CommandElementDbAction::NAME, databasepath);
     50  ActionRegistry::getInstance().getActionByName(CommandElementDbAction::NAME)->call(Action::NonInteractive);
    5151};
    5252
    53 void CommandLineElementDbAction::getParametersfromValueStorage()
     53void CommandElementDbAction::getParametersfromValueStorage()
    5454{};
    5555
    56 Dialog* CommandLineElementDbAction::fillDialog(Dialog *dialog) {
     56Dialog* CommandElementDbAction::fillDialog(Dialog *dialog) {
    5757  ASSERT(dialog,"No Dialog given when filling action dialog");
    5858
    … …  
    6262}
    6363
    64 Action::state_ptr CommandLineElementDbAction::performCall() {
     64Action::state_ptr CommandElementDbAction::performCall() {
    6565  ostringstream usage;
    6666  string databasepath;
    … …  
    8585}
    8686
    87 Action::state_ptr CommandLineElementDbAction::performUndo(Action::state_ptr _state) {
     87Action::state_ptr CommandElementDbAction::performUndo(Action::state_ptr _state) {
    8888//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
    8989
    … …  
    9595}
    9696
    97 Action::state_ptr CommandLineElementDbAction::performRedo(Action::state_ptr _state){
     97Action::state_ptr CommandElementDbAction::performRedo(Action::state_ptr _state){
    9898  return Action::failure;
    9999}
    100100
    101 bool CommandLineElementDbAction::canUndo() {
     101bool CommandElementDbAction::canUndo() {
    102102  return false;
    103103}
    104104
    105 bool CommandLineElementDbAction::shouldUndo() {
     105bool CommandElementDbAction::shouldUndo() {
    106106  return false;
    107107}
    108108
    109 const string CommandLineElementDbAction::getName() {
     109const string CommandElementDbAction::getName() {
    110110  return NAME;
    111111}

  • src/Actions/CommandAction/ElementDbAction.hpp

    r8bb05e r53d01c  
    1313void CommandElementDb(std::string &databasepath);
    1414
    15 class CommandLineElementDbAction : public Action {
     15class CommandElementDbAction : public Action {
    1616  friend void CommandElementDb(std::string &databasepath);
    1717
    1818public:
    19   CommandLineElementDbAction();
    20   virtual ~CommandLineElementDbAction();
     19  CommandElementDbAction();
     20  virtual ~CommandElementDbAction();
    2121
    2222  bool canUndo();

  • src/Actions/CommandAction/FastParsingAction.cpp

    r8bb05e r53d01c  
    2020#include "Helpers/MemDebug.hpp"
    2121
    22 #include "Actions/CmdAction/FastParsingAction.hpp"
     22#include "Actions/CommandAction/FastParsingAction.hpp"
    2323#include "Actions/ActionRegistry.hpp"
    2424#include "config.hpp"
    … …  
    3838// memento to remember the state when undoing
    3939
    40 class CommandLineFastParsingState : public ActionState {
     40class CommandFastParsingState : public ActionState {
    4141public:
    42   CommandLineFastParsingState(const bool _oldvalue, const bool _newvalue) :
     42  CommandFastParsingState(const bool _oldvalue, const bool _newvalue) :
    4343    oldvalue(_oldvalue),
    4444    newvalue(_newvalue)
    … …  
    4949
    5050
    51 const char CommandLineFastParsingAction::NAME[] = "fastparsing";
     51const char CommandFastParsingAction::NAME[] = "fastparsing";
    5252
    53 CommandLineFastParsingAction::CommandLineFastParsingAction() :
     53CommandFastParsingAction::CommandFastParsingAction() :
    5454  Action(NAME)
    5555{}
    5656
    57 CommandLineFastParsingAction::~CommandLineFastParsingAction()
     57CommandFastParsingAction::~CommandFastParsingAction()
    5858{}
    5959
    6060void CommandFastParsing(bool fastparsing) {
    61   ValueStorage::getInstance().setCurrentValue(CommandLineFastParsingAction::NAME, fastparsing);
    62   ActionRegistry::getInstance().getActionByName(CommandLineFastParsingAction::NAME)->call(Action::NonInteractive);
     61  ValueStorage::getInstance().setCurrentValue(CommandFastParsingAction::NAME, fastparsing);
     62  ActionRegistry::getInstance().getActionByName(CommandFastParsingAction::NAME)->call(Action::NonInteractive);
    6363};
    6464
    65 void CommandLineFastParsingAction::getParametersfromValueStorage()
     65void CommandFastParsingAction::getParametersfromValueStorage()
    6666{};
    6767
    68 Dialog* CommandLineFastParsingAction::fillDialog(Dialog *dialog) {
     68Dialog* CommandFastParsingAction::fillDialog(Dialog *dialog) {
    6969  ASSERT(dialog,"No Dialog given when filling action dialog");
    7070
    … …  
    7474}
    7575
    76 Action::state_ptr CommandLineFastParsingAction::performCall() {
     76Action::state_ptr CommandFastParsingAction::performCall() {
    7777  config *configuration = World::getInstance().getConfig();
    7878  bool oldvalue = configuration->FastParsing;
    … …  
    8484  else
    8585    DoLog(0) && (Log() << Verbose(0) << "I will parse trajectories." << endl);
    86   return Action::state_ptr(new CommandLineFastParsingState(oldvalue, newvalue));
     86  return Action::state_ptr(new CommandFastParsingState(oldvalue, newvalue));
    8787}
    8888
    89 Action::state_ptr CommandLineFastParsingAction::performUndo(Action::state_ptr _state) {
    90   CommandLineFastParsingState *state = assert_cast<CommandLineFastParsingState*>(_state.get());
     89Action::state_ptr CommandFastParsingAction::performUndo(Action::state_ptr _state) {
     90  CommandFastParsingState *state = assert_cast<CommandFastParsingState*>(_state.get());
    9191
    9292  config *configuration = World::getInstance().getConfig();
    … …  
    100100}
    101101
    102 Action::state_ptr CommandLineFastParsingAction::performRedo(Action::state_ptr _state){
    103   CommandLineFastParsingState *state = assert_cast<CommandLineFastParsingState*>(_state.get());
     102Action::state_ptr CommandFastParsingAction::performRedo(Action::state_ptr _state){
     103  CommandFastParsingState *state = assert_cast<CommandFastParsingState*>(_state.get());
    104104
    105105  config *configuration = World::getInstance().getConfig();
    … …  
    113113}
    114114
    115 bool CommandLineFastParsingAction::canUndo() {
     115bool CommandFastParsingAction::canUndo() {
    116116  return true;
    117117}
    118118
    119 bool CommandLineFastParsingAction::shouldUndo() {
     119bool CommandFastParsingAction::shouldUndo() {
    120120  return true;
    121121}
    122122
    123 const string CommandLineFastParsingAction::getName() {
     123const string CommandFastParsingAction::getName() {
    124124  return NAME;
    125125}

  • src/Actions/CommandAction/FastParsingAction.hpp

    r8bb05e r53d01c  
    1313void CommandFastParsing(bool fastparsing);
    1414
    15 class CommandLineFastParsingAction : public Action {
     15class CommandFastParsingAction : public Action {
    1616  friend void CommandFastParsing(bool fastparsing);
    1717
    1818public:
    19   CommandLineFastParsingAction();
    20   virtual ~CommandLineFastParsingAction();
     19  CommandFastParsingAction();
     20  virtual ~CommandFastParsingAction();
    2121
    2222  bool canUndo();

  • src/Actions/CommandAction/HelpAction.cpp

    r8bb05e r53d01c  
    2020#include "Helpers/MemDebug.hpp"
    2121
    22 #include "Actions/CmdAction/HelpAction.hpp"
     22#include "Actions/CommandAction/HelpAction.hpp"
    2323#include "Actions/ActionRegistry.hpp"
    2424#include "CommandLineParser.hpp"
    … …  
    3333#include "Actions/ValueStorage.hpp"
    3434
    35 const char CommandLineHelpAction::NAME[] = "help";
     35const char CommandHelpAction::NAME[] = "help";
    3636
    37 CommandLineHelpAction::CommandLineHelpAction() :
     37CommandHelpAction::CommandHelpAction() :
    3838  Action(NAME)
    3939{}
    4040
    41 CommandLineHelpAction::~CommandLineHelpAction()
     41CommandHelpAction::~CommandHelpAction()
    4242{}
    4343
    4444void CommandHelp() {
    45   ActionRegistry::getInstance().getActionByName(CommandLineHelpAction::NAME)->call(Action::NonInteractive);
     45  ActionRegistry::getInstance().getActionByName(CommandHelpAction::NAME)->call(Action::NonInteractive);
    4646};
    4747
    48 void CommandLineHelpAction::getParametersfromValueStorage()
     48void CommandHelpAction::getParametersfromValueStorage()
    4949{};
    5050
    51 Dialog* CommandLineHelpAction::fillDialog(Dialog *dialog) {
     51Dialog* CommandHelpAction::fillDialog(Dialog *dialog) {
    5252  ASSERT(dialog,"No Dialog given when filling action dialog");
    5353
    … …  
    5959}
    6060
    61 Action::state_ptr CommandLineHelpAction::performCall() {
     61Action::state_ptr CommandHelpAction::performCall() {
    6262  return Action::success;
    6363}
    6464
    65 Action::state_ptr CommandLineHelpAction::performUndo(Action::state_ptr _state) {
     65Action::state_ptr CommandHelpAction::performUndo(Action::state_ptr _state) {
    6666  return Action::success;
    6767}
    6868
    69 Action::state_ptr CommandLineHelpAction::performRedo(Action::state_ptr _state){
     69Action::state_ptr CommandHelpAction::performRedo(Action::state_ptr _state){
    7070  return Action::success;
    7171}
    7272
    73 bool CommandLineHelpAction::canUndo() {
     73bool CommandHelpAction::canUndo() {
    7474  return true;
    7575}
    7676
    77 bool CommandLineHelpAction::shouldUndo() {
     77bool CommandHelpAction::shouldUndo() {
    7878  return false;
    7979}
    8080
    81 const string CommandLineHelpAction::getName() {
     81const string CommandHelpAction::getName() {
    8282  return NAME;
    8383}

  • src/Actions/CommandAction/HelpAction.hpp

    r8bb05e r53d01c  
    1313void CommandHelp();
    1414
    15 class CommandLineHelpAction : public Action {
     15class CommandHelpAction : public Action {
    1616  friend void CommandHelp();
    1717
    1818public:
    19   CommandLineHelpAction();
    20   virtual ~CommandLineHelpAction();
     19  CommandHelpAction();
     20  virtual ~CommandHelpAction();
    2121
    2222  bool canUndo();

  • src/Actions/CommandAction/VerboseAction.cpp

    r8bb05e r53d01c  
    2020#include "Helpers/MemDebug.hpp"
    2121
    22 #include "Actions/CmdAction/VerboseAction.hpp"
     22#include "Actions/CommandAction/VerboseAction.hpp"
    2323#include "Actions/ActionRegistry.hpp"
    2424#include "Helpers/Log.hpp"
    … …  
    3636// memento to remember the state when undoing
    3737
    38 class CommandLineVerboseState : public ActionState {
     38class CommandVerboseState : public ActionState {
    3939public:
    40   CommandLineVerboseState(const int _oldverbosity, const int _newverbosity) :
     40  CommandVerboseState(const int _oldverbosity, const int _newverbosity) :
    4141    oldverbosity(_oldverbosity),
    4242    newverbosity(_newverbosity)
    … …  
    4747
    4848
    49 const char CommandLineVerboseAction::NAME[] = "verbose";
     49const char CommandVerboseAction::NAME[] = "verbose";
    5050
    51 CommandLineVerboseAction::CommandLineVerboseAction() :
     51CommandVerboseAction::CommandVerboseAction() :
    5252  Action(NAME)
    5353{}
    5454
    55 CommandLineVerboseAction::~CommandLineVerboseAction()
     55CommandVerboseAction::~CommandVerboseAction()
    5656{}
    5757
    5858void CommandVerbose(int verbosity) {
    59   ValueStorage::getInstance().setCurrentValue(CommandLineVerboseAction::NAME, verbosity);
    60   ActionRegistry::getInstance().getActionByName(CommandLineVerboseAction::NAME)->call(Action::NonInteractive);
     59  ValueStorage::getInstance().setCurrentValue(CommandVerboseAction::NAME, verbosity);
     60  ActionRegistry::getInstance().getActionByName(CommandVerboseAction::NAME)->call(Action::NonInteractive);
    6161};
    6262
    63 void CommandLineVerboseAction::getParametersfromValueStorage()
     63void CommandVerboseAction::getParametersfromValueStorage()
    6464{};
    6565
    66 Dialog* CommandLineVerboseAction::fillDialog(Dialog *dialog) {
     66Dialog* CommandVerboseAction::fillDialog(Dialog *dialog) {
    6767  ASSERT(dialog,"No Dialog given when filling action dialog");
    6868
    … …  
    7272}
    7373
    74 Action::state_ptr CommandLineVerboseAction::performCall() {
     74Action::state_ptr CommandVerboseAction::performCall() {
    7575  int oldverbosity = getVerbosity();
    7676  int newverbosity = 2;
    … …  
    7979
    8080  if (oldverbosity != newverbosity) {
    81     CommandLineVerboseState *UndoState = new CommandLineVerboseState(oldverbosity, newverbosity);
     81    CommandVerboseState *UndoState = new CommandVerboseState(oldverbosity, newverbosity);
    8282    setVerbosity(newverbosity);
    8383    DoLog(0) && (Log() << Verbose(0) << "Setting verbosity from " << oldverbosity << " to " << newverbosity << "." << endl);
    … …  
    8989}
    9090
    91 Action::state_ptr CommandLineVerboseAction::performUndo(Action::state_ptr _state) {
    92   CommandLineVerboseState *state = assert_cast<CommandLineVerboseState*>(_state.get());
     91Action::state_ptr CommandVerboseAction::performUndo(Action::state_ptr _state) {
     92  CommandVerboseState *state = assert_cast<CommandVerboseState*>(_state.get());
    9393
    9494  DoLog(0) && (Log() << Verbose(0) << "Setting verbosity from " << state->newverbosity << " to " << state->oldverbosity << "." << endl);
    … …  
    9898}
    9999
    100 Action::state_ptr CommandLineVerboseAction::performRedo(Action::state_ptr _state){
    101   CommandLineVerboseState *state = assert_cast<CommandLineVerboseState*>(_state.get());
     100Action::state_ptr CommandVerboseAction::performRedo(Action::state_ptr _state){
     101  CommandVerboseState *state = assert_cast<CommandVerboseState*>(_state.get());
    102102
    103103  DoLog(0) && (Log() << Verbose(0) << "Setting verbosity from " << state->oldverbosity << " to " << state->newverbosity << "." << endl);
    … …  
    107107}
    108108
    109 bool CommandLineVerboseAction::canUndo() {
     109bool CommandVerboseAction::canUndo() {
    110110  return true;
    111111}
    112112
    113 bool CommandLineVerboseAction::shouldUndo() {
     113bool CommandVerboseAction::shouldUndo() {
    114114  return true;
    115115}
    116116
    117 const string CommandLineVerboseAction::getName() {
     117const string CommandVerboseAction::getName() {
    118118  return NAME;
    119119}

  • src/Actions/CommandAction/VerboseAction.hpp

    r8bb05e r53d01c  
    1313void CommandVerbose(int verbosity);
    1414
    15 class CommandLineVerboseAction : public Action {
     15class CommandVerboseAction : public Action {
    1616  friend void CommandVerbose(int verbosity);
    1717
    1818public:
    19   CommandLineVerboseAction();
    20   virtual ~CommandLineVerboseAction();
     19  CommandVerboseAction();
     20  virtual ~CommandVerboseAction();
    2121
    2222  bool canUndo();

  • src/Actions/CommandAction/VersionAction.cpp

    r8bb05e r53d01c  
    2020#include "Helpers/MemDebug.hpp"
    2121
    22 #include "Actions/CmdAction/VersionAction.hpp"
     22#include "Actions/CommandAction/VersionAction.hpp"
    2323#include "Actions/ActionRegistry.hpp"
    2424#include "version.h"
    … …  
    3333#include "Actions/ValueStorage.hpp"
    3434
    35 const char CommandLineVersionAction::NAME[] = "version";
     35const char CommandVersionAction::NAME[] = "version";
    3636
    37 CommandLineVersionAction::CommandLineVersionAction() :
     37CommandVersionAction::CommandVersionAction() :
    3838  Action(NAME)
    3939{}
    4040
    41 CommandLineVersionAction::~CommandLineVersionAction()
     41CommandVersionAction::~CommandVersionAction()
    4242{}
    4343
    4444void CommandVersion() {
    45   ActionRegistry::getInstance().getActionByName(CommandLineVersionAction::NAME)->call(Action::NonInteractive);
     45  ActionRegistry::getInstance().getActionByName(CommandVersionAction::NAME)->call(Action::NonInteractive);
    4646};
    4747
    48 void CommandLineVersionAction::getParametersfromValueStorage()
     48void CommandVersionAction::getParametersfromValueStorage()
    4949{};
    5050
    51 Dialog* CommandLineVersionAction::fillDialog(Dialog *dialog) {
     51Dialog* CommandVersionAction::fillDialog(Dialog *dialog) {
    5252  ASSERT(dialog,"No Dialog given when filling action dialog");
    5353
    … …  
    5757}
    5858
    59 Action::state_ptr CommandLineVersionAction::performCall() {
     59Action::state_ptr CommandVersionAction::performCall() {
    6060  return Action::success;
    6161}
    6262
    63 Action::state_ptr CommandLineVersionAction::performUndo(Action::state_ptr _state) {
     63Action::state_ptr CommandVersionAction::performUndo(Action::state_ptr _state) {
    6464  return Action::success;
    6565}
    6666
    67 Action::state_ptr CommandLineVersionAction::performRedo(Action::state_ptr _state){
     67Action::state_ptr CommandVersionAction::performRedo(Action::state_ptr _state){
    6868  return Action::success;
    6969}
    7070
    71 bool CommandLineVersionAction::canUndo() {
     71bool CommandVersionAction::canUndo() {
    7272  return true;
    7373}
    7474
    75 bool CommandLineVersionAction::shouldUndo() {
     75bool CommandVersionAction::shouldUndo() {
    7676  return false;
    7777}
    7878
    79 const string CommandLineVersionAction::getName() {
     79const string CommandVersionAction::getName() {
    8080  return NAME;
    8181}

  • src/Actions/CommandAction/VersionAction.hpp

    r8bb05e r53d01c  
    1414void CommandVersion();
    1515
    16 class CommandLineVersionAction : public Action {
     16class CommandVersionAction : public Action {
    1717  friend void CommandVersion();
    1818
    1919public:
    20   CommandLineVersionAction();
    21   virtual ~CommandLineVersionAction();
     20  CommandVersionAction();
     21  virtual ~CommandVersionAction();
    2222
    2323  bool canUndo();

  • src/Actions/Makefile.am

    r8bb05e r53d01c  
    6161
    6262CMDACTIONSOURCE = \
    63   CmdAction/BondLengthTableAction.cpp \
    64   CmdAction/ElementDbAction.cpp \
    65   CmdAction/FastParsingAction.cpp \
    66   CmdAction/HelpAction.cpp \
    67   CmdAction/VerboseAction.cpp \
    68   CmdAction/VersionAction.cpp
     63  CommandAction/BondLengthTableAction.cpp \
     64  CommandAction/ElementDbAction.cpp \
     65  CommandAction/FastParsingAction.cpp \
     66  CommandAction/HelpAction.cpp \
     67  CommandAction/VerboseAction.cpp \
     68  CommandAction/VersionAction.cpp
    6969CMDACTIONHEADER = \
    70   CmdAction/BondLengthTableAction.hpp \
    71   CmdAction/ElementDbAction.hpp \
    72   CmdAction/FastParsingAction.hpp \
    73   CmdAction/HelpAction.hpp \
    74   CmdAction/VerboseAction.hpp \
    75   CmdAction/VersionAction.hpp
     70  CommandAction/BondLengthTableAction.hpp \
     71  CommandAction/ElementDbAction.hpp \
     72  CommandAction/FastParsingAction.hpp \
     73  CommandAction/HelpAction.hpp \
     74  CommandAction/VerboseAction.hpp \
     75  CommandAction/VersionAction.hpp
    7676
    7777FRAGMENTATIONACTIONSOURCE = \

  • src/Actions/MapOfActions.cpp

    r8bb05e r53d01c  
    5757#include "Actions/AtomAction/RotateAroundOriginByAngleAction.hpp"
    5858#include "Actions/AtomAction/TranslateAction.hpp"
    59 #include "Actions/CmdAction/BondLengthTableAction.hpp"
    60 #include "Actions/CmdAction/ElementDbAction.hpp"
    61 #include "Actions/CmdAction/FastParsingAction.hpp"
    62 #include "Actions/CmdAction/HelpAction.hpp"
    63 #include "Actions/CmdAction/VerboseAction.hpp"
    64 #include "Actions/CmdAction/VersionAction.hpp"
     59#include "Actions/CommandAction/BondLengthTableAction.hpp"
     60#include "Actions/CommandAction/ElementDbAction.hpp"
     61#include "Actions/CommandAction/FastParsingAction.hpp"
     62#include "Actions/CommandAction/HelpAction.hpp"
     63#include "Actions/CommandAction/VerboseAction.hpp"
     64#include "Actions/CommandAction/VersionAction.hpp"
    6565#include "Actions/FragmentationAction/DepthFirstSearchAction.hpp"
    6666#include "Actions/FragmentationAction/SubgraphDissectionAction.hpp"
    … …  
    928928  new AtomTranslateAction();
    929929
    930   new CommandLineBondLengthTableAction();
    931   new CommandLineElementDbAction();
    932   new CommandLineFastParsingAction();
    933   new CommandLineHelpAction();
    934   new CommandLineVerboseAction();
    935   new CommandLineVersionAction();
     930  new CommandBondLengthTableAction();
     931  new CommandElementDbAction();
     932  new CommandFastParsingAction();
     933  new CommandHelpAction();
     934  new CommandVerboseAction();
     935  new CommandVersionAction();
    936936
    937937  new FragmentationDepthFirstSearchAction();

  • src/CommandLineParser.hpp

    r8bb05e r53d01c  
    6060 *     #include "Actions/Cmd/VersionAction.hpp"
    6161 *   - Add an instance of your class to the specific populater-function in
    62  *     UIElements/CommandLineWindow.cpp, e.g. for the above Cmd action, add to populateCmdActions()
     62 *     UIElements/CommandLineWindow.cpp, e.g. for the above Cmd action, add to populateCommandActions()
    6363 *     add new CommandLineVersionAction().
    6464 *     This will automatically register in the ActionRegistry.

  • src/UIElements/CommandLineUI/CommandLineWindow.hpp

    r8bb05e r53d01c  
    2525  void populateAnalysisActions();
    2626  void populateAtomActions();
    27   void populateCmdActions();
     27  void populateCommandActions();
    2828  void populateFragmentationActions();
    2929  void populateMoleculeActions();
Note: See TracChangeset for help on using the changeset viewer.