Changeset 03bb99 for src

Timestamp:

May 8, 2010, 6:36:22 PM (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:

18eecf

Parents:

a2ab15

Message:

Introducing small actions.

• new directory MoleculeAction to contain actions manipulating molecules.
• small_actions.?pp renamed to MoleculeAction/ChangeNameAction.?pp
• classes ChangeMoleculeName... renamed to MoleculeChangeName...
• builder.cpp: populateEditMoleculesMenu() adapted accordingly.
• new parser actions and new directory ParserAction
  • LoadXyzAction
  • SaveXyzAction
• new variables for all grouped actions in molecuilder/src/Makefile.am
• all files added to Makefile.am

Signed-off-by: Frederik Heber <heber@…>

Location:

src

Files:

• Actions/MoleculeAction/ChangeNameAction.cpp (moved) (moved from src/Actions/small_actions.cpp ) (5 diffs)
• Actions/MoleculeAction/ChangeNameAction.hpp (moved) (moved from src/Actions/small_actions.hpp ) (3 diffs)
• Actions/ParserAction/LoadXyzAction.cpp (added)
• Actions/ParserAction/LoadXyzAction.hpp (added)
• Actions/ParserAction/SaveXyzAction.cpp (added)
• Actions/ParserAction/SaveXyzAction.hpp (added)
• Makefile.am (modified) (3 diffs)
• builder.cpp (modified) (2 diffs)

src/Actions/MoleculeAction/ChangeNameAction.cpp

@@ -1 @@
-#include "Actions/small_actions.hpp"
+/*
+ * ChangeNameAction.cpp
+ *
+ *  Created on: Jan 15, 2010
+ *      Author: crueger
+ */
+
+#include "Actions/MoleculeAction/ChangeNameAction.hpp"
 
 #include <iostream>
@@ -12 +19 @@
 #include "molecule.hpp"
 
-/****** ChangeMoleculeNameAction *****/
+/****** MoleculeChangeNameAction *****/
 
 // memento to remember the state when undoing
 
-class ChangeMoleculeNameState : public ActionState {
+class MoleculeChangeNameState : public ActionState {
 public:
-  ChangeMoleculeNameState(molecule* _mol,std::string _lastName) :
+  MoleculeChangeNameState(molecule* _mol,std::string _lastName) :
     mol(_mol),
     lastName(_lastName)
@@ -26 +33 @@
 };
 
-const char ChangeMoleculeNameAction::NAME[] = "Change filename of Molecule";
+const char MoleculeChangeNameAction::NAME[] = "Change filename of Molecule";
 
-ChangeMoleculeNameAction::ChangeMoleculeNameAction(MoleculeListClass *_molecules) :
+MoleculeChangeNameAction::MoleculeChangeNameAction(MoleculeListClass *_molecules) :
   Action(NAME),
   molecules(_molecules)
 {}
 
-ChangeMoleculeNameAction::~ChangeMoleculeNameAction()
+MoleculeChangeNameAction::~MoleculeChangeNameAction()
 {}
 
-Action::state_ptr ChangeMoleculeNameAction::performCall() {
+Action::state_ptr MoleculeChangeNameAction::performCall() {
   string filename;
   molecule *mol = NULL;
@@ -48 +55 @@
     mol->setName(filename);
     delete dialog;
-    return Action::state_ptr(new ChangeMoleculeNameState(mol,oldName));
+    return Action::state_ptr(new MoleculeChangeNameState(mol,oldName));
   }
   delete dialog;
@@ -54 +61 @@
 }
 
-Action::state_ptr ChangeMoleculeNameAction::performUndo(Action::state_ptr _state) {
-  ChangeMoleculeNameState *state = assert_cast<ChangeMoleculeNameState*>(_state.get());
+Action::state_ptr MoleculeChangeNameAction::performUndo(Action::state_ptr _state) {
+  MoleculeChangeNameState *state = assert_cast<MoleculeChangeNameState*>(_state.get());
 
   string newName = state->mol->getName();
   state->mol->setName(state->lastName);
 
-  return Action::state_ptr(new ChangeMoleculeNameState(state->mol,newName));
+  return Action::state_ptr(new MoleculeChangeNameState(state->mol,newName));
 }
 
-Action::state_ptr ChangeMoleculeNameAction::performRedo(Action::state_ptr _state){
+Action::state_ptr MoleculeChangeNameAction::performRedo(Action::state_ptr _state){
   // Undo and redo have to do the same for this action
   return performUndo(_state);
 }
 
-bool ChangeMoleculeNameAction::canUndo() {
+bool MoleculeChangeNameAction::canUndo() {
   return true;
 }
 
-bool ChangeMoleculeNameAction::shouldUndo() {
+bool MoleculeChangeNameAction::shouldUndo() {
   return true;
 }
 
-const string ChangeMoleculeNameAction::getName() {
+const string MoleculeChangeNameAction::getName() {
   return NAME;
 }

src/Actions/MoleculeAction/ChangeNameAction.hpp

@@ -1 @@
-// All rather small Actions should go into this file for simplicities sake
+/*
+ * ChangeNameAction.hpp
+ *
+ *  Created on: Jan 15, 2010
+ *      Author: crueger
+ */
 
-#ifndef _SMALL_ACTIONS_HPP
-#define _SMALL_ACTIONS_HPP
+#ifndef CHANGENAMEACTION_HPP
+#define CHANGENAMEACTION_HPP
 
 #include "Actions/Action.hpp"
@@ -9 +14 @@
 class MoleculeListClass;
 
-class ChangeMoleculeNameAction : public Action {
+class MoleculeChangeNameAction : public Action {
 public:
-  ChangeMoleculeNameAction(MoleculeListClass*);
-  virtual ~ChangeMoleculeNameAction();
+  MoleculeChangeNameAction(MoleculeListClass*);
+  virtual ~MoleculeChangeNameAction();
 
   bool canUndo();
@@ -28 +33 @@
 
 
-#endif // _SMALL_ACTIONS_HPP
+#endif // CHANGENAMEACTION_HPP

src/Makefile.am

@@ -50 +50 @@
 
 ACTIONSSOURCE = Actions/Action.cpp \
+  ${ATOMACTIONSOURCE} \
+  ${FRAGMENTATIONACTIONSOURCE} \
+  ${MOLECULEACTIONSOURCE} \
+  ${PARSERACTIONSOURCE} \
+  ${TESSELATIONACTIONSOURCE} \
   Actions/ActionHistory.cpp \
   Actions/ActionRegistry.cpp \
@@ -57 +62 @@
   Actions/ManipulateAtomsProcess.cpp \
   Actions/MethodAction.cpp \
-  Actions/small_actions.cpp \
   Actions/Process.cpp
 
 ACTIONSHEADER = Actions/Action.hpp \
+  ${ATOMACTIONHEADER} \
+  ${FRAGMENTATIONACTIONHEADER} \
+  ${MOLECULEACTIONHEADER} \
+  ${PARSERACTIONHEADER} \
+  ${TESSELATIONACTIONHEADER} \
   Actions/ActionHistory.hpp \
   Actions/ActionRegistry.hpp \
@@ -70 +79 @@
   Actions/ManipulateAtomsProcess.hpp \
   Actions/MethodAction.hpp \
-  Actions/small_actions.hpp \
   Actions/Process.hpp
   
+ATOMACTIONSOURCE =
+#  Actions/AtomAction/SomeAction.cpp               
+ATOMACTIONHEADER =
+#  Actions/AtomAction/SomeAction.hpp
+
+FRAGMENTATIONACTIONSOURCE = 
+#  Actions/FragmentationAction/SomeAction.cpp               
+FRAGMENTATIONACTIONHEADER =
+#  Actions/FragmentationAction/SomeAction.hpp
+
+MOLECULEACTIONSOURCE = \
+  Actions/MoleculeAction/ChangeNameAction.cpp
+MOLECULEACTIONHEADER = \
+  Actions/MoleculeAction/ChangeNameAction.hpp
+                 
+PARSERACTIONSOURCE = \
+  Actions/ParserAction/LoadXyzAction.cpp \
+  Actions/ParserAction/SaveXyzAction.cpp       
+PARSERACTIONHEADER = \
+  Actions/ParserAction/LoadXyzAction.hpp \
+  Actions/ParserAction/SaveXyzAction.hpp
+
+TESSELATIONACTIONSOURCE =
+#  Actions/TesselationAction/SomeAction.cpp               
+TESSELATIONACTIONHEADER =
+#  Actions/TesselationAction/SomeAction.hpp
+
 PARSERSOURCE = \
   Parser/ChangeTracker.cpp \

src/builder.cpp

@@ -77 +77 @@
 #include "Actions/ActionHistory.hpp"
 #include "Actions/MethodAction.hpp"
-#include "Actions/small_actions.hpp"
+#include "Actions/MoleculeAction/ChangeNameAction.hpp"
 #include "World.hpp"
 #include "version.h"
@@ -2521 +2521 @@
   new ActionMenuItem('l',"load molecule from xyz file",editMoleculesMenu,loadMoleculeAction);
 
-  Action *changeFilenameAction = new ChangeMoleculeNameAction(molecules);
+  Action *changeFilenameAction = new MoleculeChangeNameAction(molecules);
   new ActionMenuItem('n',"change molecule's name",editMoleculesMenu,changeFilenameAction);