Changeset 1616 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

10/13/06 03:28:42 (18 years ago)

Author:

mattausch

Message:

some shit happen

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ViewCellsManager.cpp (modified) (6 diffs)
• ViewCellsParser.cpp (modified) (1 diff)

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

@@ -608 +608 @@
         ViewCellsManager *vm = NULL;
 
-        if (parser.ParseViewCellsFile(filename, &vm, objects, bconverter))
-        {
-                const long startTime = GetTime();
-
+        const long startTime = GetTime();
+        bool success = parser.ParseViewCellsFile(filename, &vm, objects, bconverter);
+
+        if (success)
+        {
                 vm->ResetViewCells();
 
@@ -621 +622 @@
                         // create the meshes and compute volumes
                         vm->FinalizeViewCells(true);
-                        //                      vm->mViewCellsTree->AssignRandomColors();
+                        // vm->mViewCellsTree->AssignRandomColors();
                 }
 
@@ -3909 +3910 @@
         Debug << "\nView cells after merge:\n" << mCurrentViewCellsStats << endl;
         
-        if (1) // export merged view cells
+        if (mShowVisualization) // export merged view cells
         {
                 mColorCode = 0;
@@ -3940 +3941 @@
         }
 
-        if (1) 
+        if (mShowVisualization) 
         {
                 // use pvs size for color coding
@@ -3977 +3978 @@
 {
         mRenderer->RenderScene();
+
         SimulationStatistics ss;
         dynamic_cast<RenderSimulator *>(mRenderer)->GetStatistics(ss);
@@ -4703 +4705 @@
                 volume += lVol;
 
-        CreateMesh(*it);
+                if (createMesh)
+                        CreateMesh(*it);
         }
 

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

@@ -271 +271 @@
         // all bounding boxes gathered in this step => 
         // associate object ids with bounding boxes
-        long startTime = GetTime();
+        const long startTime = GetTime();
         
         if (mBoundingBoxConverter)