Context Navigation

-              r59f1bc
+              r23221f
 private:
-  /** \note CountedObservedValues_t needs to contain a list in the second argument
-   * as the ObservedValuesContainer may fall behind when a single atom is created
-   * and destroyed a number of times in a row (e.g. in the undo/redo cases). This
-   * problem is inherent because on the one hand we keep the QtObservedAtom alive
-   * till the last moment, i.e. till the GUI does not need it anymore where the
-   * original instance may long have been removed from the World. On the other hand
-   * we instantiate the e.g. QtObservedAtom as soon as the observed atom is created.
-   */
+  /** Structure to contain the sequence of created observed memories.
+   *
+   * \note QtGUI may lag behind the creation/destruction of observed instances a
+   * lot but one after the other must be served. Here, we keep an additional
+   * iterator that indicates the current instance to be served.
+   */
+  struct RefCountedObserved
+  {
+    typedef std::pair<typename T::ptr, size_t> Value_t;
+    typedef std::deque<Value_t> Values_t;
+    /** Default cstor of RefCountedObservedValues.
+     *
+     * Make sure that currentvalue has some sensible default value.
+     */
+    RefCountedObserved() :
+      tobedestroyed(values.end()),
+      currentvalue(values.end())
+    {}
+    /** Default copy cstor of RefCountedObservedValues.
+     *
+     * \param _instance instance to copy
+     */
+    RefCountedObserved(const RefCountedObserved & _instance) :
+      values(_instance.values),
+      tobedestroyed(values.begin()),
+      currentvalue(values.begin())
+    {}
+    /** Cstor of RefCountedObservedValues.
+     *
+     * Make sure that currentvalue has some sensible default value.
+     *
+     * \param _value initial value for the list
+     */
+    RefCountedObserved(Value_t _value) :
+      values(1, _value),
+      tobedestroyed(values.begin()),
+      currentvalue(values.begin())
+    {}
+    bool empty() const
+    {
+      return values.empty();
+    }
+    void push_back(Value_t _value)
+    {
+      values.push_back(_value);
+      if (currentvalue == values.end())
+        currentvalue = values.end()--;
+      if (tobedestroyed == values.end())
+        tobedestroyed = currentvalue;
+    }
+    Value_t& getCurrentValue() const
+    {
+      ASSERT (currentvalue != values.end(),
+          "RefCountedObservedValues::getCurrentValue() - cannot get, no values present.");
+      return *currentvalue;
+    }
+    Value_t& getEraseCandidate() const
+    {
+      ASSERT (tobedestroyed != values.end(),
+          "RefCountedObservedValues::getCurrentValue() - cannot get, no values present.");
+      return *tobedestroyed;
+    }
+    void eraseCurrentValue()
+    {
+      ASSERT (tobedestroyed != values.end(),
+          "RefCountedObservedValues::eraseCurrentValue() - cannot erase, no values present.");
+      if (tobedestroyed == currentvalue)
+        ++currentvalue;
+      values.erase(tobedestroyed);
+      tobedestroyed = currentvalue;
+      // removal of this instance when both iterators point to end is done inside QtObservedInstanceBoard
+    }
+    //!> set of values
+    Values_t values;
+    //!> iterator on the value that is next gonna be destroyed
+    typename Values_t::iterator tobedestroyed;
+    //!> iterator on the current value that is served on get
+    typename Values_t::iterator currentvalue;
+  };
+  typedef std::map<id, RefCountedObserved > CountedObservedValues_t;
+  typedef std::map<id, typename T::ptr > CountedObservedValues_t;
   //!> internal vector of observed values
   CountedObservedValues_t ObservedValues;
   //!> typedef for the set with ids to be erase
   typedef std::set<id> MarkedForErase_t;
+  typedef std::set<id> MarkedSet_t;
   //!> marks ids marked for erase (i.e. all subjectKilled() received)
+  MarkedForErase_t MarkedForErase;
+  MarkedSet_t MarkedForErase;
+  //!> marks ids marked as connected (i.e. for later subjectKilled() received)
+  MarkedSet_t MarkedForConnected;
   //!> name used in describing the instance type
 …
    * \return true - no more signOn()s, false - else
    */
   bool checkRefCount(const id _id) const;
+  bool checkMarkedForConnected(const id _id) const;
   /** Internal function to check whether the vector of ObservedValue's

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 23221f for src/UIElements/Qt4/InstanceBoard/ObservedValuesContainer.hpp

Legend:

src/UIElements/Qt4/InstanceBoard/ObservedValuesContainer.hpp

Download in other formats: