Changeset 1f137d for molecuilder/src

Timestamp:

Jan 2, 2010, 3:18:00 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

c7dcff

Parents:

077f6e

Message:

Transitioned EditMoleculesMenu to new menu structure

Location:

molecuilder/src

Files:

• Menu/TextMenu.cpp (modified) (1 diff)
• menu.cpp (modified) (3 diffs)

molecuilder/src/Menu/TextMenu.cpp

@@ -57 +57 @@
   char choice;
   bool somethingChosen = false;
+  quit = false;
   do {
     int pre = floor((length - title.length()) /2.0);

molecuilder/src/menu.cpp

@@ -993 +993 @@
 void oldmenu::EditMolecules(periodentafel *periode, MoleculeListClass *molecules)
 {
+  TextMenu *edit_molecules_menu = new TextMenu(Log() << Verbose(0), "Edit Molecules");
+
+  Action *createMoleculeAction = new MethodAction(boost::bind(&oldmenu::createNewMolecule,this,periode,molecules));
+  new ActionMenuItem('c',"create new molecule",edit_molecules_menu,createMoleculeAction);
+
+  Action *loadMoleculeAction = new MethodAction(boost::bind(&oldmenu::loadFromXYZ,this,periode,molecules));
+  new ActionMenuItem('l',"load molecule from xyz file",edit_molecules_menu,loadMoleculeAction);
+
+  Action *changeFilenameAction = new MethodAction(boost::bind(&oldmenu::changeName,this,molecules));
+  new ActionMenuItem('n',"change molecule's name",edit_molecules_menu,changeFilenameAction);
+
+  Action *giveFilenameAction = new MethodAction(boost::bind(&oldmenu::setMoleculeFilename,this,molecules));
+  new ActionMenuItem('N',"give molecules filename",edit_molecules_menu,giveFilenameAction);
+
+  Action *parseAtomsAction = new MethodAction(boost::bind(&oldmenu::parseXYZIntoMolecule,this,molecules));
+  new ActionMenuItem('p',"parse atoms in xyz file into molecule",edit_molecules_menu,parseAtomsAction);
+
+  Action *eraseMoleculeAction = new MethodAction(boost::bind(&oldmenu::eraseMolecule,this,molecules));
+  new ActionMenuItem('r',"remove a molecule",edit_molecules_menu,eraseMoleculeAction);
+
+  Action *returnAction = new MethodAction(boost::bind(&TextMenu::doQuit,edit_molecules_menu));
+  MenuItem *returnItem = new ActionMenuItem('q',"return to Main menu",edit_molecules_menu,returnAction);
+
+  edit_molecules_menu->addDefault(returnItem);
+
+
+  edit_molecules_menu->display();
+
+  delete edit_molecules_menu;
+  delete createMoleculeAction;
+  delete loadMoleculeAction;
+  delete changeFilenameAction;
+  delete giveFilenameAction;
+  delete parseAtomsAction;
+  delete eraseMoleculeAction;
+  delete returnAction;
+
+#if 0
   char choice;  // menu choice char
 
@@ -1035 +1073 @@
       break;
   }
+#endif
 };
 
@@ -1250 +1289 @@
 void oldmenu::perform(MoleculeListClass *molecules, config *configuration, periodentafel *periode, char *ConfigFileName)
 {
+
+  // build the main menu
   TextMenu *main_menu = new TextMenu(Log() << Verbose(0), "Main Menu");