Changeset 8d5fbf1 for src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.hpp

Timestamp:

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

0f7ffe

Parents:

47f0e4

git-author:

Frederik Heber <heber@…> (01/25/16 11:09:33)

git-committer:

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

Message:

GLMoleculeObject_atom, _bond, _molecule all use QtInstanceInformationBoard passed via GLWorldScene.

File:

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

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

@@ -42 +42 @@
   GLMoleculeObject_molecule(
       QObject *parent,
-      const moleculeId_t molid);
+      const moleculeId_t molid,
+      QtInstanceInformationBoard * _board,
+      std::vector<boost::any> _ObservedValues);
   GLMoleculeObject_molecule(
       QGLSceneNode *mesh[],
       QObject *parent,
-      const moleculeId_t molid);
+      const moleculeId_t molid,
+      QtInstanceInformationBoard * _board,
+      std::vector<boost::any> _ObservedValues);
   virtual ~GLMoleculeObject_molecule();
 
@@ -78 +82 @@
   void AtomRemoved(const atomId_t _id);
   void IdChanged();
-  void InstanceRemoved(const moleculeId_t);
 
 private slots:
@@ -99 +102 @@
   void resetTesselationHull();
   void resetBoundingBox();
-  void resetAtoms();
   void resetIndex();
   void resetName();
@@ -111 +113 @@
   static const molecule * const getMolecule(const moleculeId_t _id);
 
+  void init(const moleculeId_t _molid);
+
 private:
   void addAtomBonds(
@@ -116 +120 @@
       const GLMoleculeObject_bond::SideOfBond _side
       );
-  void addAtomBonds(const atomId_t _id);
 
   //!> typedef for the internal set of atoms
@@ -130 +133 @@
       const boost::function<const moleculeId_t ()> &_getMolIndex);
 
+  /** Getter to contained atoms contained in \a ObservedValues.
+   *
+   * \return molecule's contained atoms
+   */
+  atoms_t getPresentAtoms() const;
+
   //!> the Observable we are signed on, also indicates whether we are sign on (not NULL)
   const Observable * owner;
@@ -136 +145 @@
   const molecule * const molref;
 
-  //!> list of channels when contained atoms needs to update
-  static const Observable::channels_t AtomsChannels;
   //!> list of channels when tesselation hull needs to update
   static const Observable::channels_t HullChannels;
@@ -159 +166 @@
     //!> contains newest version of the bounding box on request
     BoundingBox,
-    //!> contains the current live set of atoms for the molecule
-    PresentAtoms,
     //!> gives the size of the enumeration
     MAX_ObservedTypes
@@ -206 +211 @@
   molecule::BoundingBoxInfo getBoundingBox() const;
 
-  /** Getter to contained atoms contained in \a ObservedValues.
-   *
-   * \return molecule's contained atoms
-   */
-  atoms_t getPresentAtoms() const;
-
-  /** Counts how many ObservedValues got subjectKilled.
-   *
-   * This is used to give InstanceRemoved() signal only when each and every
-   * ObservedValue (and the instance itself) has been subjectKilled by the
-   * monitored Observable. Only then can we safely remove the instance.
-   *
-   * \param _molid molecule id who signalled subjectKilled()
-   */
-  void countsubjectKilled(const moleculeId_t _molid);
-
   //!> counts how many ObservedValues have already been subjectKilled()
   mutable size_t subjectKilledCount;
@@ -241 +230 @@
 
   atomId_t hoverAtomId;
+
+  //!> we get multiple subjectKilled(), count and call callback() only on last
+  const unsigned int AllsignedOnChannels;
+  unsigned int signedOnChannels;
+
+  QtInstanceInformationBoard * board;
 };