Changeset 0af22d for src/UIElements/Qt4/InstanceBoard/ObservedValuesContainer.hpp

Timestamp:

Feb 14, 2016, 12:34:26 PM (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:

393342

Parents:

b43585

git-author:

Frederik Heber <heber@…> (12/30/15 14:28:53)

git-committer:

Frederik Heber <heber@…> (02/14/16 12:34:26)

Message:

FIX: ObservedValuesContainer uses deque for internal observed values.

• it may happen that an atom is created before the _visual representation_ got destroyed (and hence it's QtObserved... would be destroyed). In that case the QtObservedInstanceBoard fails with an assertion.
• Now, we use a deque. At the front end, we have all the observedvalues that have not yet been deleted, on the back end we have the observedvalues to the currently active instance.
• removed unused getRefCount().

File:

• src/UIElements/Qt4/InstanceBoard/ObservedValuesContainer.hpp (modified) (4 diffs)

src/UIElements/Qt4/InstanceBoard/ObservedValuesContainer.hpp

@@ -17 +17 @@
 #include "ObservedValue_types.hpp"
 
+#include <deque>
 #include <map>
 #include <string>
@@ -92 +93 @@
 
 private:
-  typedef std::pair<typename T::ptr, size_t> RefCountedObservedValues_t;
-  typedef std::map<id, RefCountedObservedValues_t> CountedObservedValues_t;
+  /** \note CountedObservedValues_t needs to contain a list in the second argument
+   * as the ObservedValuesContainer may fall behind when a single atom is created
+   * and destroyed a number of times in a row (e.g. in the undo/redo cases). This
+   * problem is inherent because on the one hand we keep the QtObservedAtom alive
+   * till the last moment, i.e. till the GUI does not need it anymore where the
+   * original instance may long have been removed from the World. On the other hand
+   * we instantiate the e.g. QtObservedAtom as soon as the observed atom is created.
+   */
+
+  typedef std::deque<std::pair<typename T::ptr, size_t> > RefCountedObservedValues_t;
+  typedef std::map<id, RefCountedObservedValues_t > CountedObservedValues_t;
   //!> internal vector of observed values
   CountedObservedValues_t ObservedValues;
@@ -154 +164 @@
    * \param _id identifier of instance associated with observed values
    * \param _obsvalues vector of observed values of instance
-   * \return true - insertion successful, false - else
    */
-  bool insert(const id _id, const typename T::ptr &_obsvalues);
+  void insert(const id _id, const typename T::ptr &_obsvalues);
 
   /** Use to change the identifier associated with a vector of observed values.
@@ -165 +174 @@
    */
   bool changeIdentifier(const id _oldid, const id _newid);
-
-  /** Returns the number of reference delivered for this instance identified by \a _id.
-   *
-   * \param _id identifier of instance
-   * \return reference count
-   */
-  size_t getRefCount(const id _id) const;
 
   /** Checks whether a vector of observed values of an instance  identified by \a _id