Changeset e7ed12 for src/UIElements

Timestamp:

Feb 14, 2016, 12:34:28 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:

1b07b1

Parents:

387a84

git-author:

Frederik Heber <heber@…> (01/06/16 17:11:16)

git-committer:

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

Message:

Combined checks into checkRemoval() in ObservedValuesContainer.

Location:

src/UIElements/Qt4/InstanceBoard

Files:

• ObservedValuesContainer.hpp (modified) (1 diff)
• ObservedValuesContainer_impl.hpp (modified) (5 diffs)

src/UIElements/Qt4/InstanceBoard/ObservedValuesContainer.hpp

@@ -247 +247 @@
   bool checkMarkedForErase(const id _id) const;
 
+  /** Combines all of the above checks with call to removeObservedValues() on true.
+   *
+   * \param _id identifier of instance
+   */
+  void checkRemoval(const id _id);
+
 private:
   //!> QtObservedInstanceBoard may access anything

src/UIElements/Qt4/InstanceBoard/ObservedValuesContainer_impl.hpp

@@ -48 +48 @@
 
 template <class T, typename id>
+#ifdef HAVE_INLINE
+inline
+#endif
+void ObservedValuesContainer<T,id>::checkRemoval(const id _id)
+{
+  if (checkRefCount(_id) && checksubjectKilled(_id) && checkMarkedForErase(_id))
+    removeObservedValues(_id);
+}
+
+template <class T, typename id>
 typename T::ptr ObservedValuesContainer<T,id>::get(const id _id)
 {
@@ -99 +109 @@
   --(iter->second.getEraseCandidate().second);
 
-  if (checkRefCount(_id) && checksubjectKilled(_id) && checkMarkedForErase(_id))
-    removeObservedValues(_id);
-}
-
-template <class T, typename id>
+  checkRemoval(_id);
+}
+
+template <class T, typename id>
+#ifdef HAVE_INLINE
+inline
+#endif
 bool ObservedValuesContainer<T,id>::checksubjectKilled(
     const id _id) const
@@ -129 +141 @@
   ++(iter->second);
 
-  if (checkRefCount(_id) && checksubjectKilled(_id) && checkMarkedForErase(_id))
-    removeObservedValues(_id);
+  checkRemoval(_id);
 }
 
@@ -160 +171 @@
       +NameOfType+" "+toString(_id)+".");
 
-  if (checkRefCount(_id) && checksubjectKilled(_id) && checkMarkedForErase(_id))
-    removeObservedValues(_id);
-}
-
-template <class T, typename id>
+  checkRemoval(_id);
+}
+
+template <class T, typename id>
+#ifdef HAVE_INLINE
+inline
+#endif
 bool ObservedValuesContainer<T,id>::checkMarkedForErase(const id _id) const
 {
@@ -234 +247 @@
 
 template <class T, typename id>
+#ifdef HAVE_INLINE
+inline
+#endif
 bool ObservedValuesContainer<T,id>::isPresent(const id _id) const
 {