Changeset 561 for trunk/geant4/OpenGLQT_exemple/src/glwidget.cpp

Timestamp:

Aug 14, 2007, 12:27:44 PM (17 years ago)

Author:

garnier

Message:

r563@mac-90108: laurentgarnier | 2007-08-14 12:28:16 +0200
mise a jour suite au plantage de svk (cheksum error) suite au crash du DD en juin

File:

• trunk/geant4/OpenGLQT_exemple/src/glwidget.cpp (modified) (5 diffs)

trunk/geant4/OpenGLQT_exemple/src/glwidget.cpp

@@ -7 +7 @@
 
  GLWidget::GLWidget(QWidget *parent)
-     : QGLWidget(parent)
+     : QGLWidget()
  {
    printf("GLWidget::GLWidget \n");
@@ -20 +20 @@
  }
 
+ void  GLWidget::initialize() {
+   printf("GLWidget::Initialise \n");
+ }
+
  GLWidget::~GLWidget()
  {
@@ -28 +32 @@
  }
 
- QSize GLWidget::minimumSizeHint() const
- {
-   printf("GLWidget::minimumSizeHint \n");
-     return QSize(50, 50);
- }
-
- QSize GLWidget::sizeHint() const
- {
-   printf("GLWidget::SizeHint \n");
-     return QSize(400, 400);
- }
-
-//  void GLWidget::setXRotation(int angle)
+//  QSize GLWidget::minimumSizeHint() const
 //  {
-//      normalizeAngle(&angle);
-//      if (angle != xRot) {
-//          xRot = angle;
-//          emit xRotationChanged(angle);
-//          updateGL();
-//      }
+//    printf("GLWidget::minimumSizeHint \n");
+//      return QSize(50, 50);
 //  }
 
-//  void GLWidget::setYRotation(int angle)
+//  QSize GLWidget::sizeHint() const
 //  {
-//      normalizeAngle(&angle);
-//      if (angle != yRot) {
-//          yRot = angle;
-//          emit yRotationChanged(angle);
-//          updateGL();
-//      }
+//    printf("GLWidget::SizeHint \n");
+//      return QSize(400, 400);
 //  }
 
-//  void GLWidget::setZRotation(int angle)
-//  {
-//      normalizeAngle(&angle);
-//      if (angle != zRot) {
-//          zRot = angle;
-//          emit zRotationChanged(angle);
-//          updateGL();
-//      }
-//  }
+ void GLWidget::setXRotation(int angle)
+ {
+     normalizeAngle(&angle);
+     if (angle != xRot) {
+         xRot = angle;
+         //         emit xRotationChanged(angle);
+         updateGL();
+     }
+ }
+
+ void GLWidget::setYRotation(int angle)
+ {
+     normalizeAngle(&angle);
+     if (angle != yRot) {
+         yRot = angle;
+         //         emit yRotationChanged(angle);
+         updateGL();
+     }
+ }
+
+ void GLWidget::setZRotation(int angle)
+ {
+     normalizeAngle(&angle);
+     if (angle != zRot) {
+         zRot = angle;
+         //         emit zRotationChanged(angle);
+         updateGL();
+     }
+ }
 
  void GLWidget::initializeGL()
@@ -87 +91 @@
      glLoadIdentity();
      glTranslated(0.0, 0.0, -10.0);
-     glRotated(xRot / 16.0, 1.0, 0.0, 0.0);
-     glRotated(yRot / 16.0, 0.0, 1.0, 0.0);
-     glRotated(zRot / 16.0, 0.0, 0.0, 1.0);
+     glRotated(xRot / 16, 1.0, 0.0, 0.0);
+     glRotated(yRot / 16, 0.0, 1.0, 0.0);
+     glRotated(zRot / 16, 0.0, 0.0, 1.0);
      glCallList(object);
    printf("GLWidget::paintGL END\n");
@@ -102 +106 @@
      glMatrixMode(GL_PROJECTION);
      glLoadIdentity();
-     glOrtho(-0.5, +0.5, +0.5, -0.5, 4.0, 15.0);
+     glOrtho(-1., +1., -1., +1., -10., 15.0);
      glMatrixMode(GL_MODELVIEW);
    printf("GLWidget::resizeGL END\n");
  }
 
-//  void GLWidget::mousePressEvent(QMouseEvent *event)
-//  {
-//      lastPos = event->pos();
-//  }
-
-//  void GLWidget::mouseMoveEvent(QMouseEvent *event)
-//  {
-//      int dx = event->x() - lastPos.x();
-//      int dy = event->y() - lastPos.y();
-
-//      if (event->buttons() & Qt::LeftButton) {
-//          setXRotation(xRot + 8 * dy);
-//          setYRotation(yRot + 8 * dx);
-//      } else if (event->buttons() & Qt::RightButton) {
-//          setXRotation(xRot + 8 * dy);
-//          setZRotation(zRot + 8 * dx);
-//      }
-//      lastPos = event->pos();
-//  }
+ void GLWidget::mousePressEvent(QMouseEvent *event)
+ {
+   printf("GLWidget::mousePress \n");
+     lastPos = event->pos();
+   printf("GLWidget::mousePress END\n");
+ }
+
+ void GLWidget::mouseMoveEvent(QMouseEvent *event)
+ {
+   printf("GLWidget::mouseEvent \n");
+     int dx = event->x() - lastPos.x();
+     int dy = event->y() - lastPos.y();
+
+     if (event->buttons() & Qt::LeftButton) {
+   printf("GLWidget::mouseEvent Left 1\n");
+         setXRotation(xRot + 8 * dy);
+   printf("GLWidget::mouseEvent Left 2\n");
+         setYRotation(yRot + 8 * dx);
+   printf("GLWidget::mouseEvent Left 3\n");
+     } else if (event->buttons() & Qt::RightButton) {
+   printf("GLWidget::mouseEvent Right 1\n");
+         setXRotation(xRot + 8 * dy);
+   printf("GLWidget::mouseEvent Right 2\n");
+         setZRotation(zRot + 8 * dx);
+   printf("GLWidget::mouseEvent Right 3\n");
+     }
+     lastPos = event->pos();
+   printf("GLWidget::mouseEvent END\n");
+ }
 
  GLuint GLWidget::makeObject()