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

Timestamp:

05/24/08 11:59:35 (17 years ago)

Author:

mattausch

Message:

enabled view cell visualization

Location:

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

Files:

• QtGlRenderer.cpp (modified) (5 diffs)
• QtGlViewer.cpp (modified) (2 diffs)

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

@@ -333 +333 @@
                         char filename[256];
                         //sprintf(filename, "error-frame-%04d-%0.5f.png", mFrame, pErrorPixels);
-                        sprintf(filename, "error-frame-%04d-%04d-%08d.png", mFrame, viewcell->GetId(), pixelCount);
+                        sprintf_s(filename, "error-frame-%04d-%04d-%08d.png", mFrame, viewcell->GetId(), pixelCount);
                         QImage im = toImage();
                         string str = mSnapPrefix + filename;
@@ -367 +367 @@
 
                                 im = toImage();
-                                sprintf(filename, "error-frame-%04d-%04d-%08d-pvs.png", mFrame, viewcell->GetId(), pixelCount);
+                                sprintf_s(filename, "error-frame-%04d-%04d-%08d-pvs.png", mFrame, viewcell->GetId(), pixelCount);
                                 str = mSnapPrefix + filename;
                                 qstr = str.c_str();
@@ -1004 +1004 @@
         switch (e->key()) 
         {
-case Qt::Key_E:
-        mRenderErrors = !mRenderErrors;
-        updateGL();
-        break;
-case Qt::Key_R:
-        mUseRandomColorPerPvsObject = !mUseRandomColorPerPvsObject;;
-        updateGL();
-        break;
-case Qt::Key_T:
-        mTopView = !mTopView;
-        SetupCameraProjection(width(), height());
-        updateGL();
-        break;
-case Qt::Key_V:
-        mRenderViewCells = !mRenderViewCells;
-        updateGL();
-        break;
-case Qt::Key_P:
-        // set random viewpoint
-        mViewCellsManager->GetViewPoint(mViewPoint);
-        updateGL();
-        break;
-case Qt::Key_S: {
-        // set view poitn and direction
-        QString text;
-        bool ok;
-        text.sprintf("%f %f %f", mViewPoint.x, mViewPoint.y, mViewPoint.z);
-        text = QInputDialog::getText(this,
-                "Enter a view point",
-                "",
-                QLineEdit::Normal,
-                text,
-                &ok);
-        if (!ok)
+        case Qt::Key_E:
+                mRenderErrors = !mRenderErrors;
+                updateGL();
                 break;
-
-        if (sscanf(text.toAscii(), "%f %f %f", &mViewPoint.x, &mViewPoint.y, &mViewPoint.z) == 3) {
-                text.sprintf("%f %f %f", mViewDirection.x, mViewDirection.y, mViewDirection.z);
+        case Qt::Key_R:
+                mUseRandomColorPerPvsObject = !mUseRandomColorPerPvsObject;;
+                updateGL();
+                break;
+        case Qt::Key_T:
+                mTopView = !mTopView;
+                SetupCameraProjection(width(), height());
+                updateGL();
+                break;
+        case Qt::Key_V:
+                mRenderViewCells = !mRenderViewCells;
+                updateGL();
+                break;
+        case Qt::Key_P:
+                // set random viewpoint
+                mViewCellsManager->GetViewPoint(mViewPoint);
+                updateGL();
+                break;
+        case Qt::Key_S: {
+                // set view poitn and direction
+                QString text;
+                bool ok;
+                text.sprintf("%f %f %f", mViewPoint.x, mViewPoint.y, mViewPoint.z);
                 text = QInputDialog::getText(this,
-                        "Enter a direction",
+                        "Enter a view point",
                         "",
                         QLineEdit::Normal,
@@ -1050 +1039 @@
                 if (!ok)
                         break;
-                if (sscanf(text.toAscii(), "%f %f %f", &mViewDirection.x,
-                        &mViewDirection.y, &mViewDirection.z) == 3) {
-                                updateGL();
+
+                if (sscanf_s(text.toAscii(), "%f %f %f", &mViewPoint.x, &mViewPoint.y, &mViewPoint.z) == 3) {
+                        text.sprintf("%f %f %f", mViewDirection.x, mViewDirection.y, mViewDirection.z);
+                        text = QInputDialog::getText(this,
+                                "Enter a direction",
+                                "",
+                                QLineEdit::Normal,
+                                text,
+                                &ok);
+                        if (!ok)
+                                break;
+                        if (sscanf_s(text.toAscii(), "%f %f %f", &mViewDirection.x,
+                                &mViewDirection.y, &mViewDirection.z) == 3) {
+                                        updateGL();
                         }
                         break;
-        }
-                                }
-default:
-        cerr << "unknown key" << endl;
-        e->ignore();
-        break;
+                }
+                                        }
+        default:
+                cerr << "unknown key" << endl;
+                e->ignore();
+                break;
         }
 }
@@ -2700 +2700 @@
         SetupCamera();
 
-        for (size_t i = 0; i < GetPreprocessor()->mDynamicObjects.size(); ++ i)
+        for (GLuint i = 0; i < GetPreprocessor()->mDynamicObjects.size(); ++ i)
         {
                 glLoadName(i);

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

@@ -60 +60 @@
 void QtGlViewer::RenderScene()
 {
-        GLfloat mat_ambient[]   = {  0.5, 0.5, 0.5, 1.0  };
+        GLfloat mat_ambient[]   = {0.5f, 0.5f, 0.5f, 1.0f};
         
         // mat_specular and mat_shininess are NOT default values
-        GLfloat mat_diffuse[]   = {  1.0, 1.0, 1.0, 1.0  };
-        GLfloat mat_specular[]  = {  0.3, 0.3, 0.3, 1.0  };
-        GLfloat mat_shininess[] = {  1.0  };
-
-        GLfloat light_ambient[]  = {  0.2f, 0.2f, 0.2f, 1.0f  };
-        GLfloat light_diffuse[]  = {  0.4f, 0.4f, 0.4f, 1.0f  };
-        GLfloat light_specular[] = {  0.3f, 0.3f, 0.3f, 1.0f };
+        GLfloat mat_diffuse[]   = {1.0f, 1.0f, 1.0f, 1.0f};
+        GLfloat mat_specular[]  = {0.3f, 0.3f, 0.3f, 1.0f};
+        GLfloat mat_shininess[] = {1.0f  };
+
+        GLfloat light_ambient[]  = {0.2f, 0.2f, 0.2f, 1.0f};
+        GLfloat light_diffuse[]  = {0.4f, 0.4f, 0.4f, 1.0f};
+        GLfloat light_specular[] = {0.3f, 0.3f, 0.3f, 1.0f};
 
         GLfloat lmodel_ambient[] = {0.3f, 0.3f, 0.3f, 1.0f};
@@ -75 +75 @@
 
         // set position of the light
-        GLfloat infinite_light[] = {1.0, 0.8, 1.0, 0.0};
+        GLfloat infinite_light[] = {1.0f, 0.8f, 1.0f, 0.0f};
         glLightfv (GL_LIGHT0, GL_POSITION, infinite_light);
 
         // set position of the light2
-        GLfloat infinite_light2[] = {-0.3, 1.5, 1.0, 0.0};
+        GLfloat infinite_light2[] = {-0.3f, 1.5f, 1.0f, 0.0f};
         glLightfv (GL_LIGHT1, GL_POSITION, infinite_light2);