Changeset fab853

Timestamp:

Dec 29, 2009, 11:57:09 AM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

aa117c

Parents:

8d24e2

Message:

Moved flipChosen method from oldmenu to MoleculeListClass

Location:

molecuilder/src

Files:

• menu.cpp (modified) (2 diffs)
• menu.hpp (modified) (1 diff)
• molecule.hpp (modified) (1 diff)
• moleculelist.cpp (modified) (1 diff)

molecuilder/src/menu.cpp

@@ -1224 +1224 @@
 }
 
-void oldmenu::flipChosen(MoleculeListClass *molecules) {
-  int j;
-  Log() << Verbose(0) << "Enter index of molecule: ";
-  cin >> j;
-  for(MoleculeList::iterator ListRunner = molecules->ListOfMolecules.begin(); ListRunner != molecules->ListOfMolecules.end(); ListRunner++)
-    if ((*ListRunner)->IndexNr == j)
-      (*ListRunner)->ActiveFlag = !(*ListRunner)->ActiveFlag;
-}
-
 void oldmenu::perform(MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName)
 {
@@ -1242 +1233 @@
   new SeperatorItem(main_menu);
 
-  Action *setMoleculeAction = new MethodAction(boost::bind(&oldmenu::flipChosen,this,molecules));
+  Action *setMoleculeAction = new MethodAction(boost::bind(&MoleculeListClass::flipChosen,molecules));
   new ActionMenuItem('a',"set molecule (in)active",main_menu,setMoleculeAction);
 

molecuilder/src/menu.hpp

@@ -32 +32 @@
   void EditMolecules(periodentafel *, MoleculeListClass *);
   void FragmentAtoms(molecule *, config *);
-  void flipChosen(MoleculeListClass*);
   void ManipulateAtoms(periodentafel *, MoleculeListClass *, config *);
   void MeasureAtoms(periodentafel *, molecule *, config *);

molecuilder/src/molecule.hpp

@@ -327 +327 @@
   int CountAllAtoms() const;
 
+  void flipChosen();
+
   // merging of molecules
   bool SimpleMerge(molecule *mol, molecule *srcmol);

molecuilder/src/moleculelist.cpp

@@ -839 +839 @@
 
 
+void MoleculeListClass::flipChosen() {
+  int j;
+  Log() << Verbose(0) << "Enter index of molecule: ";
+  cin >> j;
+  for(MoleculeList::iterator ListRunner = ListOfMolecules.begin(); ListRunner != ListOfMolecules.end(); ListRunner++)
+    if ((*ListRunner)->IndexNr == j)
+      (*ListRunner)->ActiveFlag = !(*ListRunner)->ActiveFlag;
+}
+
+
 /******************************************* Class MoleculeLeafClass ************************************************/