Changeset d48a16 for src/UIElements/Qt4/InstanceBoard/QtObservedBond.cpp

Timestamp:

Apr 20, 2016, 11:04:53 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:

e4b13a

Parents:

96f14a

git-author:

Frederik Heber <heber@…> (03/23/16 10:02:43)

git-committer:

Frederik Heber <heber@…> (04/20/16 23:04:53)

Message:

Removed partial specialization of ObservedValue_wCallback for index.

• we don't need this anymore as ObservedValues now have a unique and permanent index, which we can bind right from the start.
• adapted QtObservedAtom and QtObservedMolecule's initObservedValues().

File:

• src/UIElements/Qt4/InstanceBoard/QtObservedBond.cpp (modified) (13 diffs)

src/UIElements/Qt4/InstanceBoard/QtObservedBond.cpp

@@ -128 +128 @@
           boost::ref(subjectKilledCount), _1);
 
-  const boost::function<void (const ObservedValue_Index_t)> bondSubjectKilled(
+  const boost::function<void ()> bondSubjectKilled(
       boost::bind(&QtObservedBond::countValuesSubjectKilled,
           boost::ref(*this),
@@ -134 +134 @@
           boost::bind(accessor,
               getObservable(_bond.get()))));
-  const boost::function<void (const ObservedValue_Index_t)> leftatomSubjectKilled(
+  const boost::function<void ()> leftatomSubjectKilled(
       boost::bind(&QtObservedBond::countValuesSubjectKilled,
           boost::ref(*this),
@@ -140 +140 @@
           boost::bind(accessor,
               getObservable(_bond->leftatom))));
-  const boost::function<void (const ObservedValue_Index_t)> rightatomSubjectKilled(
+  const boost::function<void ()> rightatomSubjectKilled(
       boost::bind(&QtObservedBond::countValuesSubjectKilled,
           boost::ref(*this),
@@ -146 +146 @@
           boost::bind(accessor,
               getObservable(_bond->rightatom))));
-  const boost::function<void (const ObservedValue_Index_t)> moleculeSubjectKilled(
+  const boost::function<void ()> moleculeSubjectKilled(
       boost::bind(&QtObservedBond::countValuesSubjectKilled,
           boost::ref(*this),
@@ -588 +588 @@
     const bondId_t _id,
     const bond::ptr _bondref,
-    const boost::function<void(const ObservedValue_Index_t)> &_bondsubjectKilled,
-    const boost::function<void(const ObservedValue_Index_t)> &_leftatomsubjectKilled,
-    const boost::function<void(const ObservedValue_Index_t)> &_rightatomsubjectKilled,
-    const boost::function<void(const ObservedValue_Index_t)> &_moleculesubjectKilled)
+    const boost::function<void()> &_bondsubjectKilled,
+    const boost::function<void()> &_leftatomsubjectKilled,
+    const boost::function<void()> &_rightatomsubjectKilled,
+    const boost::function<void()> &_moleculesubjectKilled)
 {
   // fill ObservedValues: index first
@@ -622 +622 @@
       BondDegreeUpdater(),
       BondDegreeChannels,
-      _bondsubjectKilled,
-      BondIndexGetter);
+      _bondsubjectKilled);
   _ObservedValues[leftAtomIndex] = new ObservedValue_wCallback<atomId_t, ObservedValue_Index_t>(
       _bondref->leftatom,
@@ -630 +629 @@
       leftAtomIndexUpdater(),
       Observable::channels_t(1, AtomObservable::IndexChanged),
-      _leftatomsubjectKilled,
-      BondIndexGetter);
+      _leftatomsubjectKilled);
   _ObservedValues[leftAtomElement] = new ObservedValue_wCallback<atomicNumber_t, ObservedValue_Index_t>(
       _bondref->leftatom,
@@ -638 +636 @@
       leftAtomElementUpdater(),
       Observable::channels_t(1, AtomObservable::ElementChanged),
-      _leftatomsubjectKilled,
-      BondIndexGetter);
+      _leftatomsubjectKilled);
   _ObservedValues[leftAtomPosition] = new ObservedValue_wCallback<Vector, ObservedValue_Index_t>(
       _bondref->leftatom,
@@ -646 +643 @@
       leftAtomPositionUpdater(),
       Observable::channels_t(1, AtomObservable::PositionChanged),
-      _leftatomsubjectKilled,
-      BondIndexGetter);
+      _leftatomsubjectKilled);
   _ObservedValues[rightAtomIndex] = new ObservedValue_wCallback<atomId_t, ObservedValue_Index_t>(
       _bondref->rightatom,
@@ -654 +650 @@
       rightAtomIndexUpdater(),
       Observable::channels_t(1, AtomObservable::IndexChanged),
-      _rightatomsubjectKilled,
-      BondIndexGetter);
+      _rightatomsubjectKilled);
   _ObservedValues[rightAtomElement] = new ObservedValue_wCallback<atomicNumber_t, ObservedValue_Index_t>(
       _bondref->rightatom,
@@ -662 +657 @@
       rightAtomElementUpdater(),
       Observable::channels_t(1, AtomObservable::ElementChanged),
-      _rightatomsubjectKilled,
-      BondIndexGetter);
+      _rightatomsubjectKilled);
   _ObservedValues[rightAtomPosition] = new ObservedValue_wCallback<Vector, ObservedValue_Index_t>(
       _bondref->rightatom,
@@ -670 +664 @@
       rightAtomPositionUpdater(),
       Observable::channels_t(1, AtomObservable::PositionChanged),
-      _rightatomsubjectKilled,
-      BondIndexGetter);
+      _rightatomsubjectKilled);
   _ObservedValues[moleculeIndex] = new ObservedValue_wCallback<moleculeId_t, ObservedValue_Index_t>(
       _bondref->leftatom->getMolecule(),
@@ -678 +671 @@
       MoleculeIndexUpdater(),
       Observable::channels_t(1, AtomObservable::PositionChanged),
-      _moleculesubjectKilled,
-      BondIndexGetter);
+      _moleculesubjectKilled);
 }