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