Changeset 29ba9a

Timestamp:

Dec 19, 2025, 10:33:12 PM (9 days ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.1, stable

Children:

d2be22

Parents:

37d1c3

git-author:

Frederik Heber <frederik.heber@…> (11/13/25 22:20:55)

git-committer:

Frederik Heber <frederik.heber@…> (12/19/25 22:33:12)

Message:

FIX: QtObservedAtom avoids using atomRef on first subjectKilled.

File:

• src/UIElements/Qt4/InstanceBoard/QtObservedAtom.cpp (modified) (11 diffs)

src/UIElements/Qt4/InstanceBoard/QtObservedAtom.cpp

@@ -378 +378 @@
 }
 
+template <typename T>
+T safelyAccessUpdater(
+  const size_t& _subjectKilledCount,
+  const boost::function<T ()> _updater,
+  const T _defaultValue
+) {
+  if (_subjectKilledCount == 0)
+    return _updater();
+  return _defaultValue;
+}
+
 void QtObservedAtom::initObservedValues(
     ObservedValues_t &_ObservedValues,
@@ -388 +399 @@
 
   // fill ObservedValues: then all the other that need index
+  
   const boost::function<atomId_t ()> AtomIndexUpdater(
-      boost::bind(&QtObservedAtom::updateIndex, boost::cref(*_atomref)));
+        boost::bind<atomId_t>(&QtObservedAtom::updateIndex, boost::cref(*_atomref)));
   const boost::function<ListOfBonds_t ()> AtomBondsUpdater(
       boost::bind(&QtObservedAtom::updateBonds, boost::cref(*_atomref)));
@@ -409 +421 @@
   _ObservedValues[AtomIndex] = new ObservedValue_wCallback<atomId_t, ObservedValue_Index_t>(
       _atomref,
-      AtomIndexUpdater,
+      boost::bind(safelyAccessUpdater<atomId_t>, boost::cref(subjectKilledCount), AtomIndexUpdater, (atomId_t)0),
       "AtomIndex_"+toString(_id),
       _id,
@@ -416 +428 @@
   _ObservedValues[AtomBonds] = new ObservedValue_wCallback<ListOfBonds_t, ObservedValue_Index_t>(
       _atomref,
-      AtomBondsUpdater,
+      boost::bind(safelyAccessUpdater<ListOfBonds_t>, boost::cref(subjectKilledCount), AtomBondsUpdater, ListOfBonds_t()),
       "AtomBonds_"+toString(_id),
       AtomBondsUpdater(),
@@ -423 +435 @@
   _ObservedValues[AtomElement] = new ObservedValue_wCallback<atomicNumber_t, ObservedValue_Index_t>(
       _atomref,
-      AtomElementUpdater,
+      boost::bind(safelyAccessUpdater<atomicNumber_t>, boost::cref(subjectKilledCount), AtomElementUpdater, (atomicNumber_t)0),
       "AtomElement"+toString(_id),
       AtomElementUpdater(),
@@ -430 +442 @@
   _ObservedValues[AtomName] = new ObservedValue_wCallback<std::string, ObservedValue_Index_t>(
       _atomref,
-      AtomNameUpdater,
+      boost::bind(safelyAccessUpdater<std::string>, boost::cref(subjectKilledCount), AtomNameUpdater, ""),
       "AtomName"+toString(_id),
       AtomNameUpdater(),
@@ -437 +449 @@
   _ObservedValues[AtomPosition] = new ObservedValue_wCallback<Vector, ObservedValue_Index_t>(
       _atomref,
-      AtomPositionUpdater,
+      boost::bind(safelyAccessUpdater<Vector>, boost::cref(subjectKilledCount), AtomPositionUpdater, zeroVec),
       "AtomPosition_"+toString(_id),
       AtomPositionUpdater(),
@@ -444 +456 @@
   _ObservedValues[AtomVelocity] = new ObservedValue_wCallback<Vector, ObservedValue_Index_t>(
       _atomref,
-      AtomVelocityUpdater,
+      boost::bind(safelyAccessUpdater<Vector>, boost::cref(subjectKilledCount), AtomVelocityUpdater, zeroVec),
       "AtomVelocity_"+toString(_id),
       AtomVelocityUpdater(),
@@ -451 +463 @@
   _ObservedValues[AtomForce] = new ObservedValue_wCallback<Vector, ObservedValue_Index_t>(
       _atomref,
-      AtomForceUpdater,
+      boost::bind(safelyAccessUpdater<Vector>, boost::cref(subjectKilledCount), AtomForceUpdater, zeroVec),
       "AtomForce_"+toString(_id),
       AtomForceUpdater(),
@@ -458 +470 @@
   _ObservedValues[AtomSelected] = new ObservedValue_wCallback<bool, ObservedValue_Index_t>(
       _atomref,
-      AtomSelectedUpdater,
+      boost::bind(safelyAccessUpdater<bool>, boost::cref(subjectKilledCount), AtomSelectedUpdater, false),
       "AtomSelected_"+toString(_id),
       AtomSelectedUpdater(),
@@ -465 +477 @@
   _ObservedValues[MoleculeRef] = new ObservedValue_wCallback<QtObservedMolecule*, ObservedValue_Index_t>(
       _atomref,
-      MoleculeRefUpdater,
+      boost::bind(safelyAccessUpdater<QtObservedMolecule*>, boost::cref(subjectKilledCount), MoleculeRefUpdater, (QtObservedMolecule*)NULL),
       "AtomMoleculeIndex"+toString(_id),
       MoleculeRefUpdater(),