Changeset 997 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

Timestamp:

05/31/06 10:04:05 (18 years ago)

Author:

mattausch

Message:

fixed bug for histogram
improved samplerenderer
todo: difference detectempty true / false

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp (modified) (3 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

@@ -1661 +1661 @@
         int pvsSize = 0;
 
-        if (vc->IsLeaf())
-        {
-                pvsSize = vc->GetPvs().GetSize();
-        }
-        
-
         Intersectable::NewMail();
 
         //////////////////////////
+        // for interiors, pvs can be stored using different methods
+
         switch (mViewCellsStorage)
         {
         case PVS_IN_LEAVES: //-- store pvs only in leaves
                 {                       
+                        // pvs is always stored directly in leaves
+                        if (vc->IsLeaf())
+                        {
+                                pvsSize = vc->GetPvs().GetSize();
+                                break;
+                        }
+        
+                        // the stored pvs size is the valid pvs size => just return scalar
                         if (vc->mPvsSizeValid)
                         {
@@ -1680 +1684 @@
                         }
         
-                        //-- if no valid pvs size stored as a scalar=> compute new pvs size
+                        //-- if no valid pvs size stored as a scalar => compute new pvs size
                         ViewCellContainer leaves;
                         CollectLeaves(vc, leaves);
@@ -1711 +1715 @@
                 {
                         ////////////////////////
-        //-- compressed pvs
+                        //-- compressed pvs
 
                         if (vc->mPvsSizeValid)
+                        {
                                 return vc->mPvsSize;
-
-                        // if no pvs size stored: compute
-        int pvsSize = 0;
-        ViewCell *root = vc;
-        
-        // also add pvs from this view cell to root
-        while (root->GetParent())
-        {
-                root = root->GetParent();
-                pvsSize += CountDiffPvs(root);
-        }
-
-        stack<ViewCell *> tstack;
-        tstack.push(vc);
-
-        while (!tstack.empty())
-        {
-                vc = tstack.top();
-                tstack.pop();
-
-                pvsSize += CountDiffPvs(vc);
-
-                if (!vc->IsLeaf())
-                {
-                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
-
-                        ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
-
-                        for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                        }
+
+                        // if no pvs size stored, compute new one
+                        int pvsSize = 0;
+                        ViewCell *root = vc;
+        
+                        // also add pvs from this view cell to root
+                        while (root->GetParent())
                         {
-                                tstack.push(*it);
-                        }               
-                }
-        }
+                                root = root->GetParent();
+                                pvsSize += CountDiffPvs(root);
+                        }
+
+                        stack<ViewCell *> tstack;
+                        tstack.push(vc);
+
+                        while (!tstack.empty())
+                        {
+                                vc = tstack.top();
+                                tstack.pop();
+        
+                                pvsSize += CountDiffPvs(vc);
+
+                                if (!vc->IsLeaf())
+                                {
+                                        ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(vc);
+
+                                        ViewCellContainer::const_iterator it, it_end = interior->mChildren.end();
+
+                                        for (it = interior->mChildren.begin(); it != it_end; ++ it)
+                                        {
+                                                tstack.push(*it);
+                                        }               
+                                }
+                        }
                         break;
                 }
         case PVS_IN_INTERIORS:
-        default:Debug << "in interiors: " << vc->mPvsSize << " $$ " << vc->GetPvs().GetSize() << endl;
+        default:
+                Debug << "in interiors: " << vc->mPvsSize << " $$ " << vc->GetPvs().GetSize() << endl;
                 pvsSize = vc->GetPvs().GetSize();               
         }