Changeset 873 for trunk/source/visualization/OpenGL/include

Timestamp:

Oct 30, 2008, 5:47:35 PM (16 years ago)

Author:

garnier

Message:

Update in code, try to mutualise everything between Stored and immediate Qt Viewers

Location:

trunk/source/visualization/OpenGL/include

Files:

• G4OpenGLImmediateQtViewer.hh (modified) (1 diff)
• G4OpenGLQtViewer.hh (modified) (3 diffs)
• G4OpenGLStoredQtViewer.hh (modified) (2 diffs)

trunk/source/visualization/OpenGL/include/G4OpenGLImmediateQtViewer.hh

@@ -62 +62 @@
   void updateQWidget();
 
-private : 
-  int readyToPaint;
-  int nbPaint;
+protected:
+  void wheelEvent(QWheelEvent *event);
+  void mousePressEvent(QMouseEvent *event);
+  void mouseMoveEvent(QMouseEvent *event);
+  void mouseDoubleClickEvent(QMouseEvent *event);
+  void mouseReleaseEvent(QMouseEvent *event);
+  void contextMenuEvent(QContextMenuEvent *e);
+  void keyPressEvent (QKeyEvent * event); 
 };
 

trunk/source/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -106 +106 @@
   void CreateGLQtContext ();
   virtual void CreateMainWindow (QGLWidget*,QString);
-  void manageContextMenuEvent(QContextMenuEvent *e);
-#if QT_VERSION < 0x040000
-  void G4MousePressEvent(QPoint);
-#else
-  void G4MousePressEvent(QPoint);
-#endif
+  void G4resizeGL(int, int);
+  void G4manageContextMenuEvent(QContextMenuEvent *e);
+  void G4MousePressEvent(QMouseEvent *event);
   void G4MouseReleaseEvent();
-  void G4MouseDoubleClickEvent(QPoint p);
-#if QT_VERSION < 0x040000
-  void G4MouseMoveEvent(int, int, Qt::ButtonState);
-#else
-  void G4MouseMoveEvent(int, int, Qt::MouseButtons);
-#endif
+  void G4MouseDoubleClickEvent();
+  void G4MouseMoveEvent(QMouseEvent *event);
   void G4wheelEvent (QWheelEvent * event); 
   void G4keyPressEvent (QKeyEvent * event); 
@@ -124 +117 @@
   void rotateQtCamera(float, float);
   void moveScene(float, float, float,bool);
+  void FinishView();
 
 
@@ -140 +134 @@
   float fDeltaRotationAngleY;
   float fDeltaRotationAngleZ;
+
+  bool hasToRepaint;
+  bool readyToPaint;
+  bool zoomAction;
+  QPoint beginZoom;
+  QPoint endZoom;
 
 private:

trunk/source/visualization/OpenGL/include/G4OpenGLStoredQtViewer.hh

@@ -59 +59 @@
   void initializeGL ();
   void DrawView ();
-  void FinishView ();
   void resizeGL(int width,int height);
   void paintGL();
@@ -73 +72 @@
   void keyPressEvent (QKeyEvent * event); 
 
-private : 
-  bool hasToRepaint;
-  bool readyToPaint;
-  bool zoomAction;
-  int nbPaint;
-  QPoint beginZoom;
-  QPoint endZoom;
   //  QImage glBufferImage;
 };