Changeset 561 for trunk/geant4/OpenGLQT_exemple/src

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

Location:

trunk/geant4/OpenGLQT_exemple/src

Files:

• glwidget.cpp (modified) (5 diffs)
• glwidget.h (modified) (4 diffs)
• window.cpp (modified) (3 diffs)
• window.h (modified) (2 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()

trunk/geant4/OpenGLQT_exemple/src/glwidget.h

@@ -11 +11 @@
      GLWidget(QWidget *parent = 0);
      ~GLWidget();
+     void initializeGL();
+     void initialize();
+     void resizeGL(int width, int height);
+     void paintGL();
 
-     QSize minimumSizeHint() const;
-     QSize sizeHint() const;
+/*      QSize minimumSizeHint() const; */
+/*      QSize sizeHint() const; */
 
-/*  public slots: */
-/*      void setXRotation(int angle); */
-/*      void setYRotation(int angle); */
-/*      void setZRotation(int angle); */
+ protected:
+     void setXRotation(int angle);
+     void setYRotation(int angle);
+     void setZRotation(int angle);
 
 /*  signals: */
@@ -25 +29 @@
 /*      void zRotationChanged(int angle); */
 
- protected:
-     void initializeGL();
-     void paintGL();
-     void resizeGL(int width, int height);
-/*      void mousePressEvent(QMouseEvent *event); */
-/*      void mouseMoveEvent(QMouseEvent *event); */
+     void mousePressEvent(QMouseEvent*);
+     void mouseMoveEvent(QMouseEvent*);
+     void normalizeAngle(int *angle);
 
  private:
@@ -37 +38 @@
                GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4);
      void extrude(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
-     void normalizeAngle(int *angle);
 
      GLuint object;
@@ -43 +43 @@
      int yRot;
      int zRot;
+     float reelXRot;
+     float realYRot;
+     float realZRot;
      QPoint lastPos;
      QColor trolltechGreen;

trunk/geant4/OpenGLQT_exemple/src/window.cpp

@@ -4 +4 @@
  #include "window.h"
 
- Window::Window()
+Window::Window(): QDialog(0,Qt::Dialog)
  {
    printf("Window::Window 1\n");
@@ -22 +22 @@
 
      QHBoxLayout *mainLayout = new QHBoxLayout;
+
      mainLayout->addWidget(glWidget);
    printf("Window::Window 3\n");
@@ -51 +52 @@
 //      return slider;
 //  }
+
+void Window::mousePressEvent(QMouseEvent *event)
+{
+  printf("Window::mousePressEvent \n");
+}
+
+void Window::mouseReleaseEvent(QMouseEvent *event)
+{
+  printf("Window::mouseReleaseEvent \n");
+}
+
+void Window::mouseMoveEvent(QMouseEvent *event)
+{
+  printf("Window::mouseMoveEvent \n");
+  //  int dx = event->x() - lastPos.x();
+  //  int dy = event->y() - lastPos.y();
+  
+  //  if (event->buttons() & Qt::LeftButton) {
+  //  } else if (event->buttons() & Qt::RightButton) {
+  //  }
+}

trunk/geant4/OpenGLQT_exemple/src/window.h

@@ -3 +3 @@
 
  #include <QWidget>
+ #include <QMenuBar>
+ #include <QDialog>
 
  class QSlider;
  class GLWidget;
 
- class Window : public QWidget
+ class Window : public QDialog
  {
-/*      Q_OBJECT */
+      Q_OBJECT
 
  public:
@@ -15 +17 @@
 
  private:
+  void mousePressEvent(QMouseEvent*);
+  void mouseReleaseEvent(QMouseEvent*);
+  void mouseMoveEvent(QMouseEvent*);
 /*      QSlider *createSlider(); */
 
-     GLWidget *glWidget;
+  GLWidget *glWidget;
+  QMenuBar *menuBar;
+
 /*      QSlider *xSlider; */
 /*      QSlider *ySlider; */