Changeset 57a81e for src/UIElements/Qt4/InstanceBoard

Timestamp:

May 8, 2017, 2:04:40 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

057876

Parents:

7ee4b5

git-author:

Frederik Heber <heber@…> (04/07/17 17:49:31)

git-committer:

Frederik Heber <frederik.heber@…> (05/08/17 14:04:40)

Message:

FIX: QtGui again reacts to WorldTime changes.

• QtObservedAtom now observes WorldTime and uses new forceUpdate() for position and molecule ObservedValues to get information of new time step.
• Note: As WorldTime is a singleton living till the end of the program we do not need any fancy taking care of subjectKilled() in a correct manner.

File:

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

src/UIElements/Qt4/InstanceBoard/QtObservedAtom.cpp

@@ -47 +47 @@
 #include "Element/element.hpp"
 #include "World.hpp"
+#include "WorldTime.hpp"
 
 #include "UIElements/Qt4/InstanceBoard/ObservedValue_wCallback.hpp"
@@ -264 +265 @@
 {
   // ObservedValues have been updated before, hence convert updates to Qt's signals
-  switch (notification->getChannelNo()) {
-    case AtomObservable::IndexChanged:
-    {
-      emit indexChanged();
-      break;
+  if (publisher == WorldTime::getPointer()) {
+    // force update of all changes that may occur from one time step to another
+    boost::any_cast<ObservedValue_wCallback<Vector, ObservedValue_Index_t> *>(
+        ObservedValues[AtomPosition])->forceUpdate();
+    boost::any_cast<ObservedValue_wCallback<QtObservedMolecule*, ObservedValue_Index_t> *>(
+        ObservedValues[MoleculeRef])->forceUpdate();
+    // then tell Qt part about updates
+    emit positionChanged();
+    emit moleculeChanged();
+  } else {
+    switch (notification->getChannelNo()) {
+      case AtomObservable::IndexChanged:
+      {
+        emit indexChanged();
+        break;
+      }
+      case AtomObservable::BondsAdded:
+      case AtomObservable::BondsRemoved:
+        emit bondsChanged();
+        break;
+      case AtomObservable::ElementChanged:
+        emit elementChanged();
+        break;
+      case AtomObservable::MoleculeChanged:
+        emit moleculeChanged();
+        break;
+      case AtomObservable::NameChanged:
+        emit nameChanged();
+        break;
+      case AtomObservable::PositionChanged:
+        emit positionChanged();
+        break;
+      case AtomObservable::SelectionChanged:
+        emit selectedChanged();
+        break;
+      default:
+        ASSERT(0, "QtObservedAtom::recieveNotification() - we are not signed on to channel "
+            +toString(notification->getChannelNo())+" of the atom.");
+        break;
     }
-    case AtomObservable::BondsAdded:
-    case AtomObservable::BondsRemoved:
-      emit bondsChanged();
-      break;
-    case AtomObservable::ElementChanged:
-      emit elementChanged();
-      break;
-    case AtomObservable::MoleculeChanged:
-      emit moleculeChanged();
-      break;
-    case AtomObservable::NameChanged:
-      emit nameChanged();
-      break;
-    case AtomObservable::PositionChanged:
-      emit positionChanged();
-      break;
-    case AtomObservable::SelectionChanged:
-      emit selectedChanged();
-      break;
-    default:
-      ASSERT(0, "QtObservedAtom::recieveNotification() - we are not signed on to channel "
-          +toString(notification->getChannelNo())+" of the atom.");
-      break;
   }
 }
@@ -309 +321 @@
   } else
     signedOffChannels = AllsignedOnChannels;
+
+  WorldTime::getInstance().signOn(this, WorldTime::TimeChanged);
 }
 
@@ -324 +338 @@
       board.markObservedAtomAsDisconnected(getIndex());
   }
+
+  WorldTime::getInstance().signOff(this, WorldTime::TimeChanged);
 }