ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libBASS/BASS_interface.cpp
(Generate patch)

Comparing trunk/OOPSE/libBASS/BASS_interface.cpp (file contents):
Revision 981 by gezelter, Mon Jan 26 18:52:42 2004 UTC vs.
Revision 988 by gezelter, Tue Jan 27 19:37:48 2004 UTC

# Line 16 | Line 16 | typedef enum { GLOBAL_BLK, MOLECULE_BLK, ATOM_BLK, BON
16  
17   typedef enum { GLOBAL_BLK, MOLECULE_BLK, ATOM_BLK, BOND_BLK, BEND_BLK,
18                 TORSION_BLK, COMPONENT_BLK, ZCONSTRAINT_BLK,
19 <               RIGIDBODY_BLK } block_type;
19 >               RIGIDBODY_BLK, MEMBER_BLK } block_type;
20  
21   block_type current_block = GLOBAL_BLK;
22   #define MAX_NEST 20 // the max number of nested blocks
# Line 56 | Line 56 | int event_handler( event* the_event ){
56        incr_block( ZCONSTRAINT_BLK );
57        handled = the_globals->newZconstraint( the_event );
58        break;
59 –
60 –    case RIGIDBODY:
61 –      incr_block( RIGIDBODY_BLK );
62 –      handled = the_stamps->newRigidBody( the_event );
63 –      break;
59        
60      case COMPONENT:
61        incr_block( COMPONENT_BLK );
# Line 88 | Line 83 | int event_handler( event* the_event ){
83        
84      case ATOM:
85        incr_block( ATOM_BLK );
86 <      handled = the_stamps->newAtomInMolecule( the_event );
86 >      handled = the_stamps->newAtom( the_event );
87        break;
88        
89      case BOND:
# Line 132 | Line 127 | int event_handler( event* the_event ){
127      
128      switch( the_event->event_type ){
129        
135 –    case ATOM:
136 –      incr_block( ATOM_BLK );
137 –      handled = the_stamps->newAtomInRigidBody( the_event );
138 –      break;
139 –      
140 –    case POSITION:
141 –      handled = the_stamps->rigidBodyPosition( the_event );
142 –      break;
143 –      
144 –    case ORIENTATION:
145 –      handled = the_stamps->rigidBodyOrientation( the_event );
146 –      break;
147 –
130      case ASSIGNMENT:
131        handled = the_stamps->rigidBodyAssign( the_event );
132        break;
133  
134 +    case MEMBER:
135 +      incr_block( MEMBER_BLK );
136 +      handled = the_stamps->rigidBodyMember( the_event );
137 +      break;
138 +      
139      case BLOCK_END:
140        decr_block();
141        handled = the_stamps->rigidBodyEnd( the_event );
142        break;
143 <
143 >      
144      default:
145        the_event->err_msg =
146          strdup( "Not a valid RigidBody event\n" );
147        return 0;
148      }
149      break;
150 +    
151  
164 –
152    case ATOM_BLK:
153      
154      switch( the_event->event_type ){
# Line 198 | Line 185 | int event_handler( event* the_event ){
185        handled = the_stamps->bondAssign( the_event );
186        break;
187        
188 <    case MEMBER:
189 <      handled = the_stamps->bondMember( the_event );
188 >    case MEMBERS:
189 >      handled = the_stamps->bondMembers( the_event );
190        break;
191        
192      case CONSTRAINT:
# Line 226 | Line 213 | int event_handler( event* the_event ){
213        handled = the_stamps->bendAssign( the_event );
214        break;
215        
216 <    case MEMBER:
217 <      handled = the_stamps->bendMember( the_event );
216 >    case MEMBERS:
217 >      handled = the_stamps->bendMembers( the_event );
218        break;
219        
220      case CONSTRAINT:
# Line 254 | Line 241 | int event_handler( event* the_event ){
241        handled = the_stamps->torsionAssign( the_event );
242        break;
243        
244 <    case MEMBER:
245 <      handled = the_stamps->torsionMember( the_event );
244 >    case MEMBERS:
245 >      handled = the_stamps->torsionMembers( the_event );
246        break;
247        
248      case CONSTRAINT:
# Line 274 | Line 261 | int event_handler( event* the_event ){
261      }
262      break;
263  
264 +  case MEMBER_BLK:
265 +    
266 +    switch( the_event->event_type ){
267 +      
268 +    case ASSIGNMENT:
269 +      handled = the_stamps->memberAssign( the_event );
270 +      break;
271 +            
272 +    case BLOCK_END:
273 +      decr_block();
274 +      handled = the_stamps->memberEnd(the_event );
275 +      break;
276 +
277 +    default:
278 +      the_event->err_msg =
279 +        strdup( "not a valid member event\n" );
280 +      return 0;
281 +    }
282 +    break;
283 +
284    case ZCONSTRAINT_BLK:
285  
286      switch( the_event->event_type ){

Diff Legend

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