Changeset 1787 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.h

Timestamp:

11/24/06 12:05:28 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.h (modified) (3 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.h

@@ -75 +75 @@
 
 
-class LocalMergeLeaf: public LocalMergeNode
-{
-public:
-        LocalMergeLeaf(ViewCell *vc): mViewCell(vc) {};
-        virtual ~LocalMergeLeaf() {};
-        virtual bool IsLeaf() const { return true; }
-
-        ViewCell *mViewCell;
-};
-
-
-class LocalMergeInterior: public LocalMergeNode
-{
-public:
-        
-        virtual ~LocalMergeInterior() {DEL_PTR(mLeft); DEL_PTR(mRight);}
-        virtual bool IsLeaf() const { return false; }
-
-        LocalMergeNode *mLeft;
-        LocalMergeNode *mRight;
-};
-
-
-class LocalMergeTree
-{
-public:
-
-        LocalMergeTree(const ViewCellContainer &viewCells);
-        
-        void Merge(ObjectPvs &mergedPvs);
-
-protected:
-
-        void Merge(LocalMergeNode *node, ObjectPvs &mergedPvs);
-        LocalMergeNode *Subdivide(const int leftIdx, const int rightIdx);
-
-        LocalMergeNode *mRoot;
-        const ViewCellContainer &mViewCells;
-};
-
-
 /**     Manages different higher order operations on the view cells.
 */
@@ -505 +464 @@
         /** Efficiently merges the view cells in the container.
         */
-        void MergeViewCellsEfficient(ObjectPvs &pvs, const ViewCellContainer &viewCells) const;
+        void MergeViewCellsRecursivly(ObjectPvs &pvs, 
+                                                                  const ViewCellContainer &viewCells) const;
 
 
@@ -606 +566 @@
 
 protected:
+
+        void MergeViewCellsRecursivly(ObjectPvs &pvs, 
+                                                                  const ViewCellContainer &viewCells, 
+                                                                  const int leftIdx, 
+                                                                  const int rightIdx) const;
 
         /** Intersects box with the tree and returns the number of intersected boxes.