Changeset bfd5d5f for src/UIElements

Timestamp:

Mar 24, 2016, 2:23:19 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:

6a7353

Parents:

1e1893

git-author:

Frederik Heber <heber@…> (03/16/16 10:20:09)

git-committer:

Frederik Heber <heber@…> (03/24/16 14:23:19)

Message:

QtObservedAtom and ..Molecule now have internal selfref.

• this can be used to convert a ptr to the instance into a shared_ptr that can be sent around easily and safely.
• QtObservedInstanceBoard is factory of QtObserved... and assigns them their self reference right after instantiation.

Location:

src/UIElements/Qt4/InstanceBoard

Files:

• QtObservedAtom.hpp (modified) (2 diffs)
• QtObservedInstanceBoard.cpp (modified) (2 diffs)
• QtObservedMolecule.hpp (modified) (2 diffs)

src/UIElements/Qt4/InstanceBoard/QtObservedAtom.hpp

@@ -54 +54 @@
   //!> typedef for instance wrapped in shared ptr
   typedef boost::shared_ptr<QtObservedAtom> ptr;
+
+  //!> typedef for instance wrapped in weak shared ptr
+  typedef boost::weak_ptr<QtObservedAtom> weak_ptr;
 
 private:
@@ -246 +249 @@
 
 private:
+
+  /** Internal setter for the weak shared_ptr instance that we sometimes
+   * need to convert the ref to this instance into an shared ptr instance that
+   * is safe to hand around.
+   *
+   * \param _selfref ref to shared ptr instance that is internally stored
+   */
+  void setSelfRef(const weak_ptr &_selfref)
+  { const_cast<weak_ptr &>(selfref) = _selfref; }
+
+  //!> reference to this instance wrapped in a shared ptr for handing around
+  const weak_ptr selfref;
+
+public:
+
+  /** Getter for this instance safely wrapped in a shared ptr instance for
+   * handing arount.
+   *
+   * \return shared ptr of this instance
+   */
+  ptr getRef() const
+  { return ptr(selfref); }
+
+private:
   //!> contains still the old id after the index of the atom changed
   atomId_t oldId;

src/UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.cpp

@@ -140 +140 @@
                   _molecule,
                   *this));
+          observedmolecule->setSelfRef(observedmolecule);
           moleculeObservedValues.insert(_id, observedmolecule);
           // we need to check for index changes
@@ -165 +166 @@
           QtObservedAtom::ptr observedatom(
               new QtObservedAtom(_id, _atom, *this));
+          observedatom->setSelfRef(observedatom);
           atomObservedValues.insert(_id, observedatom);
           // we need to check for index changes

src/UIElements/Qt4/InstanceBoard/QtObservedMolecule.hpp

@@ -51 +51 @@
   //!> typedef for instance wrapped in shared ptr
   typedef boost::shared_ptr<QtObservedMolecule> ptr;
+
+  //!> typedef for instance wrapped in shared ptr
+  typedef boost::weak_ptr<QtObservedMolecule> weak_ptr;
 
 private:
@@ -269 +272 @@
 
 private:
+
+  /** Internal setter for the weak shared_ptr instance that we sometimes
+   * need to convert the ref to this instance into an shared ptr instance that
+   * is safe to hand around.
+   *
+   * \param _selfref ref to shared ptr instance that is internally stored
+   */
+  void setSelfRef(const weak_ptr &_selfref)
+  { const_cast<weak_ptr &>(selfref) = _selfref; }
+
+  //!> reference to this instance wrapped in a shared ptr for handing around
+  const weak_ptr selfref;
+
+public:
+
+  /** Getter for this instance safely wrapped in a shared ptr instance for
+   * handing arount.
+   *
+   * \return shared ptr of this instance
+   */
+  ptr getRef() const
+  { return ptr(selfref); }
+
+private:
   //!> contains still the old index after the index changed
   moleculeId_t oldId;