Changes in src/Actions/WorldAction/RepeatBoxAction.cpp [952f38:d74077]

File:

• src/Actions/WorldAction/RepeatBoxAction.cpp (modified) (8 diffs)

src/Actions/WorldAction/RepeatBoxAction.cpp

@@ -11 +11 @@
 #include "Actions/ActionRegistry.hpp"
 #include "atom.hpp"
-#include "Helpers/Log.hpp"
+#include "log.hpp"
 #include "molecule.hpp"
-#include "LinearAlgebra/Vector.hpp"
-#include "LinearAlgebra/Matrix.hpp"
-#include "Helpers/Verbose.hpp"
+#include "vector.hpp"
+#include "Matrix.hpp"
+#include "verbose.hpp"
 #include "World.hpp"
 #include "Box.hpp"
@@ -21 +21 @@
 #include <iostream>
 #include <string>
+#include <vector>
 
 using namespace std;
@@ -26 +27 @@
 #include "UIElements/UIFactory.hpp"
 #include "UIElements/Dialog.hpp"
-#include "Actions/ValueStorage.hpp"
+#include "UIElements/ValueStorage.hpp"
 #include "Descriptors/MoleculeDescriptor.hpp"
 #include "Descriptors/MoleculePtrDescriptor.hpp"
@@ -44 +45 @@
 };
 
-Dialog * WorldRepeatBoxAction::fillDialog(Dialog *dialog) {
-  ASSERT(dialog,"No Dialog given when filling action dialog");
+Dialog * WorldRepeatBoxAction::createDialog() {
+  Dialog *dialog = UIFactory::getInstance().makeDialog();
 
   dialog->queryVector(NAME, false, ValueStorage::getInstance().getDescription(NAME));
@@ -90 +91 @@
 
   molecule *newmol = NULL;
-  Vector ** vectors = NULL;
+  std::vector<Vector> vectors;
   for (n[0] = 0; n[0] < Repeater[0]; n[0]++) {
     y[0] = n[0];
@@ -105 +106 @@
           if (count != 0) {  // if there is more than none
             Elements = new const element *[count];
-            vectors = new Vector *[count];
+            vectors.resize(count);
             j = 0;
             for(molecule::iterator AtomRunner = mol->begin(); AtomRunner != mol->end(); ++AtomRunner) {
-              Elements[j] = (*AtomRunner)->type;
-              vectors[j] = &(*AtomRunner)->x;
+              Elements[j] = (*AtomRunner)->getType();
+              vectors[j] = (*AtomRunner)->getPosition();
               j++;
             }
@@ -120 +121 @@
             for (int k=count;k--;) { // go through every atom of the original cell
               Walker = World::getInstance().createAtom(); // create a new body
-              Walker->x = (*vectors[k]) + x;
-              Walker->type = Elements[k];  // insert original element
+              Walker->setPosition((vectors[k]) + x);
+              Walker->setType(Elements[k]);  // insert original element
               cout << "new atom is " << *Walker << endl;
               newmol->AddAtom(Walker);        // and add to the molecule (which increments ElementsInMolecule, AtomCount, ...)
@@ -127 +128 @@
             // free memory
             delete[](Elements);
-            delete[](vectors);
           } else {
             DoLog(1) && (Log() << Verbose(1) << "\t ... is empty." << endl);