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

Timestamp:

01/23/08 06:32:46 (17 years ago)

Author:

bittner

Message:

moving objects partially functional

Location:

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

Files:

• QtGlRenderer.cpp (modified) (8 diffs)
• QtGlRenderer.h (modified) (2 diffs)

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

@@ -17 +17 @@
 #include "IntersectableWrapper.h"
 #include "LogWriter.h"
-
+#include "RayCaster.h"
 
 
@@ -664 +664 @@
 }
 
+void QtGlRendererWidget::mouseReleaseEvent(QMouseEvent *e)
+{
+
+  if (e->modifiers() & Qt::AltModifier) 
+        if (mCurrentDynamicObjectIdx >= 0) {
+          //      preprocessor->ScheduleUpdateDynamicObjects();
+        }
+}
+
 void
 QtGlRendererWidget::mouseMoveEvent(QMouseEvent *e)
@@ -722 +731 @@
                         tmi->ApplyWorldTransform(tm);
 #else
-                        SceneGraphLeaf *l = mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
+                        SceneGraphLeaf *l =
+                          mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
                         l->ApplyTransform(tm);
+                        
 #endif
                         updateGL();
@@ -744 +755 @@
 }
 
-void
-QtGlRendererWidget::mouseReleaseEvent(QMouseEvent *)
-{
-}
 
 void
@@ -1021 +1028 @@
         connect(mControlWidget, SIGNAL(SetRotation(bool)), this, SLOT(SetRotation(bool)));
         connect(mControlWidget, SIGNAL(SetScale(bool)), this, SLOT(SetScale(bool)));
-        
+
+        connect(mControlWidget, SIGNAL(UpdateDynamicObjects()), this, SLOT(UpdateDynamicObjects()));
+
         setWindowTitle("PVS Visualization");
 
@@ -1091 +1100 @@
         ++ mCurrentDynamicObjectIdx;
 
-        if (mViewCellsManager->GetPreprocessor()->LoadDynamicGeometry(filename))
-                cout << "Loading finished" << endl;
-        else
-                cerr << "Loading failed" << endl;
-
+        if (mViewCellsManager->GetPreprocessor()->LoadDynamicGeometry(filename)) {
+          
+          cout << "Loading finished" << endl;
+        } else
+          cerr << "Loading failed" << endl;
+        
     updateGL();
 }
@@ -1742 +1752 @@
 
         vbox2->addStretch(1);
+
+
+        QPushButton *button = new QPushButton("Update", groupBox);
+        vbox2->addWidget(button);
+        connect(button, SIGNAL(clicked()), SIGNAL(UpdateDynamicObjects()));
+        
+        
         groupBox->setLayout(vbox2);
-
+        
         return groupBox;
 }
-
 
 
@@ -2373 +2389 @@
 }
 
-}
+void
+QtGlRendererWidget::UpdateDynamicObjects()
+{
+  preprocessor->ScheduleUpdateDynamicObjects();
+  
+}
+
+}

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

@@ -108 +108 @@
 
   signals:
-
+  void UpdateDynamicObjects();
   void ComputeVisibility();
   void StopComputation();
@@ -310 +310 @@
 
 public slots:
-
+void UpdateDynamicObjects();
         void UpdateAllPvs();
         void ComputeVisibility();