ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/src/applications/dump2Xyz/Dump2XYZ.cpp
(Generate patch)

Comparing trunk/OOPSE-3.0/src/applications/dump2Xyz/Dump2XYZ.cpp (file contents):
Revision 1957 by tim, Tue Jan 25 17:45:23 2005 UTC vs.
Revision 1978 by tim, Fri Feb 4 22:46:10 2005 UTC

# Line 54 | Line 54 | using namespace oopse;
54   #include "visitors/RigidBodyVisitor.hpp"
55   #include "visitors/OtherVisitor.hpp"
56   #include "visitors/ZconsVisitor.hpp"
57 + #include "selection/SelectionEvaluator.hpp"
58   using namespace oopse;
59  
60   int main(int argc, char* argv[]){
# Line 101 | Line 102 | int main(int argc, char* argv[]){
102    //creat ignore visitor
103    if(args_info.ignore_given ||args_info.water_flag){
104      
105 <    IgnoreVisitor* ignoreVisitor = new IgnoreVisitor();
105 >    IgnoreVisitor* ignoreVisitor = new IgnoreVisitor(info);
106      
107      for(int i = 0; i < args_info.ignore_given; i++)
108        ignoreVisitor->addIgnoreType(args_info.ignore_arg[i]);
# Line 128 | Line 129 | int main(int argc, char* argv[]){
129      compositeVisitor->addVisitor(rbCOMVisitor, 900);
130    }
131    
132 <  //compositeVisitor->addVisitor(lipidVisitor, 900);
132 >  //create selection visitor
133 >  //if (args_info.selection_given){
134 >  //  SelectionVisitor* selectionVisitor = new SelectionVisitor(info, args_info.selection_arg);
135 >  //  compositeVisitor->addVisitor(selectionVisitor, 850);
136 >  //}
137 >
138 >  SelectionEvaluator* evaluator = NULL;
139 >  if (args_info.selection_given) {
140 >    evaluator = new SelectionEvaluator(info);
141 >    assert(evaluator);
142 >    evaluator->loadScriptString( args_info.selection_arg);
143 >          
144 >  }
145    
146    //creat SSD atom visitor
147    SSDAtomVisitor* ssdVisitor = new SSDAtomVisitor(info);
# Line 197 | Line 210 | int main(int argc, char* argv[]){
210    Molecule* mol;
211    StuntDouble* integrableObject;
212    RigidBody* rb;
213 +
214 +  if (evaluator && !evaluator->isDynamic()) {
215 +    info->getSelectionManager()->setSelectionSet(evaluator->evaluate());
216 +  }
217    
218    for (int i = 0; i < nframes; i += args_info.frame_arg){
219      dumpReader->readFrame(i);
# Line 220 | Line 237 | int main(int argc, char* argv[]){
237      
238      //update visitor
239      compositeVisitor->update();
240 +
241 +    //if dynamic, we need to re-evaluate the selection
242 +    if (evaluator && evaluator->isDynamic()) {
243 +      info->getSelectionManager()->setSelectionSet(evaluator->evaluate());
244 +    }
245      
246      //visit stuntdouble
247      for (mol = info->beginMolecule(miter); mol != NULL; mol = info->nextMolecule(miter)) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines