--- trunk/src/applications/staticProps/NanoVolume.cpp	2008/09/14 01:32:26	1293
+++ trunk/src/applications/staticProps/NanoVolume.cpp	2009/10/22 14:22:55	1382
@@ -40,18 +40,14 @@
  *
  *  NanoVolume.cpp
  *
- *  Purpose: To calculate convexhull, hull volume and radius
- *  using the CGAL library.
- *
  *  Created by Charles F. Vardeman II on 14 Dec 2006.
  *  @author  Charles F. Vardeman II
- *  @version $Id: NanoVolume.cpp,v 1.7 2008-09-14 01:32:23 chuckv Exp $
+ *  @version $Id: NanoVolume.cpp,v 1.9 2009-10-22 14:19:26 gezelter Exp $
  *
  */
 
 #include "applications/staticProps/NanoVolume.hpp"
 #include "math/ConvexHull.hpp"
-//#include "math/AlphaShape.hpp"
 #include "utils/simError.h"
 #include "io/DumpReader.hpp"
 #include "primitives/Molecule.hpp"
@@ -74,7 +70,7 @@ void NanoVolume::process() {
 }
 
 void NanoVolume::process() {
-#if defined(HAVE_CGAL) || defined(HAVE_QHULL)
+#if defined(HAVE_QHULL)
   Molecule* mol;
   Atom* atom;
   RigidBody* rb;
@@ -89,10 +85,6 @@ void NanoVolume::process() {
 #ifdef HAVE_QHULL
   ConvexHull* thishull = new ConvexHull();
 #endif
-#ifdef HAVE_CGAL
-  //  AlphaShape* hull = new AlphaShape();
-  ConvexHull* thishull = new ConvexHull();
-#endif
 
   DumpReader reader(info_, dumpFilename_);
   int nFrames = reader.getNFrames();
@@ -123,15 +115,16 @@ void NanoVolume::process() {
     }
     
     // outer loop is over the selected StuntDoubles:
-    /*
+    
     for (sd = seleMan_.beginSelected(i); sd != NULL;
 	    sd = seleMan_.nextSelected(i)) {
       
-      pos_.push_back(sd->getPos());
+     theAtoms_.push_back(sd);
       myIndex = sd->getGlobalIndex();
       
     }
-    */
+    
+    /*
     for (mol = info_->beginMolecule(mi); mol != NULL; 
                  mol = info_->nextMolecule(mi)) {
               for (atom = mol->beginAtom(ai); atom != NULL; 
@@ -139,7 +132,7 @@ void NanoVolume::process() {
                      theAtoms_.push_back(atom);
               }
             }
-    
+    */
     // Generate convex hull for this frame.
     thishull->computeHull(theAtoms_);
   //  totalVolume_ += hull->getVolume();		
@@ -157,7 +150,7 @@ void NanoVolume::process() {
   osq.close();
 */
 #else
-  sprintf(painCave.errMsg, "NanoVolume: Neither CGAL nor qhull support was compiled in!\n");
+  sprintf(painCave.errMsg, "NanoVolume: qhull support was not compiled in!\n");
   painCave.isFatal = 1;
   simError();