Changes in src/Legacy/oldmenu.cpp [97ebf8:273382]

File:

• src/Legacy/oldmenu.cpp (modified) (12 diffs)

src/Legacy/oldmenu.cpp

@@ -35 +35 @@
 #include "Menu/DisplayMenuItem.hpp"
 #include "Menu/SubMenuItem.hpp"
-#include "Actions/MapOfActions.hpp"
 #include "Actions/MethodAction.hpp"
 #include "Actions/ErrorAction.hpp"
@@ -62 +61 @@
   char choice;  // menu choice char
   bool valid;
-  bool aborted;
 
   Log() << Verbose(0) << "===========ADD ATOM============================" << endl;
@@ -82 +80 @@
       case 'a': // absolute coordinates of atom
       {
+        first = World::getInstance().createAtom();
         Dialog *dialog = UIFactory::getInstance().makeDialog();
-        first = World::getInstance().createAtom();
-        dialog->queryVector("Please enter coordinates: ",&first->x,World::getInstance().getDomain(), false);
-        dialog->queryElement("Please choose element: ",&first->type);
+        dialog->queryVector("Enter absolute coordinates.",&first->x,mol->cell_size, false);
+        dialog->queryElement("Choose element for this atom",&first->type);
         if(dialog->display()){
           mol->AddAtom(first);  // add to molecule
         }
         else{
+          // dialog was canceled... destroy the atom that was used
           World::getInstance().destroyAtom(first);
         }
+        delete dialog;
       }
       break;
@@ -98 +98 @@
         first = World::getInstance().createAtom();
         valid = true;
-        aborted = false;
         do {
+          Dialog *dialog = UIFactory::getInstance().makeDialog();
           if (!valid) eLog() << Verbose(2) << "Resulting position out of cell." << endl;
-          auto_ptr<Dialog> dialog(UIFactory::getInstance().makeDialog());
-          dialog->queryVector("Enter reference coordinates.",&x,World::getInstance().getDomain(), true);
-          dialog->queryVector("Enter relative coordinates.",&first->x,World::getInstance().getDomain(), false);
-          if((aborted = !dialog->display())){
-            continue;
-          }
+          dialog->queryVector("Enter reference coordinates.",&x,mol->cell_size,true);
+          dialog->queryVector("Enter relative coordinates.",&first->x,mol->cell_size,false);
           first->x += x;
-        } while (!aborted && !(valid = mol->CheckBounds((const Vector *)&first->x)));
-        if(!aborted){
-          first->type = periode->AskElement();  // give type
-          mol->AddAtom(first);  // add to molecule
-        }
-        else{
-          World::getInstance().destroyAtom(first);
-        }
+          dialog->display();
+          delete dialog;
+        } while (!(valid = mol->CheckBounds(&first->x)));
+        first->type = periode->AskElement();  // give type
+        mol->AddAtom(first);  // add to molecule
         break;
 
@@ -124 +117 @@
         do {
           if (!valid) eLog() << Verbose(2) << "Resulting position out of cell." << endl;
-          auto_ptr<Dialog> dialog(UIFactory::getInstance().makeDialog());
           second = mol->AskAtom("Enter atom number: ");
-          dialog->queryVector("Enter relative coordinates.",&first->x,World::getInstance().getDomain(), false);
+          Dialog *dialog = UIFactory::getInstance().makeDialog();
+          dialog->queryVector("Enter relative coordinates.",&first->x,mol->cell_size,false);
           dialog->display();
           for (int i=NDIM;i--;) {
@@ -333 +326 @@
     {
       Dialog *dialog = UIFactory::getInstance().makeDialog();
-      dialog->queryVector("Enter normal vector of mirror plane.",&n,World::getInstance().getDomain(),false);
+      dialog->queryVector("Enter normal vector of mirror plane.",&n,mol->cell_size,false);
       dialog->display();
       delete dialog;
@@ -400 +393 @@
     {
       Dialog *dialog = UIFactory::getInstance().makeDialog();
-      dialog->queryVector("Enter normal vector of mirror plane.",&n,World::getInstance().getDomain(),false);
+      dialog->queryVector("Enter normal vector of mirror plane.",&n,mol->cell_size,false);
       dialog->display();
       delete dialog;
@@ -773 +766 @@
       x.Zero();
       y.Zero();
-      y[abs(axis)-1] = World::getInstance().getDomain()[(abs(axis) == 2) ? 2 : ((abs(axis) == 3) ? 5 : 0)] * abs(axis)/axis; // last term is for sign, first is for magnitude
+      y[abs(axis)-1] = mol->cell_size[(abs(axis) == 2) ? 2 : ((abs(axis) == 3) ? 5 : 0)] * abs(axis)/axis; // last term is for sign, first is for magnitude
       for (int i=1;i<faktor;i++) {  // then add this list with respective translation factor times
         x += y; // per factor one cell width further
@@ -794 +787 @@
         mol->Translate(&x);
       }
-      World::getInstance().getDomain()[(abs(axis) == 2) ? 2 : ((abs(axis) == 3) ? 5 : 0)] *= faktor;
+      mol->cell_size[(abs(axis) == 2) ? 2 : ((abs(axis) == 3) ? 5 : 0)] *= faktor;
     }
   }
@@ -887 +880 @@
         Log() << Verbose(0) << "Current molecule is: " << mol->IndexNr << "\t" << mol->name << endl;
         Dialog *dialog = UIFactory::getInstance().makeDialog();
-        dialog->queryVector("Enter translation vector.",&x,World::getInstance().getDomain(),false);
-        if(dialog->display()){
-          mol->Center += x;
-        }
+        dialog->queryVector("Enter translation vector.",&x,mol->cell_size,false);
+        dialog->display();
         delete dialog;
+        mol->Center += x;
      }
      break;
@@ -909 +901 @@
   molecule *srcmol = NULL, *destmol = NULL;
   Dialog *dialog = UIFactory::getInstance().makeDialog();
-  dialog->queryMolecule("molecule-by-id",&destmol, MapOfActions::getInstance().getDescription("molecule-by-id"));
-  dialog->queryMolecule("molecule-by-id",&srcmol, MapOfActions::getInstance().getDescription("molecule-by-id"));
+  dialog->queryMolecule("Enter index of destination molecule: ",&destmol, molecules);
+  dialog->queryMolecule("Enter index of source molecule to add from: ",&srcmol, molecules);
   if(dialog->display()) {
     molecules->SimpleAdd(srcmol, destmol);
@@ -923 +915 @@
   molecule *srcmol = NULL, *destmol = NULL;
   Dialog *dialog = UIFactory::getInstance().makeDialog();
-  dialog->queryMolecule("molecule-by-id",&destmol, MapOfActions::getInstance().getDescription("molecule-by-id"));
-  dialog->queryMolecule("molecule-by-id",&srcmol, MapOfActions::getInstance().getDescription("molecule-by-id"));
+  dialog->queryMolecule("Enter index of matrix molecule (the variable one): ",&srcmol,molecules);
+  dialog->queryMolecule("Enter index of molecule to merge into (the fixed one): ",&destmol,molecules);
   if(dialog->display()) {
     molecules->EmbedMerge(destmol, srcmol);