Changeset f2d5ce for src/UIElements/Qt4

Timestamp:

Dec 26, 2025, 9:40:14 PM (2 weeks ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.1, stable

Children:

c8cb0d

Parents:

bdd1d0

git-author:

Frederik Heber <frederik.heber@…> (12/10/25 10:20:56)

git-committer:

Frederik Heber <frederik.heber@…> (12/26/25 21:40:14)

Message:

QtTimeLine no longers queries WorldTime directly.

• This was slightly prone to race conditions when manipulating the slider in the UI while stuff was going on in the background. Instead, we query the QtObservedInstanceBoard.
• QtObservedInstanceBoard has ObservedValue for WorldTime.
• introduces ObservedMaximumAtomTrajectorySize that aggregates the maximum trajectory size over all atoms and provides it as an Observable. We need this value in QtTimeLine only right now.

Location:

src/UIElements/Qt4

Files:

• InstanceBoard/ObservedMaximumAtomTrajectorySize.cpp (added)
• InstanceBoard/ObservedMaximumAtomTrajectorySize.hpp (added)
• InstanceBoard/QtObservedInstanceBoard.cpp (modified) (9 diffs)
• InstanceBoard/QtObservedInstanceBoard.hpp (modified) (6 diffs)
• QtMainWindow.cpp (modified) (1 diff)

src/UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.cpp

@@ -51 +51 @@
 #include "Descriptors/MoleculeIdDescriptor.hpp"
 #include "molecule.hpp"
+#include "UIElements/Qt4/InstanceBoard/ObservedMaximumAtomTrajectorySize.hpp"
 #include "UIElements/Qt4/InstanceBoard/ObservedValuesContainer_impl.hpp"
 #include "World.hpp"
+#include "WorldTime.hpp"
+
+// static entities
+const Observable::channels_t
+WorldTimeChannels(1, WorldTime::TimeChanged);
+
+const Observable::channels_t
+MaximumTrajectorySizeChannels(1, ObservedMaximumAtomTrajectorySize::MaximumChanged);
 
 QtObservedInstanceBoard::QtObservedInstanceBoard(QWidget * _parent) :
@@ -58 +67 @@
   Observer("QtObservedInstanceBoard"),
   WorldSignedOn(false),
+  WorldTimeSignedOn(false),
+  MaximumAtomTrajectorySizeSignedOn(false),
   atomObservedValues(
       "atom",
@@ -69 +80 @@
       "molecule",
       *this,
-      boost::bind(&QtObservedInstanceBoard::moleculecountsubjectKilled, this, _1))
+      boost::bind(&QtObservedInstanceBoard::moleculecountsubjectKilled, this, _1)),
+  worldTime(
+    WorldTime::getPointer(),
+    WorldTime::getTime,
+    "WorldTime",
+    0,
+    WorldTimeChannels),
+  maximumAtomTrajectorySize(
+    ObservedMaximumAtomTrajectorySize::getPointer(),
+    boost::bind(
+      &ObservedMaximumAtomTrajectorySize::GetMaximumAtomTrajectorySize, 
+      boost::cref(ObservedMaximumAtomTrajectorySize::getConstInstance())
+    ),
+    "MaximumAtomTrajectorySize",
+    0,
+    MaximumTrajectorySizeChannels)
 {
   qRegisterMetaType<ObservedValue_Index_t>("ObservedValue_Index_t");
@@ -80 +106 @@
   World::getInstance().signOn(this, World::MoleculeInserted, GlobalObservableInfo::PriorityLevel(int(-10)));
   WorldSignedOn = true;
+  WorldTime::getInstance().signOn(this, WorldTime::TimeChanged);
+  WorldTimeSignedOn = true;
+  ObservedMaximumAtomTrajectorySize::getInstance().signOn(this, ObservedMaximumAtomTrajectorySize::MaximumChanged);
+  MaximumAtomTrajectorySizeSignedOn = true;
 }
 
@@ -87 +117 @@
     World::getInstance().signOff(this, World::AtomInserted);
     World::getInstance().signOff(this, World::MoleculeInserted);
+  }
+  if (WorldTimeSignedOn) {
+    WorldTime::getInstance().signOff(this, WorldTime::TimeChanged);
+  }
+  if (MaximumAtomTrajectorySizeSignedOn) {
+    ObservedMaximumAtomTrajectorySize::getInstance().signOff(this, ObservedMaximumAtomTrajectorySize::MaximumChanged);
   }
   // sign off from all remaining molecules, bonds, and atoms
@@ -121 +157 @@
       MoleculeSignedOn.erase(iter);
     } else {
-      ASSERT(0,
-          "QtObservedInstanceBoard::subjectKilled() - could not find signedOn for atom/molecule "+toString(publisher));
+      if (static_cast<World *>(publisher) == World::getPointer()) {
+        WorldSignedOn = false;
+      } else if (static_cast<WorldTime *>(publisher) == WorldTime::getPointer()) {
+        WorldTimeSignedOn = false;
+      } else if (static_cast<ObservedMaximumAtomTrajectorySize *>(publisher) == ObservedMaximumAtomTrajectorySize::getPointer()) {
+        MaximumAtomTrajectorySizeSignedOn = false;
+      } else {
+        ASSERT(0,
+            "QtObservedInstanceBoard::subjectKilled() - could not find signedOn for atom/molecule "+toString(publisher));
+      }
     }
   }
@@ -217 +261 @@
       }
       default:
-        ASSERT(0, "QtObservedInstanceBoard::recieveNotification() - we cannot get here.");
+        ASSERT(0, "QtObservedInstanceBoard::recieveNotification() - we cannot get here for Molecule.");
         break;
     }
@@ -277 +321 @@
       }
       default:
-        ASSERT(0, "QtObservedInstanceBoard::recieveNotification() - we cannot get here.");
-        break;
+        ASSERT(0, "QtObservedInstanceBoard::recieveNotification() - we cannot get here for Atom.");
+        break;
+    }
+  } else if (static_cast<ObservedMaximumAtomTrajectorySize *>(publisher) == ObservedMaximumAtomTrajectorySize::getPointer()) {
+    switch (notification->getChannelNo()) {
+      case ObservedMaximumAtomTrajectorySize::MaximumChanged:
+      {
+#ifdef LOG_OBSERVER
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that maximum atom tractory size has changed.";
+#endif
+        LOG(3, "DEBUG: InformationBoard got MaximumChanged signal from ObservedMaximumAtomTrajectorySize.");
+        emit MaximumAtomTrajectoryChanged();
+        break;
+      }
+      default:
+      {
+        ASSERT(0, "QtObservedInstanceBoard::recieveNotification() - we cannot get here for ObservedMaximumAtomTrajectorySize.");
+        break;
+      }
+    }
+  } else if (static_cast<WorldTime *>(publisher) == WorldTime::getPointer()) {
+    switch (notification->getChannelNo()) {
+      case WorldTime::TimeChanged:
+      {
+#ifdef LOG_OBSERVER
+        observerLog().addMessage() << "++ Observer " << observerLog().getName(static_cast<Observer *>(this)) << " received notification that WorldTime has changed.";
+#endif
+        LOG(3, "DEBUG: InformationBoard got TimeChanged signal from WorldTime.");
+        emit WorldTimeChanged();
+        break;
+      }
+      default:
+      {
+        ASSERT(0, "QtObservedInstanceBoard::recieveNotification() - we cannot get here for WorldTime.");
+        break;
+      }
     }
   } else {
@@ -373 +451 @@
 }
 
+const ObservedValue<unsigned int>& QtObservedInstanceBoard::getObservedWorldTime()
+{
+  return worldTime;
+}
+
+const ObservedValue<int>& QtObservedInstanceBoard::getObservedMaximumAtomTrajectorySize()
+{
+  return maximumAtomTrajectorySize;
+}
+
 void QtObservedInstanceBoard::markObservedAtomAsConnected(ObservedValue_Index_t _id)
 {

src/UIElements/Qt4/InstanceBoard/QtObservedInstanceBoard.hpp

@@ -25 +25 @@
 #include <boost/function.hpp>
 
+#include "CodePatterns/ObservedValue.hpp"
 #include "CodePatterns/Observer/Observer.hpp"
 
@@ -94 +95 @@
   QtObservedMolecule::ptr getObservedMolecule(const moleculeId_t _id);
   QtObservedMolecule::ptr getObservedMolecule(ObservedValue_Index_t _id);
+  const ObservedValue<unsigned int>& getObservedWorldTime();
+  const ObservedValue<int>& getObservedMaximumAtomTrajectorySize();
   void markObservedAtomAsConnected(ObservedValue_Index_t _id);
   void markObservedAtomAsDisconnected(ObservedValue_Index_t _id);
@@ -114 +117 @@
   void moleculeRemoved(ObservedValue_Index_t _molid);
   void moleculeIndexChanged(const moleculeId_t _oldid, const moleculeId_t _newid);
+  void WorldTimeChanged();
+  void MaximumAtomTrajectoryChanged();
 
 private:
@@ -124 +129 @@
   bool WorldSignedOn;
 
+  //!> indicating whether we are still signedOn to World or not
+  bool WorldTimeSignedOn;
+  
+  //!> indicating whether we are still signedOn to MaximumAtomTrajectorySize observable
+  bool MaximumAtomTrajectorySizeSignedOn;
+
   typedef std::multiset<Observable *> SignedOn_t;
   //!> map indicating to which atom we are currently signed on
@@ -129 +140 @@
   //!> map indicating to which molecule we are currently signed on
   SignedOn_t MoleculeSignedOn;
+
 
   //!> "templated typedef" for an id to index map.
@@ -173 +185 @@
   //!> container with all ObservedValues for each molecule, associated by id
   ObservedValuesContainer<QtObservedMolecule, ObservedValue_Index_t> moleculeObservedValues;
+  //!> observed value for the world's time
+  ObservedValue<unsigned int> worldTime;
+  //!> observed value for the largest atom trajectory siye (i.e., current number of world time steps)
+  ObservedValue<int> maximumAtomTrajectorySize;
 };
 

src/UIElements/Qt4/QtMainWindow.cpp

@@ -120 +120 @@
   shapeController = new QtShapeController(worldTab);
 
-  timeline = new QtTimeLine(this);
+  timeline = new QtTimeLine(InstanceBoard, this);
 
   infoBox = new QtInfoBox(InstanceBoard);