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

Timestamp:

12/11/07 09:01:13 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GtpVisibility05.vcproj (added)
• GtpVisibility05.vcproj.UNKNOWN.matt.user (added)
• QtInterface/QtGlRenderer.cpp (modified) (14 diffs)
• QtInterface/QtGlRenderer.h (modified) (6 diffs)

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

@@ -739 +739 @@
                                 target.x, target.y, target.z,
                                 up.x, up.y, up.z);
-                } else {
-                        float dist = Magnitude(mSceneGraph->GetBox().Diagonal())*mTopDistance;
+                } 
+                else 
+                {
+                        float dist = Magnitude(mSceneGraph->GetBox().Diagonal()) * mTopDistance;
                         Vector3 pos = mViewPoint  + dist*Vector3(0,
                                 1,
@@ -880 +882 @@
         connect(mControlWidget, SIGNAL(SetSceneCut(int)), this, SLOT(SetSceneCut(int)));
         connect(mControlWidget, SIGNAL(SetTopDistance(int)), this, SLOT(SetTopDistance(int)));
+        connect(mControlWidget, SIGNAL(SetTransparency(int)), this, SLOT(SetTransparency(int)));
 
         connect(mControlWidget, SIGNAL(SetVisibilityFilterSize(int)), this, SLOT(SetVisibilityFilterSize(int)));
@@ -1146 +1149 @@
 {
         mHidingCost = (float)number / 1000.0f;
-        cout << "hiding cost " << mHidingCost << endl;
+        //cout << "hiding cost " << mHidingCost << endl;
 }
 
@@ -1154 +1157 @@
 {
         mTopDistance = number/1000.0f;
+        updateGL();
+}
+
+void
+QtGlRendererWidget::SetTransparency(int number)
+{
+        mTransparency = number/1000.0f;
         updateGL();
 }
@@ -1200 +1210 @@
                         maxPiercingRays = piercingRays;
         }
-
-        cout << "here22 " << mHideByCost << " " << mHidingCost << endl;
 
         if (!mShowPvsSizes && !mShowPiercingRays)
@@ -1341 +1349 @@
         slider->setValue(200);
 
-
         connect(slider, SIGNAL(valueChanged(int)), SIGNAL(SetViewCellGranularity(int)));
+
+        ///////////////////////////
 
         label = new QLabel("Transfer function");
@@ -1357 +1366 @@
         connect(slider, SIGNAL(valueChanged(int)), SIGNAL(SetTransferFunction(int)));
 
-        {
-                QPushButton *button = new QPushButton("Update all PVSs", vbox);
-                vbox->layout()->addWidget(button);
-                connect(button, SIGNAL(clicked()), SLOT(UpdateAllPvs()));
-        }
-
+        ////////////////////////////////////////7
+
+
+        QPushButton *button = new QPushButton("Update all PVSs", vbox);
+        vbox->layout()->addWidget(button);
+        connect(button, SIGNAL(clicked()), SLOT(UpdateAllPvs()));
+
+
+        ////////////////////////////////////////77777
 
         label = new QLabel("Filter size");
@@ -1377 +1389 @@
 
 
+        //////////////////////////////////////////
+
         label = new QLabel("Spatial Filter size");
         vbox->layout()->addWidget(label);
@@ -1390 +1404 @@
 
 
+        ///////////////////////////////////
+
 
         QWidget *hbox = new QWidget(vbox);
@@ -1416 +1432 @@
         connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetShowRays(bool)));
 
-        
         cb = new QCheckBox("Show piercing rays", hbox);
         hlayout->addWidget(cb);
         cb->setChecked(false);
         connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetShowPiercingRays(bool)));
+
+
+        QButtonGroup *qbuttongroup = new QButtonGroup(hbox);//, "RenderingGroupBox");
+        //qbuttongroup->setTitle(i18n("Rendering options"));
+        /*qbuttongroup->setColumnLayout(0, Qt::Vertical);
+        qbuttongroup->layout()->setSpacing(0);
+        qbuttongroup->layout()->setMargin(0);
+*/
+        // Create a layout to organize the widgets.
+/*      QVBoxLayout *qvboxlayout = new QVBoxLayout(qbuttongroup->layout());
+        qvboxlayout->setAlignment(Qt::AlignTop)
+        qvboxlayout->setSpacing(6);
+        qvboxlayout->setMargin(11);
+*/
+        QRadioButton *rb;
+
+        // Create a check box to be in the group box
+        rb = new QRadioButton("piercing rays", hbox);
+        rb->setText("here71");
+        //qvboxlayout->addWidget(rb);
+
+        // Create another check box to the group box
+/*      m_qradiobuttonStartFile = new QRadioButton("startFile", hbox);
+        m_qradiobuttonStartFile->setText(i18n( "Start with last file used" ) );
+        qvboxlayout->addWidget(mRadiobuttonStartFile);
+*/
+
+        //////////////////////////////////
+
+
+        /*cb = new QRadiobox("Top View", vbox);
+        vbox->layout()->addWidget(cb);
+        cb->setChecked(false);
+        connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetTopView(bool)));
+*/
 
         vbox->resize(800,150);
@@ -1448 +1498 @@
         connect(slider, SIGNAL(valueChanged(int)), SIGNAL(SetSceneCut(int)));
 
+        
+        cb = new QCheckBox("Hide view cells by render cost ", vbox);
+        vbox->layout()->addWidget(cb);
+        cb->setChecked(false);
+        connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetHideByCost(bool)));
+
+        ////////////////////////////
+
+        const int range = 1000;
+
+        label = new QLabel("Hide by cost");
+        vbox->layout()->addWidget(label);
+
+        // the render cost visualization
+        slider = new QSlider(Qt::Horizontal, vbox);
+        vbox->layout()->addWidget(slider);
+        slider->show();
+        slider->setRange(0, range);
+        slider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+        slider->setValue(0);
+        connect(slider, SIGNAL(valueChanged(int)), SIGNAL(SetHidingCost(int)));
+
+        ///////////////////////////////////////////
+
+        cb = new QCheckBox("Top View", vbox);
+        vbox->layout()->addWidget(cb);
+        cb->setChecked(false);
+        connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetTopView(bool)));
+
+
+        label = new QLabel("Top distance");
+        vbox->layout()->addWidget(label);
+        
+        slider = new QSlider(Qt::Horizontal, vbox);
+        vbox->layout()->addWidget(slider);
+        slider->show();
+        slider->setRange(1, 1000);
+        slider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+        slider->setValue(500);
+
+        connect(slider, SIGNAL(valueChanged(int)), SIGNAL(SetTopDistance(int)));
+        
+
+        ///////////////////////////////////////////
+
+        cb = new QCheckBox("Transparency", vbox);
+        vbox->layout()->addWidget(cb);
+        cb->setChecked(false);
+        connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetTransparency(bool)));
+
+        label = new QLabel("Use transparency");
+        vbox->layout()->addWidget(label);
+
+        // the render cost visualization
+        slider = new QSlider(Qt::Horizontal, vbox);
+        vbox->layout()->addWidget(slider);
+        slider->show();
+        slider->setRange(0, range);
+        slider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+        slider->setValue(0);
+
+        connect(slider, SIGNAL(valueChanged(int)), SIGNAL(SetTransparency(int)));
+
+        //////////////////////////////
+
 
         cb = new QCheckBox("Cut scene", vbox);
@@ -1493 +1608 @@
 
 
-
-
-        slider = new QSlider(Qt::Horizontal, vbox);
-        vbox->layout()->addWidget(slider);
-        slider->show();
-        slider->setRange(1, 1000);
-        slider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-        slider->setValue(500);
-
-        connect(slider, SIGNAL(valueChanged(int)), SIGNAL(SetTopDistance(int)));
-
-        cb = new QCheckBox("Top View", vbox);
-        vbox->layout()->addWidget(cb);
-        cb->setChecked(false);
-        connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetTopView(bool)));
-
-
-
         vbox = new QGroupBox("PVS Errors", this);
         layout()->addWidget(vbox);
@@ -1517 +1614 @@
         vbox->setLayout(vl);
 
-        QPushButton *button = new QPushButton("Compute Visibility", vbox);
+        button = new QPushButton("Compute Visibility", vbox);
         vbox->layout()->addWidget(button);
         connect(button, SIGNAL(clicked()), SLOT(ComputeVisibility()));
@@ -1545 +1642 @@
                         SLOT(PvsErrorClicked(const QModelIndex &)));
 
-                QPushButton *button = new QPushButton("Next Error Frame", vbox);
+                button = new QPushButton("Next Error Frame", vbox);
                 vbox->layout()->addWidget(button);
                 connect(button, SIGNAL(clicked(void)), SLOT(FocusNextPvsErrorFrame(void)));
         }
 
-        // the render cost visualization
-        slider = new QSlider(Qt::Horizontal, vbox);
-        vbox->layout()->addWidget(slider);
-        slider->show();
-        slider->setRange(0, 1000);
-        slider->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-        slider->setValue(100);
-        connect(slider, SIGNAL(valueChanged(int)), SIGNAL(SetHidingCost(int)));
         
-        cb = new QCheckBox("Hide view cells by render cost ", vbox);
-        vbox->layout()->addWidget(cb);
-        cb->setChecked(false);
-        connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetHideByCost(bool)));
+        //mHidingCost = 0.1f;
 
         setWindowTitle("Preprocessor Control Widget");

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

@@ -102 +102 @@
   void SetVisibilityFilterSize(int);
   void SetSpatialFilterSize(int);
+  void SetTransparency(int);
 
   void SetShowRays(bool);
@@ -119 +120 @@
 
   void SetHideByCost(bool);
+  void SetTransparency(bool);
 };
 
@@ -152 +154 @@
         float mTopDistance;
 
+        float mTransparency;
+
         // some statistics
         int mPvsSize;
@@ -284 +288 @@
 
         void
+                SetTransparency(int dist);
+
+        void
                 SetHidingCost(int dist);
 
@@ -317 +324 @@
 
         void SetCutViewCells(bool b) {
-                std::cout << "here64" << std::endl;
-
                 mCutViewCells = b;
                 updateGL();
@@ -328 +333 @@
 
         void SetHideByCost(bool b) {
-                std::cout << "here45" << std::endl;
                 mHideByCost = b;
                 updateGL();