Changeset 2577 for GTP

Timestamp:

01/07/08 02:50:59 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface

Files:

• QtGlRenderer.cpp (modified) (3 diffs)
• QtGlRenderer.h (modified) (3 diffs)

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

@@ -1298 +1298 @@
 
 
+
+void QtGlRendererWidget::FillNewContainer(const ViewCellContainer &viewCells, ViewCellInfoContainer &infos)
+{
+        ViewCellContainer::const_iterator vit, vit_end = viewCells.end();
+
+        for (vit = viewCells.begin(); vit != vit_end; ++ vit)
+        {
+        ViewCell *vc = *vit;
+                ViewCellInfo info;
+
+                info.mPiercingRays = vc->GetNumPiercingRays();
+
+                infos.push_back(info);
+                //myfile << "vc: " << vc->GetPvs().GetSize() << " " << vc->GetNumPiercingRays();
+        }
+}
+
+
+
 void QtGlRendererWidget::RenderViewCells()
 {
@@ -1322 +1341 @@
         int i;
 
+        mRecordHist = false;
+        //mRecordHist = true;
+
         ViewCellContainer &viewcells = mViewCellsManager->GetViewCells();
         
+        if (mRecordHist && (mSamples > mNextSamples))
+        {
+                mNextSamples += 2000000;
+
+                ViewCellInfoContainer *newContainer = new ViewCellInfoContainer();
+
+                FillNewContainer(viewcells, *newContainer);
+                mCurrentHist[mNextSamples] = newContainer;
+        }
+
         int maxPvs, maxPiercingRays;
         float maxRelativeRays, maxRcCost;
@@ -1378 +1410 @@
                 }
 
-                ViewCellInfoContainer *infos1 = mCurrentInfos[mCurrentSamples];
-                ViewCellInfoContainer *infos2 = mCompareInfos[mCurrentSamples];
-
                 if (mAssignImportanceByRelativeValue)
                         AssignImportanceByRelativeValue(viewcells, maxPvs, maxPiercingRays, maxRelativeRays, maxRcCost);
                 else
+                {
+                        ViewCellInfoContainer *infos1 = mCurrentHist[mCurrentSamples];
+                        ViewCellInfoContainer *infos2 = mCompareHist[mCurrentSamples];
                         AssignColorByComparison(viewcells, *infos1, *infos2);
+                }
+
 
                 glEnable(GL_DEPTH_TEST);        

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

@@ -179 +179 @@
         bool mShowWeightedTriangles;
 
+        /// the current number of samples
+        int mSamples;
+        /// the next number of samples where we record the data
+        int mNextSamples;
+        bool mRecordHist;
+
         // some statistics
         int mPvsSize;
@@ -196 +202 @@
         int mCurrentSamples;
 
-        ViewCellHistoryContainer mCurrentInfos;
-        ViewCellHistoryContainer mCompareInfos;
+        ViewCellHistoryContainer mCurrentHist;
+        ViewCellHistoryContainer mCompareHist;
 
 
@@ -207 +213 @@
 
         QtGlRendererWidget() {};
+
+        void FillNewContainer(const ViewCellContainer &viewCells, ViewCellInfoContainer &infos);
+
 
         void SetThread(QtPreprocessorThread *t) {