Changeset 1039 for trunk/source

Timestamp:

May 12, 2009, 5:26:25 PM (17 years ago)

Author:

garnier

Message:

remise a jour

Location:

trunk/source/visualization/OpenGL

Files:

• include/G4OpenGLViewer.hh (modified) (6 diffs)
• src/G4OpenGLImmediateQtViewer.cc (modified) (9 diffs)
• src/G4OpenGLQtViewer.cc (modified) (2 diffs)
• src/G4OpenGLStoredQtViewer.cc (modified) (9 diffs)
• src/G4OpenGLViewer.cc (modified) (8 diffs)
• src/G4OpenGLXViewer.cc (modified) (1 diff)
• src/G4OpenGLXmViewer.cc (modified) (1 diff)
• src/G4OpenGLXmWindowHandlingCallbacks.cc (modified) (2 diffs)

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

@@ -59 +59 @@
   virtual ~G4OpenGLViewer ();
   void SetView    ();
-  // Set view and lights, resize
-  void RepaintGLView();
-  // Refresh the view if needed
   void HaloingFirstPass ();
   void HaloingSecondPass ();
@@ -68 +65 @@
   void HLRThirdPass ();
   void InitializeGLView ();
-  void ResizeGLView(unsigned int, unsigned int);
-  // Resize the view and repaint if necessary
+  void ResizeGLView();
+  void ResizeWindow(unsigned int, unsigned int);
   void Pick(GLdouble x, GLdouble y);
   virtual void CreateFontLists () {}
@@ -75 +72 @@
 //////////////////////////////Vectored PostScript production functions///
   void printEPS();
-  // print EPS file. Depending of fVectoredPs, it will print Vectored or not  
-
+  // print EPS file. Depending of fVectoredPs, it will print Vectored or not
+  
   unsigned int getWinWidth();
+  G4bool sizeHasChanged();
+  // return true if size has change since last redraw
   unsigned int getWinHeight();
   GLdouble getSceneNearWidth();
@@ -87 +86 @@
   G4int                             fPrintSizeX;
   G4int                             fPrintSizeY;
-  G4bool                            fNeedRepaint;
-  // 0 : No need to repaint    1: Need Repaint
 
   G4OpenGLSceneHandler& fOpenGLSceneHandler;
@@ -109 +106 @@
 
 private :
+  unsigned int fWinSize_x, fWinSize_y;
   G4float                           fPointSize;
+  G4bool fSizeHasChanged;
+  // size of the OpenGL frame
   bool printGl2PS();
-  void ResizeGLView();
   GLubyte* grabPixels (int inColor,
                        unsigned int width,
@@ -120 +119 @@
   bool printVectoredEPS();
   // print vectored EPS files
-  unsigned int fWinSize_x, fWinSize_y;
-  // size of the OpenGL frame
 };
 

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

@@ -56 +56 @@
   setFocusPolicy(Qt::StrongFocus); // enable keybord events
 #endif
-
-  fNeedRepaint = false;
+  hasToRepaint =false;
 
   if (fViewId < 0) return;  // In case error in base class instantiation.
@@ -74 +73 @@
   CreateFontLists ();
 
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::Initialise END\n");
-#endif
   readyToPaint = true;
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::Initialise END 2\n");
-#endif
-
 }
 
 void G4OpenGLImmediateQtViewer::initializeGL () {
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::initializeGL\n");
-#endif
 
   InitializeGLView ();
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::initializeGL middle\n");
-#endif
 
 
@@ -106 +92 @@
 
   if (fSceneHandler.GetScene() == 0) {
-    fNeedRepaint = false;
+    hasToRepaint =false;
   } else {
-    fNeedRepaint = true;
-  }
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::initializeGL END\n");
-#endif
+    hasToRepaint =true;
+  }
 
 }
@@ -123 +106 @@
   printf("G4OpenGLImmediateQtViewer::DrawView  VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n");
 #endif
-
-  // avoid problems at initialisation
-  if (readyToPaint) {
-    ComputeView();
-  }
-  
+  // That's no the same logic as Stored Viewer, I don't know why...
+  // see G4OpenGLStoredQtViewer::DrawView for more informations
+
+  updateQWidget();
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLImmediateQtViewer::DrawView  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
@@ -138 +119 @@
 
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::ComputeView   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n");
+  printf("G4OpenGLImmediateQtViewer::ComputeView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",getWinWidth(), getWinHeight());
 #endif
   makeCurrent();
@@ -169 +150 @@
    
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::ComputeView  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
-#endif
-  fNeedRepaint = false;
+  printf("G4OpenGLImmediateQtViewer::ComputeView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",getWinWidth(), getWinHeight());
+#endif
+  hasToRepaint = true;
 }
 
@@ -194 +175 @@
 ,int aHeight)
 {  
-#ifdef G4DEBUG_VIS_OGL
-  printf("\n\nG4OpenGLImmediateQtViewer::resizeGL VVVVVV %d %d ??\n",aWidth,aHeight);
-#endif
-  ResizeGLView(aWidth,aHeight);
-#ifdef G4DEBUG_VIS_OGL
-  printf("\n\nG4OpenGLImmediateQtViewer::resizeGL END\n");
-#endif
+  ResizeWindow(aWidth,aHeight);
+  hasToRepaint = sizeHasChanged();
 }
 
@@ -206 +182 @@
 void G4OpenGLImmediateQtViewer::paintGL()
 {
-    
 #ifdef G4DEBUG_VIS_OGL
   printf("\n\nG4OpenGLImmediateQtViewer::paintGL ??\n");
 #endif
-  if (fNeedRepaint) {
-#ifdef G4DEBUG_VIS_OGL
-    printf("\n\nG4OpenGLImmediateQtViewer::Need ??\n");
-#endif
-    if (readyToPaint) {
-#ifdef G4DEBUG_VIS_OGL
-  printf("\n\nG4OpenGLImmediateQtViewer::ready ??\n");
-#endif
-      RepaintGLView();
-      fNeedRepaint = false;
+  if (!readyToPaint) {
+    readyToPaint= true;
+    return;
+  }
+  // DO NOT RESIZE IF SIZE HAS NOT CHANGE
+  if ( !hasToRepaint) {
+    if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (unsigned int) height())) {
+      return;
     }
-#ifdef G4DEBUG_VIS_OGL
-    else 
-      printf("\n\nG4OpenGLImmediateQtViewer::NOT ready ??\n");
-#endif
-  }
-#ifdef G4DEBUG_VIS_OGL
-  else
-    printf("\n\nG4OpenGLImmediateQtViewer::NOT need ??\n");
-#endif
-
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready\n\n\n");
+  }
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint);
+#endif
+
+  SetView();
+   
+  ClearView (); //ok, put the background correct
+  ComputeView();
+
+  hasToRepaint = false; // could be set to false by ComputeView
+
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n\n\n",readyToPaint);
 #endif
 }
@@ -277 +252 @@
 
 void G4OpenGLImmediateQtViewer::updateQWidget() {
-  fNeedRepaint = true;
+  hasToRepaint= true;
   updateGL();
-  fNeedRepaint = false;
+  hasToRepaint= false;
 }
 

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

@@ -173 +173 @@
   GLWindow->setWindowTitle( name);
 #endif
+  ResizeWindow(fVP.GetWindowSizeHintX(),fVP.GetWindowSizeHintY());
 
   //useful for MACOSX, we have to compt the menuBar height
@@ -182 +183 @@
     YPos = offset;
   }
-  GLWindow->resize(getWinWidth(),getWinHeight());
+  GLWindow->resize(getWinWidth(), getWinHeight());
   GLWindow->move(fVP.GetWindowAbsoluteLocationHintX(QApplication::desktop()->width()),YPos);
   GLWindow->show();

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

@@ -57 +57 @@
   setFocusPolicy(Qt::StrongFocus); // enable keybord events
 #endif
-  fNeedRepaint =false;
+  hasToRepaint =false;
 
   if (fViewId < 0) return;  // In case error in base class instantiation.
@@ -78 +78 @@
   
   readyToPaint = true;
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::Initialise END\n");
-#endif
 }
 
@@ -99 +96 @@
 
   if (fSceneHandler.GetScene() == 0) {
-    fNeedRepaint =false;
+    hasToRepaint =false;
   } else {
-    fNeedRepaint =true;
+    hasToRepaint =true;
   }
 
@@ -120 +117 @@
   // And we loose the redraw of things !
   
-  // avoid problems at initialisation
-  if (readyToPaint) {
-    ComputeView();
-  }
-
+  ComputeView();
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLStoredQtViewer::DrawView  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
@@ -133 +126 @@
 
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::ComputeView  VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n");
+  printf("G4OpenGLStoredQtViewer::ComputeView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",getWinWidth(), getWinHeight());
 #endif
   makeCurrent();
@@ -202 +195 @@
 
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::ComputeView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
-#endif
+  printf("G4OpenGLStoredQtViewer::ComputeView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",getWinWidth(), getWinHeight());
+#endif
+  hasToRepaint =true;
 }
 
@@ -211 +205 @@
 */
 void G4OpenGLStoredQtViewer::resizeGL(
- int aWidth
-,int aHeight)
+                                      int aWidth
+                                      ,int aHeight)
 {  
   // Set new size, it will be update when next Repaint()->SetView() called
-  ResizeGLView(aWidth,aHeight);
-  //  fNeedRepaint = true;
+  ResizeWindow(aWidth,aHeight);
+  hasToRepaint = sizeHasChanged();
 }
 
@@ -229 +223 @@
     return;
   }
-  RepaintGLView();
-
+  // DO NOT RESIZE IF SIZE HAS NOT CHANGE :
+  //    WHEN CLICK ON THE FRAME FOR EXAMPLE
+  //    EXECEPT WHEN MOUSE MOVE EVENT
+  if ( !hasToRepaint) {
+    if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (unsigned int) height())) {
+      return;
+    }
+  }
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint);
+#endif
+
+  SetView();
+          
+  ClearView (); //ok, put the background correct
+  ComputeView();
+     
+  hasToRepaint =false;
+     
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n",readyToPaint);
@@ -277 +288 @@
 
 void G4OpenGLStoredQtViewer::updateQWidget() {
-  fNeedRepaint= true;
+  hasToRepaint= true;
   updateGL();
-  fNeedRepaint= false;
+  hasToRepaint= false;
 }
 

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

@@ -85 +85 @@
 fDisplayLightFrontGreen(1.),
 fDisplayLightFrontBlue(0.),
-fPointSize (0)
+fPointSize (0),
+fSizeHasChanged(0)
 {
   // Make changes to view parameters for OpenGL...
@@ -135 +136 @@
 
 
-void G4OpenGLViewer::ResizeGLView(unsigned int aWidth,unsigned int aHeight)
-{
+void G4OpenGLViewer::ResizeWindow(unsigned int aWidth, unsigned int aHeight) {
   if ((fWinSize_x != aWidth) || (fWinSize_y != aHeight)) {
     fWinSize_x = aWidth;
     fWinSize_y = aHeight;
-    ResizeGLView();
-  }
-}
-
-void G4OpenGLViewer::RepaintGLView()
-{
-  // DO NOT REPAINT IF NO REFRESH IS NEED
-//   if ( !fNeedRepaint) {
-//     return;
-//   }
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
-#endif
-
-  fNeedRepaint = true; // could be set to false by ComputeView
-  SetView();
-  ClearView ();
-  DrawView();
-
-  fNeedRepaint = false; // could be set to false by ComputeView
-
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
-#endif
-
+    fSizeHasChanged = true;
+  } else {
+    fSizeHasChanged = false;
+  }
 }
 
@@ -222 +201 @@
 #endif
   glViewport(X, Y, side, side);
-
-  RepaintGLView();
-
   //    glViewport(0, 0, fWinSize_x,fWinSize_y);  
   
 
-}
-
-
-unsigned int G4OpenGLViewer::getWinWidth () {
-  return fWinSize_x;
-}
-
-unsigned int G4OpenGLViewer::getWinHeight () {
-  return fWinSize_y;
 }
 
@@ -285 +252 @@
   
   // FIXME
-  ResizeGLView(fWinSize_x,fWinSize_y);
+  ResizeGLView();
   //SHOULD SetWindowsSizeHint()...
 
@@ -665 +632 @@
   }
 
-//   width=8192;
-//   height=8192;
+  width=8192;
+  height=8192;
 
   if (!fGL2PSAction) return false;
@@ -675 +642 @@
   int Y = fWinSize_y;
 
-  ResizeGLView(width,height);
+  fWinSize_x = width;
+  fWinSize_y = height;
+  ResizeGLView();
   if (fGL2PSAction->enableFileWriting()) {
 
@@ -687 +656 @@
   }
 
-  ResizeGLView(X,Y);
+  fWinSize_x = X;
+  fWinSize_y = Y;
+  ResizeGLView();
 
   // Reset for next time (useful is size change)
@@ -694 +665 @@
 
   return true;
+}
+
+unsigned int G4OpenGLViewer::getWinWidth() {
+  return fWinSize_x;
+}
+
+unsigned int G4OpenGLViewer::getWinHeight() {
+  return fWinSize_y;
+}
+
+G4bool G4OpenGLViewer::sizeHasChanged() {
+  return fSizeHasChanged;
 }
 

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

@@ -231 +231 @@
   size_hints = XAllocSizeHints();
     
+  ResizeWindow(fVP.GetWindowSizeHintX(),fVP.GetWindowSizeHintY());
+
   G4int x_origin = fVP.GetWindowAbsoluteLocationHintX(DisplayWidth(dpy, vi -> screen));
 

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

@@ -146 +146 @@
   borcol = XBlackPixelOfScreen (XtScreen(shell));
   
+  ResizeWindow(fVP.GetWindowSizeHintX(),fVP.GetWindowSizeHintY());
+
   G4int x_origin = fVP.GetWindowAbsoluteLocationHintX(DisplayWidth(dpy, vi -> screen));
 

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

@@ -62 +62 @@
                  NULL);
 
-  pView->ResizeGLView((G4int) width,(G4int) height);
-  // will call  pView->RepaintGLView() if necessary;
+  pView->ResizeWindow(width,height);
 
   glXMakeCurrent (pView->dpy, XtWindow(pView->glxarea), pView->cx);
@@ -70 +69 @@
   printf("G4OpenGLXmViewer::expose_callback\n");
 #endif
-
+  pView->SetView ();
+  pView->ClearView ();
+  pView->DrawView ();
 }