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:
966e12
Parents:
53d01c
git-author:
Frederik Heber <heber@…> (08/26/10 21:05:34)
git-committer:
Frederik Heber <heber@…> (08/28/10 00:57:56)
Message:

All Actions are converted to the new macro framework.

  • included all three values that have been used to create or convert the files
    • createdef.sh
    • createCpp.sh
    • createHeader.sh
Location:
src/Actions/ParserAction
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • src/Actions/ParserAction/LoadXyzAction.cpp

    r53d01c r1fd675  
    2020#include "Helpers/MemDebug.hpp"
    2121
     22#include "Helpers/Log.hpp"
     23#include "Helpers/Verbose.hpp"
     24#include "Parser/XyzParser.hpp"
     25
     26#include <iostream>
     27
    2228using namespace std;
    2329
    2430#include "Actions/ParserAction/LoadXyzAction.hpp"
    25 #include "Actions/ActionRegistry.hpp"
    26 #include "Parser/XyzParser.hpp"
    27 #include "atom.hpp"
    28 #include "Helpers/Log.hpp"
    29 #include "molecule.hpp"
    30 #include "Helpers/Verbose.hpp"
    31 #include "World.hpp"
    3231
    33 #include <iostream>
    34 #include <set>
    35 #include <string>
    36 #include <vector>
    37 
    38 #include "UIElements/UIFactory.hpp"
    39 #include "UIElements/Dialog.hpp"
    40 #include "Actions/ValueStorage.hpp"
    41 
    42 /****** ParserLoadXyzAction *****/
    43 
    44 //// memento to remember the state when undoing
    45 //
    46 //class ParserLoadXyzState : public ActionState {
    47 //public:
    48 //  ParserLoadXyzState(molecule* _mol,std::string _lastName) :
    49 //    mol(_mol),
    50 //    lastName(_lastName)
    51 //  {}
    52 //  molecule* mol;
    53 //  std::string lastName;
    54 //};
    55 
    56 const char ParserLoadXyzAction::NAME[] = "parse-xyz";
    57 
    58 ParserLoadXyzAction::ParserLoadXyzAction() :
    59   Action(NAME)
    60 {}
    61 
    62 ParserLoadXyzAction::~ParserLoadXyzAction()
    63 {}
    64 
    65 void ParserLoadXyz(std::string &filename) {
    66   ValueStorage::getInstance().setCurrentValue(ParserLoadXyzAction::NAME, filename);
    67   ActionRegistry::getInstance().getActionByName(ParserLoadXyzAction::NAME)->call(Action::NonInteractive);
    68 };
    69 
    70 void ParserLoadXyzAction::getParametersfromValueStorage()
    71 {};
    72 
    73 Dialog* ParserLoadXyzAction::fillDialog(Dialog *dialog) {
    74   ASSERT(dialog,"No Dialog given when filling action dialog");
    75 
    76   dialog->queryString(NAME, ValueStorage::getInstance().getDescription(NAME));
    77 
    78   return dialog;
    79 }
    80 
     32// and construct the stuff
     33#include "LoadXyzAction.def"
     34#include "Action_impl_pre.hpp"
     35/** =========== define the function ====================== */
    8136Action::state_ptr ParserLoadXyzAction::performCall() {
    82   string filename;
    83 
    84   ValueStorage::getInstance().queryCurrentValue(NAME, filename);
     37  // obtain information
     38  getParametersfromValueStorage();
    8539
    8640  DoLog(1) && (Log() << Verbose(1) << "Parsing xyz file for new atoms." << endl);
    8741  // parse xyz file
    8842  ifstream input;
    89   input.open(filename.c_str());
     43  input.open(params.filename.c_str());
    9044  if (!input.fail()) {
    9145    XyzParser parser; // briefly instantiate a parser which is removed at end of focus
    9246    parser.load(&input);
    9347  } else {
    94     DoeLog(1) && (eLog() << Verbose(1) << "Could not open file " << filename << "." << endl);
     48    DoeLog(1) && (eLog() << Verbose(1) << "Could not open file " << params.filename << "." << endl);
    9549  }
    9650  input.close();
    … …  
    12377  return NAME;
    12478}
     79/** =========== end of function ====================== */

  • src/Actions/ParserAction/LoadXyzAction.hpp

    r53d01c r1fd675  
    1111#include "Actions/Action.hpp"
    1212
    13 
    14 void ParserLoadXyz(std::string &filename);
    15 
    16 class ParserLoadXyzAction : public Action {
    17   friend void ParserLoadXyz(std::string &filename);
    18 
    19 public:
    20   ParserLoadXyzAction();
    21   virtual ~ParserLoadXyzAction();
    22 
    23   bool canUndo();
    24   bool shouldUndo();
    25 
    26   virtual const std::string getName();
    27 protected:
    28   virtual Dialog * fillDialog(Dialog *dialog);
    29 private:
    30   virtual void getParametersfromValueStorage();
    31   virtual Action::state_ptr performCall();
    32   virtual Action::state_ptr performUndo(Action::state_ptr);
    33   virtual Action::state_ptr performRedo(Action::state_ptr);
    34 
    35   static const char NAME[];
    36 };
     13#include "LoadXyzAction.def"
     14#include "Action_impl_header.hpp"
    3715
    3816#endif /* LOADXYZACTION_HPP_ */

  • src/Actions/ParserAction/SaveXyzAction.cpp

    r53d01c r1fd675  
    2020#include "Helpers/MemDebug.hpp"
    2121
    22 #include "Actions/ParserAction/SaveXyzAction.hpp"
    23 #include "Actions/ActionRegistry.hpp"
    2422#include "Parser/XyzParser.hpp"
    2523#include "atom.hpp"
    … …  
    3129using namespace std;
    3230
    33 #include "UIElements/UIFactory.hpp"
    34 #include "UIElements/Dialog.hpp"
    35 #include "Actions/ValueStorage.hpp"
     31#include "Actions/ParserAction/SaveXyzAction.hpp"
    3632
    37 
    38 /****** ParserSaveXyzAction *****/
    39 
    40 //// memento to remember the state when undoing
    41 //
    42 //class ParserSaveXyzState : public ActionState {
    43 //public:
    44 //  ParserSaveXyzState(molecule* _mol,std::string _lastName) :
    45 //    mol(_mol),
    46 //    lastName(_lastName)
    47 //  {}
    48 //  molecule* mol;
    49 //  std::string lastName;
    50 //};
    51 
    52 const char ParserSaveXyzAction::NAME[] = "SaveXyz";
    53 
    54 ParserSaveXyzAction::ParserSaveXyzAction() :
    55   Action(NAME)
    56 {}
    57 
    58 ParserSaveXyzAction::~ParserSaveXyzAction()
    59 {}
    60 
    61 void ParserSaveXyz(std::string &filename) {
    62   ValueStorage::getInstance().setCurrentValue(ParserSaveXyzAction::NAME, filename);
    63   ActionRegistry::getInstance().getActionByName(ParserSaveXyzAction::NAME)->call(Action::NonInteractive);
    64 };
    65 
    66 void ParserSaveXyzAction::getParametersfromValueStorage()
    67 {};
    68 
    69 Dialog* ParserSaveXyzAction::fillDialog(Dialog *dialog) {
    70   ASSERT(dialog,"No Dialog given when filling action dialog");
    71 
    72   dialog->queryString(NAME, ValueStorage::getInstance().getDescription(NAME));
    73 
    74   return dialog;
    75 }
    76 
     33// and construct the stuff
     34#include "SaveXyzAction.def"
     35#include "Action_impl_pre.hpp"
     36/** =========== define the function ====================== */
    7737Action::state_ptr ParserSaveXyzAction::performCall() {
    78   string filename;
    7938  XyzParser parser;
    8039
    81   ValueStorage::getInstance().queryCurrentValue(NAME, filename);
     40  // obtain information
     41  getParametersfromValueStorage();
    8242
    8343  // store xyz file
    8444  ofstream output;
    85   output.open(filename.c_str());
     45  output.open(params.filename.c_str());
    8646  if (!output.fail())
    8747    parser.save(&output);
    … …  
    11777  return NAME;
    11878}
     79/** =========== end of function ====================== */

  • src/Actions/ParserAction/SaveXyzAction.hpp

    r53d01c r1fd675  
    1111#include "Actions/Action.hpp"
    1212
    13 
    14 void ParserSaveXyz(std::string &filename);
    15 
    16 class ParserSaveXyzAction : public Action {
    17   friend void ParserSaveXyz(std::string &filename);
    18 
    19 public:
    20   ParserSaveXyzAction();
    21   virtual ~ParserSaveXyzAction();
    22 
    23   bool canUndo();
    24   bool shouldUndo();
    25 
    26   virtual const std::string getName();
    27 protected:
    28   virtual Dialog * fillDialog(Dialog *dialog);
    29 private:
    30   virtual void getParametersfromValueStorage();
    31   virtual Action::state_ptr performCall();
    32   virtual Action::state_ptr performUndo(Action::state_ptr);
    33   virtual Action::state_ptr performRedo(Action::state_ptr);
    34 
    35   static const char NAME[];
    36 };
     13#include "SaveXyzAction.def"
     14#include "Action_impl_header.hpp"
    3715
    3816#endif /* SAVEXYZACTION_HPP_ */
Note: See TracChangeset for help on using the changeset viewer.