Changes in src/Actions/FillAction/FillSurfaceAction.cpp [df9f20:26b4d62]

File:

• src/Actions/FillAction/FillSurfaceAction.cpp (modified) (4 diffs)

src/Actions/FillAction/FillSurfaceAction.cpp

@@ -46 +46 @@
 #include "Filling/Mesh/MeshAdaptor.hpp"
 #include "Filling/Predicates/IsVoidNode_FillPredicate.hpp"
-#include "Filling/Preparators/ShapeSurfaceFillerPreparator.hpp"
 #include "molecule.hpp"
 #include "Shapes/BaseShapes.hpp"
 #include "Shapes/ShapeRegistry.hpp"
-#include "Shapes/ShapeType.hpp"
 #include "World.hpp"
 
@@ -83 +81 @@
 
   // center filler's tip at origin
-  filler->CenterEdge();
+  Vector max;
+  filler->CenterEdge(&max);
 
   // determine center with respect to alignment axis
@@ -97 +96 @@
   {
     Vector translater = -1.*sum;
-    filler->Translate(translater);
-  }
-
-  // prepare the filler preparator
-  if (ShapeRegistry::getInstance().countSelectedShapes() != (size_t)1) {
-    STATUS("Not exactly one shape selected.");
-    return Action::failure;
-  }
-  const std::vector<Shape*> shapes = ShapeRegistry::getInstance().getSelectedShapes();
-  const Shape &shape = **shapes.begin();
-
-  // hard check whether shape is of allowed type, not all are implemented
-  // but these only fail with an assertion, hence not with disable-debug
-  switch (shape.getType()) {
-    case NowhereType:
-    case EverywhereType:
-      STATUS("The shape type "+toString(shape.getType())+" is currently not supported.");
-      return Action::failure;
-      break;
-    default:
-      break;
-  }
-
-  ShapeSurfaceFillerPreparator filler_preparator(filler);
-  if (params.SphereRadius.get() != 0.) {
-    if (World::getInstance().beginAtomSelection() == World::getInstance().endAtomSelection()) {
-      STATUS("You have given a sphere radius "+toString(params.SphereRadius.get())
-          +" != 0, but have not select any atoms.");
+    filler->Translate(&translater);
+  }
+
+  // create predicate, mesh, and filler
+  FillSurfaceState *UndoState = NULL;
+  bool successflag = false;
+  {
+    FillPredicate *voidnode_predicate = new FillPredicate(
+        IsVoidNode_FillPredicate(
+            Sphere(zeroVec, params.mindistance.get())
+            )
+        );
+
+
+    std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
+    if (selectedShapes.size() != 1){
+      STATUS("There has to be exactly 1 selected shape.");
       return Action::failure;
     }
-    std::vector<atom*> atoms(World::getInstance().getSelectedAtoms());
-    filler_preparator.addSurfacePredicate(
-        params.SphereRadius.get(),
-        atoms);
-  }
-  filler_preparator.addVoidPredicate(params.mindistance.get());
-  filler_preparator.addSurfaceRandomInserter(
-      shape,
-      params.AlignedAxis.get(),
-      params.RandAtomDisplacement.get(),
-      params.RandMoleculeDisplacement.get());
-  filler_preparator.addShapeMesh(
-      shape,
-      params.N.get());
-  if (!filler_preparator()) {
-    STATUS("Filler was not fully constructed.");
-    return Action::failure;
-  }
-
-  // use filler
-  bool successflag = false;
-  FillSurfaceState *UndoState = NULL;
-  {
+
+    boost::function<const NodeSet ()> func = 
+        boost::bind(&Shape::getHomogeneousPointsOnSurface, boost::ref(*selectedShapes[0]), params.N.get());
+    Mesh *mesh = new MeshAdaptor(func);
+    Inserter *inserter = new Inserter(
+        Inserter::impl_ptr(new SurfaceInserter(*selectedShapes[0], params.AlignedAxis.get())));
+
     // fill
     {
-      Filler *fillerFunction = filler_preparator.obtainFiller();
+      Filler *fillerFunction = new Filler(*mesh, *voidnode_predicate, *inserter);
       ClusterInterface::Cluster_impl cluster( new Cluster( filler->getAtomIds(), filler->getBoundingSphere() ) );
       CopyAtoms_withBonds copyMethod;
@@ -189 +161 @@
       }
     }
+
+    // remove
+    delete mesh;
+    delete inserter;
+    delete voidnode_predicate;
   }