Changeset 873 for trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc

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

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (24 diffs)

trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc

@@ -36 +36 @@
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 
-//#define GEANT4_QT_DEBUG
-
 #include "G4OpenGLQtViewer.hh"
 
@@ -88 +86 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::SetView ++++++++++++++++++++\n");
-#endif
-  //   if(!fHDC) return;
-  //   if(!fHGLRC) return;
-  //   ::wglMakeCurrent(fHDC,fHGLRC);
-  //  fWindow->makeCurrent();
+#ifdef G4DEBUG
+  printf("G4OpenGLQtViewer::SetView\n");
+#endif
   G4OpenGLViewer::SetView ();
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::SetView --------------------\n");
-#endif
 }
 
@@ -126 +117 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::ShowView  +++++++++++++++++++++\n");
-#endif
   if (!GLWindow) {
     G4cerr << "Visualization window not defined, please choose one before\n" << G4endl;
@@ -137 +125 @@
     GLWindow->activateWindow();
 #endif
-#ifdef GEANT4_QT_DEBUG
-    printf("G4OpenGLQtViewer::ShowView -----------------------\n");
-#endif
   }
   glFlush ();
-  //   // Empty the Windows message queue :
-  //   MSG event;
-  //   while ( ::PeekMessage(&event, NULL, 0, 0, PM_REMOVE) ) {
-  //     ::TranslateMessage(&event);
-  //     ::DispatchMessage (&event);
-  //   }
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-void G4OpenGLQtViewer::CreateGLQtContext (
-) 
-//////////////////////////////////////////////////////////////////////////////
-//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
-{
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::CreateGLQtContext \n");
-#endif
-}
+}
+
+
 
 
@@ -174 +142 @@
 
   if(fWindow) return; //Done.
-#ifdef GEANT4_QT_DEBUG
+#ifdef G4DEBUG
   printf("G4OpenGLQtViewer::CreateMainWindow glWidget\n");
 #endif
+
+  // check if it is already launched, 
+  // if not, we suppose that the G4Qt is not launch.
+  //  bool isReady = G4Qt::Inited();
 
   // launch Qt if not
@@ -219 +191 @@
 
     if (found==false) {
-#ifdef GEANT4_QT_DEBUG
+#ifdef G4DEBUG
       printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist, but not found\n");
 #endif
@@ -225 +197 @@
     }
   } else {
-#ifdef GEANT4_QT_DEBUG
+#ifdef G4DEBUG
     printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist\n");
 #endif
@@ -263 +235 @@
 
   if(!fWindow) return;
-#ifdef GEANT4_QT_DEBUG
+#ifdef G4DEBUG
   printf("G4OpenGLQtViewer::CreateMainWindow glWidget END\n");
 #endif
@@ -276 +248 @@
  */
 // void G4OpenGLQtViewer::dialogClosed() {
-// #ifdef GEANT4_QT_DEBUG
-//   printf("G4OpenGLQtViewer::dialogClosed END\n");
-// #endif
 //   //  GLWindow = NULL;
 // }
@@ -328 +297 @@
   fLastEventTime = new QTime();
 
-#ifdef GEANT4_QT_DEBUG
+#ifdef G4DEBUG
   printf("G4OpenGLQtViewer::G4OpenGLQtViewer END\n");
 #endif
@@ -343 +312 @@
 #else
   G4cout <<removeTempFolder().toStdString().c_str() <<G4endl;
-#endif
-
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::~G4OpenGLQtViewer \n");
 #endif
 }
@@ -577 +542 @@
     mDrawing->clear();
   }
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer:: fDrawingWireframe 1\n");
-#endif
   QObject ::connect(fDrawingWireframe, 
                     SIGNAL(activated()),
                     this, 
                     SLOT(actionDrawingWireframe()));
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer:: fDrawingWireframe 2\n");
-#endif
   QObject ::connect(fDrawingLineRemoval, 
                     SIGNAL(activated()),
@@ -860 +819 @@
 }
 
-void G4OpenGLQtViewer::manageContextMenuEvent(QContextMenuEvent *e)
+
+void G4OpenGLQtViewer::G4resizeGL(
+ int aWidth
+,int aHeight)
+{  
+  setupViewport(aWidth,aHeight);
+  
+  if (((WinSize_x != (G4int)aWidth)) || (WinSize_y != (G4int) aHeight)) {
+    hasToRepaint =true;
+  }
+  WinSize_x = (G4int) aWidth;
+  WinSize_y = (G4int) aHeight;
+}
+
+
+void G4OpenGLQtViewer::G4manageContextMenuEvent(QContextMenuEvent *e)
 {
   if (!GLWindow) {
@@ -948 +922 @@
  */
 void G4OpenGLQtViewer::actionMousePick() {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::actionMousePick \n");
-#endif
   emit toggleMouseAction(STYLE3);
 }
@@ -1480 +1451 @@
   }
   
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::actionSaveImage() \n");
-#endif
 }
 
 
 void G4OpenGLQtViewer::actionMovieParameters() {
-
   showMovieParametersDialog();
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::actionMovieParameters() \n");
-#endif
 }
 
@@ -1528 +1492 @@
 
 
+void G4OpenGLQtViewer::FinishView()
+{
+   glFlush ();
+   fWindow->swapBuffers ();
+}
 
 /**
@@ -1533 +1502 @@
    @param p mouse click point
 */
-#if QT_VERSION < 0x040000
-void G4OpenGLQtViewer::G4MousePressEvent(QPoint p)
-#else
-void G4OpenGLQtViewer::G4MousePressEvent(QPoint p)
-#endif
+void G4OpenGLQtViewer::G4MousePressEvent(QMouseEvent *event)
 {
-  fAutoMove = false; // stop automove
-  fLastPos1 = p;
-  fLastPos2 = fLastPos1;
-  fLastPos3 = fLastPos2;
-  fLastEventTime->start();
-  if (fMouseAction == STYLE3){  // pick
-    Pick(p.x(),p.y());
+#if QT_VERSION < 0x040000
+  if ((event->button() & Qt::LeftButton)
+      && !((event->state() & Qt::ShiftButton)
+           || (event->state() & Qt::ControlButton)
+           || (event->state() & Qt::AltButton)
+           || (event->state() & Qt::MetaButton))) {
+#else
+  if ((event->buttons() & Qt::LeftButton)
+      && !((event->modifiers() & Qt::ShiftModifier)
+           || (event->modifiers() & Qt::ControlModifier)
+           || (event->modifiers() & Qt::AltModifier)
+           || (event->modifiers() & Qt::MetaModifier))) {
+#endif
+    fWindow->setMouseTracking(true);
+    fAutoMove = false; // stop automove
+    fLastPos1 = event->pos();
+    fLastPos2 = fLastPos1;
+    fLastPos3 = fLastPos2;
+    fLastEventTime->start();
+    if (fMouseAction == STYLE3){  // pick
+      Pick(event->pos().x(),event->pos().y());
+    }
   }
 }
@@ -1553 +1533 @@
 void G4OpenGLQtViewer::G4MouseReleaseEvent()
 {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::mouseRealease() %d,%d  %d,%d  %d,%d\n",fLastPos1.x(),fLastPos1.y(),fLastPos2.x(),fLastPos2.y(),fLastPos3.x(),fLastPos3.y());
-#endif
   fSpinningDelay = fLastEventTime->elapsed();
   QPoint delta = (fLastPos3-fLastPos1);
   if ((delta.x() == 0) && (delta.y() == 0)) {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::mouseRealease() EXIT 1 \n");
-#endif
     return;
   }
@@ -1579 +1553 @@
         lastMoveTime.start();
         cycles = 1 ;
-        //      }
       ((QApplication*)G4Qt::getInstance ())->processEvents();
-#ifdef GEANT4_QT_DEBUG
-        printf("G4OpenGLQtViewer::mouseRealease() cycle :%d \n",lastMoveTime.elapsed());
-#endif
       cycles ++ ;
     }
   }
+  fWindow->setMouseTracking(false);
+
+}
+
+
+void G4OpenGLQtViewer::G4MouseDoubleClickEvent()
+{
+  fWindow->setMouseTracking(true);
 }
 
@@ -1597 +1575 @@
 */
 
-#if QT_VERSION < 0x040000
-void G4OpenGLQtViewer::G4MouseMoveEvent(int pos_x, int pos_y,Qt::ButtonState mButtons)
-#else
-  void G4OpenGLQtViewer::G4MouseMoveEvent(int pos_x, int pos_y,Qt::MouseButtons mButtons)
-#endif
+void G4OpenGLQtViewer::G4MouseMoveEvent(QMouseEvent *event)
 {
+
+  
+#if QT_VERSION < 0x040000
+  Qt::ButtonState mButtons = event->state();
+#else
+  Qt::MouseButtons mButtons = event->buttons();
+#endif
 
   if (fAutoMove) {
@@ -1610 +1591 @@
   fLastPos3 = fLastPos2;
   fLastPos2 = fLastPos1;
-  fLastPos1 = QPoint(pos_x, pos_y);
+  fLastPos1 = QPoint(event->x(), event->y());
 
   int deltaX = fLastPos2.x()-fLastPos1.x();
@@ -1720 +1701 @@
 ,int aHeight
 ){
-#ifdef GEANT4_QT_DEBUG
-  printf("should rescale \n");
-#endif
   //  GLfloat* feedback_buffer;
   //  GLint returned;
@@ -1803 +1781 @@
 {
   // FIXME
-#ifdef GEANT4_QT_DEBUG
-  printf("saving EPS\n");
-#endif
 
   FILE* fp;
@@ -2006 +1981 @@
   fVP.SetZoomFactor(fVP.GetZoomFactor()+(fVP.GetZoomFactor()*(event->delta())/1200)); 
   updateQWidget();
-
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::wheel event  +++++++++++++++++++++ %f %d\n",fVP.GetZoomFactor(),event->delta());
-#endif
 }