Changeset 08a7ecc for src/UIElements

Timestamp:

Apr 25, 2016, 7:02:56 AM (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:

6c4b69

Parents:

375bc3f

git-author:

Frederik Heber <heber@…> (04/13/16 13:43:20)

git-committer:

Frederik Heber <heber@…> (04/25/16 07:02:56)

Message:

FIX: ObservedValue_Index_t is now the memory address of the Observer instance.

• the atom, bond, or molecule may be removed before and reinstantiated at the same address. Hence, it is not a good unique index. The only sensible index is the memory address of the QtObserved... instance itself.

Location:

src/UIElements/Qt4/InstanceBoard

Files:

• ObservedValue_types.hpp (modified) (2 diffs)
• QtObservedAtom.cpp (modified) (1 diff)
• QtObservedBond.cpp (modified) (1 diff)
• QtObservedInstanceBoard.cpp (modified) (3 diffs)
• QtObservedMolecule.cpp (modified) (1 diff)

src/UIElements/Qt4/InstanceBoard/ObservedValue_types.hpp

@@ -19 +19 @@
 #include <boost/any.hpp>
 
-class Observable;
+class Observer;
 
 /** typedef for a vector of ObservedValue's (each is due to templating its
@@ -32 +32 @@
  * index if one is destroyed and another one instantiated at the same address.
  */
-typedef const Observable * ObservedValue_Index_t;
+typedef const Observer * ObservedValue_Index_t;
 
 

src/UIElements/Qt4/InstanceBoard/QtObservedAtom.cpp

@@ -102 +102 @@
   owner(NULL),
   oldId(_id),
-  index(static_cast<const ObservedValue_Index_t>(_atom)),
+  index(static_cast<const ObservedValue_Index_t>(const_cast<const QtObservedAtom * const>(this))),
   board(_board),
   BoardIsGone(false),

src/UIElements/Qt4/InstanceBoard/QtObservedBond.cpp

@@ -86 +86 @@
   leftatom(_leftatom),
   rightatom(_rightatom),
-  index(static_cast<const ObservedValue_Index_t>(_bond.get())),
+  index(static_cast<const ObservedValue_Index_t>(const_cast<const QtObservedBond * const>(this))),
   board(_board),
   BoardIsGone(false),

src/UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.cpp

@@ -148 +148 @@
                   *this));
           observedmolecule->setSelfRef(observedmolecule);
-          const ObservedValue_Index_t index = static_cast<const Observable *>(_molecule);
+          const ObservedValue_Index_t index = observedmolecule->getIndex();
           moleculeObservedValues.insert(index, observedmolecule);
           moleculeids_lookup.left.insert( std::make_pair(_id, index) );
@@ -176 +176 @@
               new QtObservedAtom(_id, _atom, *this));
           observedatom->setSelfRef(observedatom);
-          const ObservedValue_Index_t index = static_cast<const Observable *>(_atom);
+          const ObservedValue_Index_t index = observedatom->getIndex();
           atomObservedValues.insert(index, observedatom);
           atomids_lookup.left.insert( std::make_pair(_id, index) );
@@ -254 +254 @@
 
           // check whether bond is already present, cause we get BondsAdded from both atoms
-          const ObservedValue_Index_t index = static_cast<const Observable *>(bondref.get());
-          if (!bondObservedValues.isPresent(index)) {
-            const QtObservedAtom::ptr leftatom = getObservedAtom(
-                static_cast<const Observable *>(bondref->leftatom));
+          const bondId_t bondid =
+              std::make_pair( bondref->leftatom->getId(), bondref->rightatom->getId());
+          if (!bondids_lookup.left.count(bondid)) {
+            const QtObservedAtom::ptr leftatom = getObservedAtom(bondref->leftatom->getId());
             ASSERT( leftatom,
                 "QtObservedInstanceBoard::recieveNotification() - QtObservedAtom leftatom to bond must exist.");
-            const QtObservedAtom::ptr rightatom = getObservedAtom(
-                static_cast<const Observable *>(bondref->rightatom));
+            const QtObservedAtom::ptr rightatom = getObservedAtom(bondref->rightatom->getId());
             ASSERT( rightatom,
                 "QtObservedInstanceBoard::recieveNotification() - QtObservedAtom leftatom to bond must exist.");
-            const bondId_t bondid =
-                std::make_pair( bondref->leftatom->getId(), bondref->rightatom->getId());
             LOG(3, "DEBUG: InformationBoard initializes QtObservedBond for " << bondid);
             QtObservedBond::ptr observedbond(
                 new QtObservedBond(bondid, bondref, leftatom, rightatom, *this));
+            const ObservedValue_Index_t index = observedbond->getIndex();
             bondObservedValues.insert(index, observedbond);
             bondids_lookup.left.insert( std::make_pair(bondid, index) );

src/UIElements/Qt4/InstanceBoard/QtObservedMolecule.cpp

@@ -110 +110 @@
   owner(NULL),
   oldId(_id),
-  index(static_cast<const ObservedValue_Index_t>(_mol)),
+  index(static_cast<const ObservedValue_Index_t>(const_cast<const QtObservedMolecule * const>(this))),
   board(_board),
   BoardIsGone(false),