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

Timestamp:

01/10/08 02:43:33 (17 years ago)

Author:

mattausch

Message:

worked on ray viz

Location:

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

Files:

• QtGlRenderer.cpp (modified) (7 diffs)
• QtGlRenderer.h (modified) (4 diffs)

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

@@ -717 +717 @@
                 if (1 && mShowRays) 
                 {
-                        RenderRays(mViewCellsManager->mVizBuffer.GetRays());
+                        RenderRays(mViewCellsManager->mVizBuffer.GetRays(), mRayVisualizationMethod);
                 }
         }
@@ -880 +880 @@
         mSpatialFilterSize = 0.01;
         mPvsSize = 0;
+        mRayVisualizationMethod = 0;
         mRenderError = 0.0f;
         mShowRays = false;
@@ -925 +926 @@
         connect(mControlWidget, SIGNAL(SetShowWeightedTriangles(bool)), this, SLOT(SetShowWeightedTriangles(bool)));
 
+        connect(mControlWidget, SIGNAL(UseConstColorForRayViz(bool)), this, SLOT(UseConstColorForRayViz(bool)));
+        connect(mControlWidget, SIGNAL(UseRayLengthForRayViz(bool)), this, SLOT(UseRayLengthForRayViz(bool)));
+        connect(mControlWidget, SIGNAL(SetShowContribution(bool)), this, SLOT(SetShowContribution(bool)));
+        connect(mControlWidget, SIGNAL(SetShowDistribution(bool)), this, SLOT(SetShowDistribution(bool)));
+
+
         connect(mControlWidget,
                 SIGNAL(SetShowRays(bool)),
@@ -1543 +1550 @@
         QRadioButton *rb1, *rb2, *rb3, *rb4, *rb5;
         
+        rb1 = new QRadioButton("wireframe", parent);
+        rb1->setText("wireframe");
+        connect(rb1, SIGNAL(toggled(bool)), SIGNAL(SetShowWireFrame(bool)));
+
         // Create a check box to be in the group box
-        rb1 = new QRadioButton("piercing rays", parent);
-        rb1->setText("piercing rays");
+        rb2 = new QRadioButton("piercing rays", parent);
+        rb2->setText("piercing rays");
         //vl->addWidget(rb1);
-        connect(rb1, SIGNAL(toggled(bool)), SIGNAL(SetShowPiercingRays(bool)));
-
-        rb2 = new QRadioButton("pvs size", parent);
-        rb2->setText("pvs size");
-        connect(rb2, SIGNAL(toggled(bool)), SIGNAL(SetShowPvsSizes(bool)));
-
-        rb3 = new QRadioButton("wireframe", parent);
-        rb3->setText("wireframe");
+        connect(rb2, SIGNAL(toggled(bool)), SIGNAL(SetShowPiercingRays(bool)));
+
+        rb3 = new QRadioButton("pvs size", parent);
+        rb3->setText("pvs size");
+        connect(rb3, SIGNAL(toggled(bool)), SIGNAL(SetShowPvsSizes(bool)));
         
         rb4 = new QRadioButton("weighted rays", parent);
@@ -1565 +1573 @@
 
         QGroupBox *groupBox = new QGroupBox("Visualization options");
-
-        QVBoxLayout *vbox2 = new QVBoxLayout;
-    
-        vbox2->addWidget(rb3);
-        vbox2->addWidget(rb1);
-        vbox2->addWidget(rb2);
-        vbox2->addWidget(rb4);
-        vbox2->addWidget(rb5);
-        
-        rb3->setChecked(true);
-
-        vbox2->addStretch(1);
-        groupBox->setLayout(vbox2);
-
-        return groupBox;
-}
-
-
-
-QGroupBox *QtRendererControlWidget::CreateRenderCostPanel(QWidget *parent)
-{
-        QRadioButton *rb1, *rb2, *rb3;
-        
-        // Create a check box to be in the group box
-        rb1 = new QRadioButton("triangles", parent);
-        rb1->setText("triangles");
-        //vl->addWidget(rb1);
-        connect(rb1, SIGNAL(toggled(bool)), SIGNAL(SetShowWeightedTriangles(bool)));
-
-        rb2 = new QRadioButton("distance weighted pvs", parent);
-        rb2->setText("distance weighted");
-        connect(rb2, SIGNAL(toggled(bool)), SIGNAL(SetShowDistanceWeightedPvs(bool)));
-
-        rb3 = new QRadioButton("distance weighted triangles", parent);
-        rb3->setText("distance weighted triangles");
-        connect(rb3, SIGNAL(toggled(bool)), SIGNAL(SetShowDistanceWeightedTriangles(bool)));
-
-        QGroupBox *groupBox = new QGroupBox("Render cost options");
 
         QVBoxLayout *vbox2 = new QVBoxLayout;
@@ -1609 +1579 @@
         vbox2->addWidget(rb2);
         vbox2->addWidget(rb3);
-        
-        rb2->setChecked(true);
+        vbox2->addWidget(rb4);
+        vbox2->addWidget(rb5);
+        
+        rb1->setChecked(true);
+
+        vbox2->addStretch(1);
+        groupBox->setLayout(vbox2);
+
+        return groupBox;
+}
+
+
+
+QGroupBox *QtRendererControlWidget::CreateRenderCostPanel(QWidget *parent)
+{
+        QRadioButton *rb1, *rb2, *rb3;
+        
+        // Create a check box to be in the group box
+        rb1 = new QRadioButton("triangles", parent);
+        rb1->setText("triangles");
+        connect(rb1, SIGNAL(toggled(bool)), SIGNAL(SetShowWeightedTriangles(bool)));
+
+        rb2 = new QRadioButton("distance weighted pvs", parent);
+        rb2->setText("distance weighted");
+        connect(rb2, SIGNAL(toggled(bool)), SIGNAL(SetShowDistanceWeightedPvs(bool)));
+
+        rb3 = new QRadioButton("distance weighted triangles", parent);
+        rb3->setText("distance weighted triangles");
+        connect(rb3, SIGNAL(toggled(bool)), SIGNAL(SetShowDistanceWeightedTriangles(bool)));
+
+        QGroupBox *groupBox = new QGroupBox("Render cost options");
+
+        QVBoxLayout *vbox2 = new QVBoxLayout;
+    
+        vbox2->addWidget(rb1);
+        vbox2->addWidget(rb2);
+        vbox2->addWidget(rb3);
+        
+        rb1->setChecked(true);
+
+        vbox2->addStretch(1);
+        groupBox->setLayout(vbox2);
+
+        return groupBox;
+}
+
+
+QGroupBox *QtRendererControlWidget::CreateRayVisualizationPanel(QWidget *parent)
+{
+        QRadioButton *rb1, *rb2, *rb3, *rb4;
+        
+        // Create a check box to be in the group box
+        rb1 = new QRadioButton("const color", parent);
+        rb1->setText("const color");
+        //vl->addWidget(rb1);
+        connect(rb1, SIGNAL(toggled(bool)), SIGNAL(UseConstColorForRayViz(bool)));
+
+        rb2 = new QRadioButton("ray length", parent);
+        rb2->setText("ray length");
+        connect(rb2, SIGNAL(toggled(bool)), SIGNAL(UseRayLengthForRayViz(bool)));
+        
+        rb3 = new QRadioButton("contribution", parent);
+        rb3->setText("contribution");
+        connect(rb3, SIGNAL(toggled(bool)), SIGNAL(SetShowContribution(bool)));
+        
+        rb4 = new QRadioButton("distribution", parent);
+        rb4->setText("distribution");
+        connect(rb4, SIGNAL(toggled(bool)), SIGNAL(SetShowDistribution(bool)));
+
+        QGroupBox *groupBox = new QGroupBox("Ray visualization options");
+        QVBoxLayout *vbox2 = new QVBoxLayout;
+    
+        vbox2->addWidget(rb1);
+        vbox2->addWidget(rb2);
+        vbox2->addWidget(rb3);
+        vbox2->addWidget(rb4);
+        
+        rb1->setChecked(true);
 
         vbox2->addStretch(1);
@@ -1740 +1786 @@
         QGroupBox *groupBox2 = CreateRenderCostPanel(hbox);
         vh->addWidget(groupBox2, 0, 0);
+
+        
+        QGroupBox *groupBox3 = CreateRayVisualizationPanel(hbox);
+        vh->addWidget(groupBox3, 0, 0);
 
         //////////////////////////////////

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

@@ -98 +98 @@
   
   QGroupBox *CreateRenderCostPanel(QWidget *parent);
+  QGroupBox *CreateRayVisualizationPanel(QWidget *parent);
 
 
@@ -141 +142 @@
   void SetShowWeightedTriangles(bool);
   void SetShowDistanceWeightedPvs(bool);
+
+  void UseConstColorForRayViz(bool);
+  void UseRayLengthForRayViz(bool);
+  void SetShowContribution(bool);
+  void SetShowDistribution(bool);
 };
 
@@ -195 +201 @@
         Vector3 mDummyViewPoint;
 
+        int mRayVisualizationMethod;
+
         QtRendererControlWidget *mControlWidget;
 
@@ -430 +438 @@
                 mShowWeightedTriangles = b;
                 updateGL();
+        }
+
+        void UseConstColorForRayViz(bool b)
+        {
+                mRayVisualizationMethod = 0;
+        }
+    
+        void UseRayLengthForRayViz(bool b)
+        {
+                mRayVisualizationMethod = 1;
+        }
+
+        void SetShowContribution(bool b)
+        {
+                mRayVisualizationMethod = 2;
+        }
+    
+        void SetShowDistribution(bool b)
+        {
+                mRayVisualizationMethod = 3;
         }