Changeset 795b4d for molecuilder/src

Timestamp:

Feb 2, 2010, 12:14:54 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

adcdf8

Parents:

6997fa

git-author:

Tillmann Crueger <crueger@…> (01/15/10 15:53:29)

git-committer:

Tillmann Crueger <crueger@…> (02/02/10 12:14:54)

Message:

Moved method to rename molecules to a seperate Action

Location:

molecuilder/src

Files:

• Actions/Action.hpp (modified) (1 diff)
• Actions/small_actions.cpp (added)
• Actions/small_actions.hpp (added)
• Makefile.am (modified) (1 diff)
• builder.cpp (modified) (3 diffs)
• molecule.hpp (modified) (1 diff)
• moleculelist.cpp (modified) (1 diff)

molecuilder/src/Actions/Action.hpp

@@ -29 +29 @@
   virtual void undo()=0;
   virtual bool canUndo()=0;
+  //virtual bool shouldUndo()=0;
 
   virtual const std::string getName();

molecuilder/src/Makefile.am

@@ -8 +8 @@
 ANALYSISHEADER = analysis_bonds.hpp analysis_correlation.hpp
 
-ACTIONSSOURCE = Actions/Action.cpp Actions/MethodAction.cpp Actions/ActionSequence.cpp Actions/MakroAction.cpp Actions/ErrorAction.cpp Actions/ActionRegistry.cpp
-ACTIONSHEADER = Actions/Action.hpp Actions/MethodAction.hpp Actions/ActionSequence.hpp Actions/MakroAction.hpp Actions/ErrorAction.hpp Actions/ActionRegistry.hpp
+ACTIONSSOURCE = Actions/Action.cpp Actions/MethodAction.cpp Actions/ActionSequence.cpp Actions/MakroAction.cpp Actions/ErrorAction.cpp Actions/small_actions.cpp Actions/ActionRegistry.cpp 
+ACTIONSHEADER = Actions/Action.hpp Actions/MethodAction.hpp Actions/ActionSequence.hpp Actions/MakroAction.hpp Actions/ErrorAction.hpp Actions/small_actions.hpp Actions/ActionRegistry.hpp
 
 PATTERNSOURCE = Patterns/Observer.cpp

molecuilder/src/builder.cpp

@@ -75 +75 @@
 #include "Actions/ActionRegistry.hpp"
 #include "Actions/MethodAction.hpp"
+#include "Actions/small_actions.hpp"
 #include "version.h"
 
@@ -266 +267 @@
         if (i >= 2) {
           first->x.LSQdistance((const Vector **)atoms, i);
-
           first->x.Output();
           first->type = periode->AskElement();  // give type
@@ -2117 +2117 @@
   new ActionMenuItem('l',"load molecule from xyz file",editMoleculesMenu,loadMoleculeAction);
 
-  Action *changeFilenameAction = new MethodAction("changeFilenameAction",boost::bind(&MoleculeListClass::changeName,molecules));
+  Action *changeFilenameAction = new ChangeMoleculeNameAction(molecules);
   new ActionMenuItem('n',"change molecule's name",editMoleculesMenu,changeFilenameAction);
 

molecuilder/src/molecule.hpp

@@ -335 +335 @@
   void createNewMolecule(periodentafel *periode);
   void loadFromXYZ(periodentafel *periode);
-  void changeName();
   void setMoleculeFilename();
   void parseXYZIntoMolecule();

molecuilder/src/moleculelist.cpp

@@ -918 +918 @@
 }
 
-void MoleculeListClass::changeName(){
-  char filename[MAXSTRINGSIZE];
-  molecule *mol = NULL;
-  int nr;
-  do {
-    Log() << Verbose(0) << "Enter index of molecule: ";
-    cin >> nr;
-    mol = ReturnIndex(nr);
-  } while (mol == NULL);
-  Log() << Verbose(0) << "Enter name: ";
-  cin >> filename;
-  strcpy(mol->name, filename);
-}
-
 void MoleculeListClass::setMoleculeFilename() {
   char filename[MAXSTRINGSIZE];