Changes in src/builder.cpp [326a43b:46d958]

File:

• src/builder.cpp (modified) (6 diffs)

src/builder.cpp

@@ -451 +451 @@
   mol->Mirror((const Vector *)&n);
 };
->>>>>>> MenuRefactoring:molecuilder/src/builder.cpp
 
 /** Submenu for removing the atoms from the molecule.
@@ -1482 +1481 @@
                 SaveFlag = true;
                 Log() << Verbose(1) << "Adding new atom with element " << argv[argptr] << " at (" << argv[argptr+1] << "," << argv[argptr+2] << "," << argv[argptr+3] << "), ";
-                first = new atom;
+                first = World::get()->createAtom();
                 first->type = periode->FindElement(atoi(argv[argptr]));
                 if (first->type != NULL)
@@ -1642 +1641 @@
 //                first->x.Zero();
 //                filler->AddAtom(first);
-                first = new atom();
+                first = World::get()->createAtom();
                 first->type = periode->FindElement(1);
                 first->x.Init(0.441, -0.143, 0.);
                 filler->AddAtom(first);
-                second = new atom();
+                second = World::get()->createAtom();
                 second->type = periode->FindElement(1);
                 second->x.Init(-0.464, 1.137, 0.0);
                 filler->AddAtom(second);
-                third = new atom();
+                third = World::get()->createAtom();
                 third->type = periode->FindElement(8);
                 third->x.Init(-0.464, 0.177, 0.);
@@ -2098 +2097 @@
                       x.AddVector(&y); // per factor one cell width further
                       for (int k=count;k--;) { // go through every atom of the original cell
-                        first = new atom(); // create a new body
+                        first = World::get()->createAtom(); // create a new body
                         first->x.CopyVector(vectors[k]);  // use coordinate of original atom
                         first->x.AddVector(&x);      // translate the coordinates
@@ -2161 +2160 @@
   Action *eraseMoleculeAction = new MethodAction("eraseMoleculeAction",boost::bind(&MoleculeListClass::eraseMolecule,molecules));
   new ActionMenuItem('r',"remove a molecule",editMoleculesMenu,eraseMoleculeAction);
-
 }
 
@@ -2223 +2221 @@
       populaters.MakeEditMoleculesMenu = populateEditMoleculesMenu;
 
-#ifdef USE_GUI_QT
-      UIFactory::makeUserInterface(UIFactory::QT4);
-#else
       UIFactory::makeUserInterface(UIFactory::Text);
-#endif
       MainWindow *mainWindow = UIFactory::get()->makeMainWindow(populaters,World::get()->getMolecules(), configuration, World::get()->getPeriode(), ConfigFileName);
       mainWindow->display();
-
       delete mainWindow;
     }