Changes in src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.hpp [e39e7a:6fe4f7]

File:

• src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_molecule.hpp (modified) (4 diffs)

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

@@ -24 +24 @@
 #include "GLMoleculeObject_bond.hpp"
 
-#include "molecule.hpp"
-
 class atom;
 class bond;
 class GLMoleculeObject_atom;
 class GLWorldScene;
+class molecule;
 
 class GLMoleculeObject_molecule : public GLMoleculeObject, public Observer
@@ -110 +109 @@
   typedef std::set<atomId_t> atoms_t;
 
-  molecule::BoundingBoxInfo initBoundingBox() const;
+  /** Structure for the required information on the bounding box.
+   *
+   */
+  struct BoundingBoxInfo {
+    //!> position of center
+    Vector position;
+    //!> radius of sphere
+    double radius;
+  };
+
+  /** Structure for the required information on the tesselation hull.
+   *
+   */
+  struct TesselationHullInfo {
+  };
+
+  BoundingBoxInfo initBoundingBox() const;
 
   QGeometryData updateTesselationHull() const;
-  molecule::BoundingBoxInfo updateBoundingBox() const;
+  BoundingBoxInfo updateBoundingBox() const;
   atoms_t updateAtoms();
   moleculeId_t updateIndex() const;
@@ -138 +153 @@
   boost::function<std::string ()> MolNameUpdater;
   boost::function<QGeometryData ()> TesselationHullUpdater;
-  boost::function<molecule::BoundingBoxInfo ()> BoundingBoxUpdater;
+  boost::function<BoundingBoxInfo ()> BoundingBoxUpdater;
   boost::function<atoms_t ()> PresentAtomsUpdater;
 
@@ -148 +163 @@
   Cacheable<QGeometryData> TesselationHull;
   //!> contains newest version of the bounding box on request
-  ObservedValue<molecule::BoundingBoxInfo> BoundingBox;
+  ObservedValue<BoundingBoxInfo> BoundingBox;
   //!> contains the current live set of atoms for the molecule
   ObservedValue<atoms_t> PresentAtoms;