Changeset d48a16 for src/UIElements/Qt4/InstanceBoard/QtObservedAtom.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/QtObservedAtom.cpp (modified) (9 diffs)

src/UIElements/Qt4/InstanceBoard/QtObservedAtom.cpp

@@ -106 +106 @@
   ObservedValues(QtObservedAtom::MAX_ObservedTypes)
 {
-  boost::function<void (ObservedValue_Index_t)> atomSubjectKilled(
+  boost::function<void ()> atomSubjectKilled(
       boost::bind(&QtObservedAtom::countValuesSubjectKilled,
           boost::ref(*this),
@@ -332 +332 @@
     const atomId_t _id,
     const atom * const _atomref,
-    const boost::function<void(ObservedValue_Index_t)> &_subjectKilled)
+    const boost::function<void()> &_subjectKilled)
 {
   ASSERT( _ObservedValues.size() == MAX_ObservedTypes,
       "QtObservedAtom::initObservedValues() - given ObservedValues has not correct size.");
-
-  // fill ObservedValues: index first
-  const boost::function<ObservedValue_Index_t ()> IndexGetter =
-      boost::bind(&QtObservedAtom::getIndex,
-          boost::cref(*this));
 
   // fill ObservedValues: then all the other that need index
@@ -364 +359 @@
       _id,
       AtomIndexChannels,
-      _subjectKilled,
-      IndexGetter);
+      _subjectKilled);
   _ObservedValues[AtomBonds] = new ObservedValue_wCallback<ListOfBonds_t, ObservedValue_Index_t>(
       _atomref,
@@ -372 +366 @@
       AtomBondsUpdater(),
       AtomBondsChannels,
-      _subjectKilled,
-      IndexGetter);
+      _subjectKilled);
   _ObservedValues[AtomElement] = new ObservedValue_wCallback<atomicNumber_t, ObservedValue_Index_t>(
       _atomref,
@@ -380 +373 @@
       AtomElementUpdater(),
       AtomElementChannels,
-      _subjectKilled,
-      IndexGetter);
+      _subjectKilled);
   _ObservedValues[AtomMolecule] = new ObservedValue_wCallback<QtObservedMolecule*, ObservedValue_Index_t>(
       _atomref,
@@ -388 +380 @@
       AtomMoleculeUpdater(),
       AtomMoleculeChannels,
-      _subjectKilled,
-      IndexGetter);
+      _subjectKilled);
   _ObservedValues[AtomName] = new ObservedValue_wCallback<std::string, ObservedValue_Index_t>(
       _atomref,
@@ -396 +387 @@
       AtomNameUpdater(),
       AtomNameChannels,
-      _subjectKilled,
-      IndexGetter);
+      _subjectKilled);
   _ObservedValues[AtomPosition] = new ObservedValue_wCallback<Vector, ObservedValue_Index_t>(
       _atomref,
@@ -404 +394 @@
       AtomPositionUpdater(),
       AtomPositionChannels,
-      _subjectKilled,
-      IndexGetter);
+      _subjectKilled);
   _ObservedValues[AtomSelected] = new ObservedValue_wCallback<bool, ObservedValue_Index_t>(
       _atomref,
@@ -412 +401 @@
       AtomSelectedUpdater(),
       AtomSelectedChannels,
-      _subjectKilled,
-      IndexGetter);
+      _subjectKilled);
 }