Changeset 8688ef for src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.hpp

Timestamp:

Feb 12, 2016, 11:15:05 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:

16bd37

Parents:

7a205a

git-author:

Frederik Heber <heber@…> (10/17/15 12:40:14)

git-committer:

Frederik Heber <heber@…> (02/12/16 23:15:05)

Message:

GLMoleculeObject_molecule's ObservedValues is now all static.

• this is preparatory for extracting their instantation to an external class InstanceInformationBoard that keeps track of the lives of instances in the World that are needed inside QtGui (e.g. for visual representation).

File:

• src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.hpp (modified) (5 diffs)

src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.hpp

@@ -20 +20 @@
 #include <vector>
 #include <boost/any.hpp>
+#include <boost/function.hpp>
 
 #include "CodePatterns/Cacheable.hpp"
@@ -114 +115 @@
   typedef std::set<atomId_t> atoms_t;
 
-  molecule::BoundingBoxInfo initBoundingBox() const;
+  static molecule::BoundingBoxInfo initBoundingBox();
 
   QGeometryData updateTesselationHull() const;
-  molecule::BoundingBoxInfo updateBoundingBox() const;
-  atoms_t updateAtoms();
-  moleculeId_t updateIndex() const;
-  std::string updateName() const;
+  static molecule::BoundingBoxInfo updateBoundingBox(
+      const boost::function<const moleculeId_t ()> &_getMolIndex);
+  static moleculeId_t updateIndex();
+  static std::string updateName(
+      const boost::function<const moleculeId_t ()> &_getMolIndex);
 
   //!> the Observable we are signed on, also indicates whether we are sign on (not NULL)
@@ -138 +140 @@
   //!> list of channels when the name needs to update
   static const Observable::channels_t NameChannels;
-
-  boost::function<moleculeId_t ()> MolIndexUpdater;
-  boost::function<std::string ()> MolNameUpdater;
-  boost::function<QGeometryData ()> TesselationHullUpdater;
-  boost::function<molecule::BoundingBoxInfo ()> BoundingBoxUpdater;
-  boost::function<atoms_t ()> PresentAtomsUpdater;
 
 private:
@@ -165 +161 @@
   std::vector<boost::any> ObservedValues;
 
-  /** Initializes all \a ObservedValues entries.
-   *
+  /** Initializes all \a _ObservedValues entries.
+   *
+   * \param _ObservedValues vector of ObservedValue to be filled
    * \param _moid molecule id
-   */
-  void initObservedValues(const moleculeId_t _molid);
+   * \param _molref reference to molecule
+   * \param _subjectKilled ref to function to call on subjectKilled()
+   */
+  static void initObservedValues(
+      std::vector<boost::any> &_ObservedValues,
+      const moleculeId_t _molid,
+      const molecule * const _molref,
+      const boost::function<void()> &_subjectKilled);
 
   /** Destroys all \a ObservedValues entries.
    *
-   */
-  void destroyObservedValues();
+   * \param _ObservedValues vector of ObservedValue to be destroyed
+   */
+  static void destroyObservedValues(
+      std::vector<boost::any> &_ObservedValues);
 
   /** Getter to molecule index contained in \a ObservedValues.
@@ -212 +217 @@
   mutable size_t subjectKilledCount;
 
+private:
+
+  boost::function<QGeometryData ()> TesselationHullUpdater;
+
   //!> contains current version of the tesselation hull on request
   Cacheable<QGeometryData> TesselationHull;
 
-private:
   //!> contains the set of atoms displayed
   atoms_t DisplayedAtoms;