Changeset 69643a

Timestamp:

Apr 6, 2012, 11:57:21 AM (13 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

8a77ac

Parents:

6e6b90

git-author:

Michael Ankele <ankele@…> (03/29/12 11:11:02)

git-committer:

Frederik Heber <heber@…> (04/06/12 11:57:21)

Message:

World: made selection changes observable

Location:

src

Files:

• World.cpp (modified) (22 diffs)
• World.hpp (modified) (1 diff)

src/World.cpp ¶

@@ -414 +414 @@
 
 void World::clearAtomSelection(){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   selectedAtoms.clear();
 }
@@ -433 +435 @@
 
 void World::selectAtom(const atom *_atom){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   // atom * is unchanged in this function, but we do store entity as changeable
   ASSERT(_atom,"Invalid pointer in selection of atom");
@@ -439 +443 @@
 
 void World::selectAtom(const atomId_t id){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   ASSERT(atoms.count(id),"Atom Id selected that was not in the world");
   selectedAtoms[id]=atoms[id];
@@ -444 +450 @@
 
 void World::selectAllAtoms(AtomDescriptor descr){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   internal_AtomIterator begin = getAtomIter_internal(descr);
   internal_AtomIterator end = atomEnd_internal();
@@ -451 +459 @@
 
 void World::selectAtomsOfMolecule(const molecule *_mol){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   ASSERT(_mol,"Invalid pointer to molecule in selection of Atoms of Molecule");
   // need to make it const to get the fast iterators
@@ -459 +469 @@
 
 void World::selectAtomsOfMolecule(const moleculeId_t id){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   ASSERT(molecules.count(id),"No molecule with the given id upon Selection of atoms from molecule");
   selectAtomsOfMolecule(molecules[id]);
@@ -464 +476 @@
 
 void World::unselectAtom(const atom *_atom){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   ASSERT(_atom,"Invalid pointer in unselection of atom");
   unselectAtom(_atom->getId());
@@ -469 +483 @@
 
 void World::unselectAtom(const atomId_t id){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   ASSERT(atoms.count(id),"Atom Id unselected that was not in the world");
   selectedAtoms.erase(id);
@@ -474 +490 @@
 
 void World::unselectAllAtoms(AtomDescriptor descr){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   internal_AtomIterator begin = getAtomIter_internal(descr);
   internal_AtomIterator end = atomEnd_internal();
@@ -481 +499 @@
 
 void World::unselectAtomsOfMolecule(const molecule *_mol){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   ASSERT(_mol,"Invalid pointer to molecule in selection of Atoms of Molecule");
   // need to make it const to get the fast iterators
@@ -489 +509 @@
 
 void World::unselectAtomsOfMolecule(const moleculeId_t id){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   ASSERT(molecules.count(id),"No molecule with the given id upon Selection of atoms from molecule");
   unselectAtomsOfMolecule(molecules[id]);
@@ -521 +543 @@
 
 void World::clearMoleculeSelection(){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   selectedMolecules.clear();
 }
@@ -541 +565 @@
 
 void World::selectMolecule(const molecule *_mol){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   // molecule * is unchanged in this function, but we do store entity as changeable
   ASSERT(_mol,"Invalid pointer to molecule in selection");
@@ -547 +573 @@
 
 void World::selectMolecule(const moleculeId_t id){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   ASSERT(molecules.count(id),"Molecule Id selected that was not in the world");
   selectedMolecules[id]=molecules[id];
@@ -552 +580 @@
 
 void World::selectAllMolecules(MoleculeDescriptor descr){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   internal_MoleculeIterator begin = getMoleculeIter_internal(descr);
   internal_MoleculeIterator end = moleculeEnd_internal();
@@ -559 +589 @@
 
 void World::selectMoleculeOfAtom(const atom *_atom){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   ASSERT(_atom,"Invalid atom pointer in selection of MoleculeOfAtom");
   molecule *mol=_atom->getMolecule();
@@ -568 +600 @@
 
 void World::selectMoleculeOfAtom(const atomId_t id){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   ASSERT(atoms.count(id),"No such atom with given ID in selection of Molecules of Atom");\
   selectMoleculeOfAtom(atoms[id]);
@@ -573 +607 @@
 
 void World::unselectMolecule(const molecule *_mol){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   ASSERT(_mol,"invalid pointer in unselection of molecule");
   unselectMolecule(_mol->getId());
@@ -578 +614 @@
 
 void World::unselectMolecule(const moleculeId_t id){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   ASSERT(molecules.count(id),"No such molecule with ID in unselection");
   selectedMolecules.erase(id);
@@ -583 +621 @@
 
 void World::unselectAllMolecules(MoleculeDescriptor descr){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   internal_MoleculeIterator begin = getMoleculeIter_internal(descr);
   internal_MoleculeIterator end = moleculeEnd_internal();
@@ -590 +630 @@
 
 void World::unselectMoleculeOfAtom(const atom *_atom){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   ASSERT(_atom,"Invalid atom pointer in selection of MoleculeOfAtom");
   molecule *mol=_atom->getMolecule();
@@ -599 +641 @@
 
 void World::unselectMoleculeOfAtom(const atomId_t id){
+  OBSERVE;
+  NOTIFY(SelectionChanged);
   ASSERT(atoms.count(id),"No such atom with given ID in selection of Molecules of Atom");\
   unselectMoleculeOfAtom(atoms[id]);

src/World.hpp ¶

@@ -118 +118 @@
     MoleculeRemoved,
     MoleculeChanged,
+    SelectionChanged,
     NotificationType_MAX
   };