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

File:

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

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

@@ -85 +85 @@
 const Observable::channels_t GLMoleculeObject_molecule::AtomsChannels(getAtomsChannels());
 const Observable::channels_t GLMoleculeObject_molecule::HullChannels(getAllAtomicChangesChannels());
-const Observable::channels_t GLMoleculeObject_molecule::BoundingBoxChannels(getAllAtomicChangesChannels());
+const Observable::channels_t GLMoleculeObject_molecule::BoundingBoxChannels(1, molecule::BoundingBoxChanged);
 const Observable::channels_t GLMoleculeObject_molecule::IndexChannels(1, molecule::IndexChanged);
 const Observable::channels_t GLMoleculeObject_molecule::NameChannels(1, molecule::MoleculeNameChanged);
@@ -403 +403 @@
 }
 
-GLMoleculeObject_molecule::BoundingBoxInfo GLMoleculeObject_molecule::initBoundingBox() const
-{
-  BoundingBoxInfo info;
+molecule::BoundingBoxInfo GLMoleculeObject_molecule::initBoundingBox() const
+{
+  molecule::BoundingBoxInfo info;
   info.position = zeroVec;
   info.radius = 0.;
@@ -411 +411 @@
 }
 
-GLMoleculeObject_molecule::BoundingBoxInfo GLMoleculeObject_molecule::updateBoundingBox() const
-{
-  BoundingBoxInfo info = BoundingBox.get();
+molecule::BoundingBoxInfo GLMoleculeObject_molecule::updateBoundingBox() const
+{
+  molecule::BoundingBoxInfo info = BoundingBox.get();
   const molecule * const _molecule = getMolecule(MolIndex.get());
   if (_molecule != NULL) {
@@ -472 +472 @@
 void GLMoleculeObject_molecule::resetBoundingBox()
 {
-  BoundingBoxInfo info = BoundingBox.get();
+  molecule::BoundingBoxInfo info = BoundingBox.get();
   setPosition(QVector3D(info.position[0], info.position[1], info.position[2]));
   setScale(info.radius + 0.3); // getBoundingSphere() only sees atoms as points, so make the box a bit bigger