Changeset 8d5fbf1 for src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.cpp

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_bond.cpp (modified) (7 diffs)

src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.cpp

@@ -55 +55 @@
 #include "LinearAlgebra/Line.hpp"
 #include "LinearAlgebra/Vector.hpp"
+#include "UIElements/Views/Qt4/QtInstanceInformationBoard.hpp"
 #include "World.hpp"
 
@@ -69 +70 @@
 const Observable::channels_t
 GLMoleculeObject_bond::BondElementChannels(1, AtomObservable::ElementChanged);
+
+static GLMoleculeObject_bond::bondIds_t getBondIdsForIds(
+    const boost::function<const atomId_t()> &_left,
+    const boost::function<const atomId_t()> &_right)
+{
+  return std::make_pair(_left(), _right());
+}
 
 GLMoleculeObject_bond::GLMoleculeObject_bond(
@@ -87 +95 @@
   subjectKilledCount(0),
   leftobservable_enabled(false),
-  rightobservable_enabled(false)
+  rightobservable_enabled(false),
+  board_subjectKilled(
+      boost::bind(
+          static_cast<void (GLMoleculeObject_bond::*) ()>(
+              &GLMoleculeObject_bond::countsubjectKilled),
+          this))
 {
   boost::function<void(const atomId_t &)> leftsubjectKilled =
@@ -123 +136 @@
     const bondIds_t bondIds,
     const enum SideOfBond side,
-    std::vector<boost::any> &_ObservedValues) :
+    std::vector<boost::any> &_ObservedValues,
+    const boost::function<void (const bondIds_t)> &_subjectKilled) :
   GLMoleculeObject(mesh, parent),
   Observer(std::string("GLMoleculeObject_bond")
@@ -136 +150 @@
   subjectKilledCount(0),
   leftobservable_enabled(false),
-  rightobservable_enabled(false)
+  rightobservable_enabled(false),
+  board_subjectKilled(_subjectKilled)
 {
   init();
@@ -209 +224 @@
   removeChannels();
   // check whether we should be removed
-  countsubjectKilled(std::make_pair(getleftIndex(), getrightIndex()));
+  board_subjectKilled(std::make_pair(getleftIndex(), getrightIndex()));
 }
 
@@ -389 +404 @@
 }
 
-static GLMoleculeObject_bond::bondIds_t getBondIdsForIds(
-    const boost::function<const atomId_t ()> _left,
-    const boost::function<const atomId_t ()> _right)
-{
-  return std::make_pair( _left(), _right());
-}
-
 void GLMoleculeObject_bond::initObservedValues(
     std::vector<boost::any> &_ObservedValues,