Changeset 2542 for GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface

Timestamp:

08/20/07 12:51:12 (17 years ago)

Author:

mattausch

Message:

 

File:

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

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -462 +462 @@
                         if (mUseSpatialFilter) 
                         {
-                                // 9.11. 2006 -> experiment with new spatial filter
-#if 0
-                                mViewCellsManager->ApplySpatialFilter(mKdTree,
-                                        mSpatialFilterSize*
-                                        Magnitude(mViewCellsManager->GetViewSpaceBox().Size()),
-                                        mPvsCache.mPvs);
-#else
-                                //cout<<"updating filter" << endl;
                                 // mSpatialFilter size is in range 0.001 - 0.1
                                 mViewCellsManager->ApplyFilter2(viewcell,
-                                        mUseFilter,
-                                        100 * mSpatialFilterSize,
-                                        mPvsCache.mPvs,
-                                        &mPvsCache.filteredBoxes
-                                        );
-#endif
-                        } 
+                                                                    mUseFilter,
+                                                                                                100 * mSpatialFilterSize,
+                                                                                                mPvsCache.mPvs,
+                                                                                                &mPvsCache.filteredBoxes);
+                        }
                         else
                         {
@@ -496 +486 @@
                 if (mUseSpatialFilter && mRenderBoxes) 
                 {
-                        for (int i=0; i < mPvsCache.filteredBoxes.size(); i++)
+                        for (int i=0; i < mPvsCache.filteredBoxes.size(); ++ i)
+                        {
                                 RenderBox(mPvsCache.filteredBoxes[i]);
+                        }
                 } 
                 else 
@@ -507 +499 @@
                         else
                         {
+                                mPvsSize = mPvsCache.mPvs.GetSize();
+
                                 ObjectPvsIterator it = mPvsCache.mPvs.GetIterator();
 
-                                mPvsSize = mPvsCache.mPvs.GetSize();
-                                for (; it.HasMoreEntries(); ) 
+                                while (it.HasMoreEntries())
                                 {
                                         Intersectable *object = it.Next(pvsData);