Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/World.cpp

    rebc499 r69643a  
    414414
    415415void World::clearAtomSelection(){
     416  OBSERVE;
     417  NOTIFY(SelectionChanged);
    416418  selectedAtoms.clear();
    417419}
    … …  
    433435
    434436void World::selectAtom(const atom *_atom){
     437  OBSERVE;
     438  NOTIFY(SelectionChanged);
    435439  // atom * is unchanged in this function, but we do store entity as changeable
    436440  ASSERT(_atom,"Invalid pointer in selection of atom");
    … …  
    439443
    440444void World::selectAtom(const atomId_t id){
     445  OBSERVE;
     446  NOTIFY(SelectionChanged);
    441447  ASSERT(atoms.count(id),"Atom Id selected that was not in the world");
    442448  selectedAtoms[id]=atoms[id];
    … …  
    444450
    445451void World::selectAllAtoms(AtomDescriptor descr){
     452  OBSERVE;
     453  NOTIFY(SelectionChanged);
    446454  internal_AtomIterator begin = getAtomIter_internal(descr);
    447455  internal_AtomIterator end = atomEnd_internal();
    … …  
    451459
    452460void World::selectAtomsOfMolecule(const molecule *_mol){
     461  OBSERVE;
     462  NOTIFY(SelectionChanged);
    453463  ASSERT(_mol,"Invalid pointer to molecule in selection of Atoms of Molecule");
    454464  // need to make it const to get the fast iterators
    … …  
    459469
    460470void World::selectAtomsOfMolecule(const moleculeId_t id){
     471  OBSERVE;
     472  NOTIFY(SelectionChanged);
    461473  ASSERT(molecules.count(id),"No molecule with the given id upon Selection of atoms from molecule");
    462474  selectAtomsOfMolecule(molecules[id]);
    … …  
    464476
    465477void World::unselectAtom(const atom *_atom){
     478  OBSERVE;
     479  NOTIFY(SelectionChanged);
    466480  ASSERT(_atom,"Invalid pointer in unselection of atom");
    467481  unselectAtom(_atom->getId());
    … …  
    469483
    470484void World::unselectAtom(const atomId_t id){
     485  OBSERVE;
     486  NOTIFY(SelectionChanged);
    471487  ASSERT(atoms.count(id),"Atom Id unselected that was not in the world");
    472488  selectedAtoms.erase(id);
    … …  
    474490
    475491void World::unselectAllAtoms(AtomDescriptor descr){
     492  OBSERVE;
     493  NOTIFY(SelectionChanged);
    476494  internal_AtomIterator begin = getAtomIter_internal(descr);
    477495  internal_AtomIterator end = atomEnd_internal();
    … …  
    481499
    482500void World::unselectAtomsOfMolecule(const molecule *_mol){
     501  OBSERVE;
     502  NOTIFY(SelectionChanged);
    483503  ASSERT(_mol,"Invalid pointer to molecule in selection of Atoms of Molecule");
    484504  // need to make it const to get the fast iterators
    … …  
    489509
    490510void World::unselectAtomsOfMolecule(const moleculeId_t id){
     511  OBSERVE;
     512  NOTIFY(SelectionChanged);
    491513  ASSERT(molecules.count(id),"No molecule with the given id upon Selection of atoms from molecule");
    492514  unselectAtomsOfMolecule(molecules[id]);
    … …  
    521543
    522544void World::clearMoleculeSelection(){
     545  OBSERVE;
     546  NOTIFY(SelectionChanged);
    523547  selectedMolecules.clear();
    524548}
    … …  
    541565
    542566void World::selectMolecule(const molecule *_mol){
     567  OBSERVE;
     568  NOTIFY(SelectionChanged);
    543569  // molecule * is unchanged in this function, but we do store entity as changeable
    544570  ASSERT(_mol,"Invalid pointer to molecule in selection");
    … …  
    547573
    548574void World::selectMolecule(const moleculeId_t id){
     575  OBSERVE;
     576  NOTIFY(SelectionChanged);
    549577  ASSERT(molecules.count(id),"Molecule Id selected that was not in the world");
    550578  selectedMolecules[id]=molecules[id];
    … …  
    552580
    553581void World::selectAllMolecules(MoleculeDescriptor descr){
     582  OBSERVE;
     583  NOTIFY(SelectionChanged);
    554584  internal_MoleculeIterator begin = getMoleculeIter_internal(descr);
    555585  internal_MoleculeIterator end = moleculeEnd_internal();
    … …  
    559589
    560590void World::selectMoleculeOfAtom(const atom *_atom){
     591  OBSERVE;
     592  NOTIFY(SelectionChanged);
    561593  ASSERT(_atom,"Invalid atom pointer in selection of MoleculeOfAtom");
    562594  molecule *mol=_atom->getMolecule();
    … …  
    568600
    569601void World::selectMoleculeOfAtom(const atomId_t id){
     602  OBSERVE;
     603  NOTIFY(SelectionChanged);
    570604  ASSERT(atoms.count(id),"No such atom with given ID in selection of Molecules of Atom");\
    571605  selectMoleculeOfAtom(atoms[id]);
    … …  
    573607
    574608void World::unselectMolecule(const molecule *_mol){
     609  OBSERVE;
     610  NOTIFY(SelectionChanged);
    575611  ASSERT(_mol,"invalid pointer in unselection of molecule");
    576612  unselectMolecule(_mol->getId());
    … …  
    578614
    579615void World::unselectMolecule(const moleculeId_t id){
     616  OBSERVE;
     617  NOTIFY(SelectionChanged);
    580618  ASSERT(molecules.count(id),"No such molecule with ID in unselection");
    581619  selectedMolecules.erase(id);
    … …  
    583621
    584622void World::unselectAllMolecules(MoleculeDescriptor descr){
     623  OBSERVE;
     624  NOTIFY(SelectionChanged);
    585625  internal_MoleculeIterator begin = getMoleculeIter_internal(descr);
    586626  internal_MoleculeIterator end = moleculeEnd_internal();
    … …  
    590630
    591631void World::unselectMoleculeOfAtom(const atom *_atom){
     632  OBSERVE;
     633  NOTIFY(SelectionChanged);
    592634  ASSERT(_atom,"Invalid atom pointer in selection of MoleculeOfAtom");
    593635  molecule *mol=_atom->getMolecule();
    … …  
    599641
    600642void World::unselectMoleculeOfAtom(const atomId_t id){
     643  OBSERVE;
     644  NOTIFY(SelectionChanged);
    601645  ASSERT(atoms.count(id),"No such atom with given ID in selection of Molecules of Atom");\
    602646  unselectMoleculeOfAtom(atoms[id]);
Note: See TracChangeset for help on using the changeset viewer.