Changeset 2581 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

01/09/08 10:42:39 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• LogReader.h (modified) (1 diff)
• LogWriter.cpp (modified) (1 diff)
• QtGlRenderer.cpp (modified) (5 diffs)
• QtGlRenderer.h (modified) (1 diff)

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

@@ -18 +18 @@
 {
         int mPiercingRays;
+        int mPvsSize;
 };
 

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

@@ -34 +34 @@
         ViewCellInfoContainer::const_iterator vit, vit_end = infos.end();
 
+        myfile << numSamples << endl;
+
         for (vit = infos.begin(); vit != vit_end; ++ vit)
         {
-                myfile << (*vit).mPiercingRays;
+                myfile << (*vit).mPiercingRays << " " << (*vit).mPvsSize << endl;
+                //myfile << (*vit);
                 //ViewCell *vc = *vit;
                 //myfile << "vc: " << vc->GetPvs().GetSize() << " " << vc->GetNumPiercingRays();

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

@@ -846 +846 @@
         mRenderVisibilityEstimates = false;
 
+        mHistRecorded = false;
+
         mHideByCost = false;
         mUseTransparency = false;
@@ -1345 +1347 @@
         }
 
-        int i;
-
-        //mRecordHist = false;
-        mRecordHist = true;
-        mNextSamples = 2000000;
+        mNextSamples = 200000;
 
         ViewCellContainer &viewcells = mViewCellsManager->GetViewCells();
@@ -1355 +1353 @@
         //cout << "current samples: " << currentSamples << endl;
 
-        if (mRecordHist && (currentSamples > mNextSamples))
-        {
+        if (!mHistRecorded && (currentSamples > mNextSamples))
+        {
+                mHistRecorded = true;
+
                 //mNextSamples += SAMPLES_INCR;
-cout<<"************************************************" << endl;
+                cout<<"************************************************" << endl;
                 cout << "reached " << currentSamples << " samples " << " => writing file" << endl;
                 //ViewCellInfoContainer newContainer;
@@ -1369 +1369 @@
                 writer.SetFilename("compare.log");
                 writer.Write(mNextSamples, mCurrentInfo);
+
                 cout << "finished writing file" << endl;
         }
@@ -1377 +1378 @@
         ComputeMaxValues(viewcells, maxPvs, maxPiercingRays, maxRelativeRays, maxRcCost);
 
+        int i;
 
         if (!mShowPvsSizes && !mShowPiercingRays && !mShowWeightedRays && !mShowWeightedCost)

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

@@ -189 +189 @@
         /// the next number of samples where we record the data
         int mNextSamples;
-        bool mRecordHist;
+        bool mHistRecorded;
 
         // some statistics