# | Line 45 | Line 45 | |
---|---|---|
45 | * | |
46 | * Created by Charles F. Vardeman II on 14 Dec 2006. | |
47 | * @author Charles F. Vardeman II | |
48 | < | * @version $Id: NanoVolume.cpp,v 1.3 2007-12-06 19:52:11 chuckv Exp $ |
48 | > | * @version $Id: NanoVolume.cpp,v 1.5 2007-12-06 20:40:30 chuckv Exp $ |
49 | * | |
50 | */ | |
51 | ||
# | Line 73 | Line 73 | void NanoVolume::process() { | |
73 | } | |
74 | ||
75 | void NanoVolume::process() { | |
76 | < | |
76 | > | #if defined(HAVE_CGAL) || defined(HAVE_QHULL) |
77 | Molecule* mol; | |
78 | Atom* atom; | |
79 | RigidBody* rb; | |
# | Line 85 | Line 85 | void NanoVolume::process() { | |
85 | Vector3d vec; | |
86 | int i,j; | |
87 | ||
88 | + | #ifdef HAVE_QHULL |
89 | ConvexHull* hull = new ConvexHull(); | |
90 | + | #endif |
91 | + | #ifdef HAVE_CGAL |
92 | + | AlphaShape* hull = new AlphaShape(); |
93 | + | #endif |
94 | ||
95 | DumpReader reader(info_, dumpFilename_); | |
96 | int nFrames = reader.getNFrames(); | |
# | Line 139 | Line 144 | void NanoVolume::process() { | |
144 | ||
145 | } | |
146 | osq.close(); | |
147 | < | |
147 | > | #else |
148 | > | sprintf(painCave.errMsg, "NanoVolume: Neither CGAL nor qhull support was compiled in!\n"); |
149 | > | painCave.isFatal = 1; |
150 | > | simError(); |
151 | > | #endif |
152 | } |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |