Changeset 2715 for GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

Timestamp:

05/27/08 10:57:05 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -574 +574 @@
         DynamicObjectsContainer::const_iterator dit, dit_end = mDynamicPvsObjects.end();
 
+        //cout << "dynamic objects in pvs " << mDynamicPvsObjects.size() << endl;;
+
         for (dit = mDynamicPvsObjects.begin(); dit != dit_end; ++ dit)
         {
                 _RenderDynamicObject(*dit);
         }
+
+        glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
         // show placed dynamic objects as wireframe
         Preprocessor *p = mViewCellsManager->GetPreprocessor();
-        dit, dit_end = p->mDynamicObjects.end();
+        dit_end = p->mDynamicObjects.end();
 
         int i = 0;
@@ -591 +595 @@
                         glColor3f(0, 1, 0);
 
-                glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
                 _RenderDynamicObject(*dit);
-                glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-        }
+        }
+        
+        glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 }
 
@@ -2002 +2006 @@
     
         QVBoxLayout *vbox2 = new QVBoxLayout;
-        QGroupBox *groupBox = new QGroupBox("Trafo types");
+        QGroupBox *groupBox = new QGroupBox("Dynamic Obojects");
 
         vbox2->addWidget(rb1);
@@ -2021 +2025 @@
         connect(button, SIGNAL(clicked()), SIGNAL(DeleteDynamicObject()));
         
+        button = new QPushButton("Next object", groupBox);
+        vbox2->layout()->addWidget(button);
+        connect(button, SIGNAL(clicked()), SIGNAL(NextObject()));
+
         groupBox->setLayout(vbox2);
         
@@ -2398 +2406 @@
 #endif
 
-
-        
-
 #if REMOVE_TEMPORARY
         
@@ -2438 +2443 @@
         connect(button, SIGNAL(clicked()), SIGNAL(ComputeGVS()));
 #endif
-
-#if 1   
+        
         button = new QPushButton("Replay view points", vbox);
         vbox->layout()->addWidget(button);
         connect(button, SIGNAL(clicked()), SIGNAL(ReplayViewPoints()));
 
-#endif
-
-        button = new QPushButton("Next object", vbox);
-        vbox->layout()->addWidget(button);
-        connect(button, SIGNAL(clicked()), SIGNAL(NextObject()));
-        //connect(button, SIGNAL(clicked()), SIGNAL(LoadObject()));
 
         /*cb = new QCheckBox("Stats", vbox);
@@ -2631 +2629 @@
                 if (mUseRandomColorPerPvsObject)
                 {
-                        KdIntersectable *kdint = static_cast<KdIntersectable *>(obj);
-
-                        if (kdint->mGenericIdx == -1)
+                        if (obj->Type() == Intersectable::KD_INTERSECTABLE)
                         {
-                                kdint->mGenericIdx = (int)mColors.size();
-                                mColors.push_back(RandomColor(0, 1));
+                                KdIntersectable *kdint = static_cast<KdIntersectable *>(obj);
+
+                                if (kdint->mGenericIdx == -1)
+                                {
+                                        kdint->mGenericIdx = (int)mColors.size();
+                                        mColors.push_back(RandomColor(0, 1));
+                                }
+                                color = mColors[kdint->mGenericIdx];
                         }
-                        color = mColors[kdint->mGenericIdx];
                 } 
                 else