Context Navigation

-              r65c323
+              r494478
 #include <Qt3D/qgeometrydata.h>
+#include <vector>
+#include <boost/any.hpp>
+#include "UIElements/Qt4/InstanceBoard/QtObservedMolecule.hpp"
+#include <map>
 #include <boost/function.hpp>
 #include "CodePatterns/Cacheable.hpp"
+#include "CodePatterns/Observer/Observer.hpp"
+#include "CodePatterns/ObservedValue.hpp"
+#include "CodePatterns/Observer/Observable.hpp"
 #include "GLMoleculeObject_bond.hpp"
 #include "molecule.hpp"
+#include "types.hpp"
 class atom;
 class bond;
+class molecule;
 class GLMoleculeObject_atom;
 class GLWorldScene;
 class QtObservedInstanceBoard;
 class GLMoleculeObject_molecule : public GLMoleculeObject, public Observer
+class GLMoleculeObject_molecule : public GLMoleculeObject
+{
   Q_OBJECT
 …
   GLMoleculeObject_molecule(
       QObject *parent,
+      const moleculeId_t molid,
+      QtObservedInstanceBoard * _board,
+      std::vector<boost::any> _ObservedValues);
+      QtObservedInstanceBoard &_board,
+      QtObservedMolecule::ptr _ObservedMolecule);
   GLMoleculeObject_molecule(
       QGLSceneNode *mesh[],
       QObject *parent,
+      const moleculeId_t molid,
+      QtObservedInstanceBoard * _board,
+      std::vector<boost::any> _ObservedValues);
+      QtObservedInstanceBoard &_board,
+      QtObservedMolecule::ptr _ObservedMolecule);
   virtual ~GLMoleculeObject_molecule();
-  // Observer functions
-  void update(Observable *publisher);
-  void subjectKilled(Observable *publisher);
-  void recieveNotification(Observable *publisher, Notification_ptr notification);
   void initialize(QGLView *view, QGLPainter *painter);
 …
   void atomClicked(atomId_t no);
   void moleculeClicked(moleculeId_t no);
-  void TesselationHullChanged();
-  void BoundingBoxChanged();
   void IsSelectedChanged();
-  void AtomInserted(const atomId_t _id);
-  void AtomRemoved(const atomId_t _id);
-  void IdChanged();
 private slots:
 …
   void setVisible(bool value);
-  void activateObserver();
-  void deactivateObserver();
   void resetTesselationHull();
   void resetBoundingBox();
   void resetIndex();
-  void resetName();
   void AtomSelected(const atomId_t _id);
 …
 private:
-  static const molecule * const getMolecule(const moleculeId_t _id);
-  void init(const moleculeId_t _molid);
-private:
   void addAtomBonds(
       const bond::ptr &_bond,
 …
       );
+  void init(const moleculeId_t _molid);
   //!> typedef for the internal set of atoms
   typedef std::set<atomId_t> atoms_t;
-  static molecule::BoundingBoxInfo initBoundingBox();
-  QGeometryData updateTesselationHull() const;
-  static molecule::BoundingBoxInfo updateBoundingBox(
-      const boost::function<const moleculeId_t ()> &_getMolIndex);
-  static moleculeId_t updateIndex();
-  static std::string updateName(
-      const boost::function<const moleculeId_t ()> &_getMolIndex);
   /** Getter to contained atoms contained in \a ObservedValues.
 …
   atoms_t getPresentAtoms() const;
+private:
   //!> the Observable we are signed on, also indicates whether we are sign on (not NULL)
   const Observable * owner;
+  //!> internal variable for caching molecule ref in cstor
+  const molecule * const molref;
+  QGeometryData updateTesselationHull() const;
   //!> list of channels when tesselation hull needs to update
   static const Observable::channels_t HullChannels;
-  //!> list of channels when bounding box needs to update
-  static const Observable::channels_t BoundingBoxChannels;
-  //!> list of channels when the index needs to update
-  static const Observable::channels_t IndexChannels;
-  //!> list of channels when the name needs to update
-  static const Observable::channels_t NameChannels;
+private:
+  friend class QtObservedInstanceBoard;
+  /** Observed Values **/
+  //!> enumeration of observed values to match with entries in ObservedValues
+  enum ObservedTypes {
+    //!> contains the current molecule index
+    MolIndex,
+    //!> contains the current molecule name
+    MolName,
+    //!> contains newest version of the bounding box on request
+    BoundingBox,
+    //!> gives the size of the enumeration
+    MAX_ObservedTypes
+  };
+  //!> vector with all observed values
+  std::vector<boost::any> ObservedValues;
+  /** Initializes all \a _ObservedValues entries.
+   *
+   * \param _ObservedValues vector of ObservedValue to be filled
+   * \param _moid molecule id
+   * \param _molref reference to molecule
+   * \param _subjectKilled ref to function to call on subjectKilled()
+   */
+  static void initObservedValues(
+      std::vector<boost::any> &_ObservedValues,
+      const moleculeId_t _molid,
+      const molecule * const _molref,
+      const boost::function<void(const moleculeId_t)> &_subjectKilled);
+  /** Destroys all \a ObservedValues entries.
+   *
+   * \param _ObservedValues vector of ObservedValue to be destroyed
+   */
+  static void destroyObservedValues(
+      std::vector<boost::any> &_ObservedValues);
+  /** Getter to molecule index contained in \a ObservedValues.
+   *
+   * \return molecule's index
+   */
+  moleculeId_t getMolIndex() const;
+  /** Getter to molecule name contained in \a ObservedValues.
+   *
+   * \return molecule's name
+   */
+  std::string getMolName() const;
+  /** Getter to molecule's bounding box contained in \a ObservedValues.
+   *
+   * \return molecule's bounding box
+   */
+  molecule::BoundingBoxInfo getBoundingBox() const;
+  //!> counts how many ObservedValues have already been subjectKilled()
+  mutable size_t subjectKilledCount;
+private:
+  //!> internal variable for caching molecule ref in cstor
+  const molecule * const molref;
   boost::function<QGeometryData ()> TesselationHullUpdater;
 …
   atomId_t hoverAtomId;
+  //!> we get multiple subjectKilled(), count and call callback() only on last
+  const unsigned int AllsignedOnChannels;
+  unsigned int signedOnChannels;
+  QtObservedInstanceBoard &board;
   QtObservedInstanceBoard * board;
+  QtObservedMolecule::ptr ObservedMolecule;
 };

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

Context Navigation

Changeset 494478 for src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.hpp

Legend:

src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.hpp

Download in other formats: