Changeset 5c9604 for src/UIElements

Timestamp:

Feb 26, 2016, 9:46:19 AM (9 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:

805fdc

Parents:

8b59dd

git-author:

Frederik Heber <heber@…> (02/13/16 14:50:41)

git-committer:

Frederik Heber <heber@…> (02/26/16 09:46:19)

Message:

SignedOn_t in QtObservedInstanceBoard is again just a set.

• we do not need multiple entries for molecule anymore.

Location:

src/UIElements/Qt4/InstanceBoard

Files:

• QtObservedInstanceBoard.cpp (modified) (1 diff)
• QtObservedInstanceBoard.hpp (modified) (1 diff)

src/UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.cpp

@@ -91 +91 @@
   for (SignedOn_t::iterator iter = MoleculeSignedOn.begin(); !MoleculeSignedOn.empty();
       iter = MoleculeSignedOn.begin()) {
-    Observable * const _observable = *iter;
-    _observable->signOff(this, molecule::IndexChanged);
-    // remove all three remaining instances in multiset
-    for (SignedOn_t::iterator sameiter = MoleculeSignedOn.find(_observable);
-        sameiter != MoleculeSignedOn.end();
-        sameiter = MoleculeSignedOn.find(_observable))
-      MoleculeSignedOn.erase(*sameiter); //erase all instances
+    (*iter)->signOff(this, molecule::IndexChanged);
+    MoleculeSignedOn.erase(iter);
   }
 }

src/UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.hpp

@@ -105 +105 @@
   bool WorldSignedOn;
 
-  typedef std::multiset<Observable *> SignedOn_t;
+  typedef std::set<Observable *> SignedOn_t;
   //!> map indicating to which atom we are currently signed on
   SignedOn_t AtomSignedOn;