Changeset 1038 for trunk/source/visualization/OpenGL/src

Timestamp:

May 12, 2009, 11:04:00 AM (15 years ago)

Author:

garnier

Message:

en test pour les refresh, ne marche pas bien

Location:

trunk/source/visualization/OpenGL/src

Files:

• G4OpenGLImmediateQtViewer.cc (modified) (8 diffs)
• G4OpenGLQtViewer.cc (modified) (1 diff)
• G4OpenGLStoredQtViewer.cc (modified) (8 diffs)
• G4OpenGLViewer.cc (modified) (4 diffs)
• G4OpenGLXmPanningCallbacks.cc (modified) (4 diffs)
• G4OpenGLXmRotationCallbacks.cc (modified) (5 diffs)
• G4OpenGLXmStyleCallbacks.cc (modified) (8 diffs)
• G4OpenGLXmWindowHandlingCallbacks.cc (modified) (2 diffs)

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

@@ -56 +56 @@
   setFocusPolicy(Qt::StrongFocus); // enable keybord events
 #endif
-  hasToRepaint =false;
+
+  fNeedRepaint = false;
 
   if (fViewId < 0) return;  // In case error in base class instantiation.
@@ -73 +74 @@
   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
 
 
@@ -92 +106 @@
 
   if (fSceneHandler.GetScene() == 0) {
-    hasToRepaint =false;
+    fNeedRepaint = false;
   } else {
-    hasToRepaint =true;
-  }
+    fNeedRepaint = true;
+  }
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLImmediateQtViewer::initializeGL END\n");
+#endif
 
 }
@@ -106 +123 @@
   printf("G4OpenGLImmediateQtViewer::DrawView  VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n");
 #endif
-  // That's no the same logic as Stored Viewer, I don't know why...
-  // see G4OpenGLStoredQtViewer::DrawView for more informations
-
-  updateQWidget();
+
+  // avoid problems at initialisation
+  if (readyToPaint) {
+    ComputeView();
+  }
+  
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLImmediateQtViewer::DrawView  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
@@ -152 +171 @@
   printf("G4OpenGLImmediateQtViewer::ComputeView  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
 #endif
-  hasToRepaint = true;
+  fNeedRepaint = false;
 }
 
@@ -175 +194 @@
 ,int aHeight)
 {  
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::resizeGL VVVVVV %d %d ??\n",aWidth,aHeight);
+#endif
   ResizeGLView(aWidth,aHeight);
-  //  hasToRepaint = true;
+#ifdef G4DEBUG_VIS_OGL
+  printf("\n\nG4OpenGLImmediateQtViewer::resizeGL END\n");
+#endif
 }
 
@@ -182 +206 @@
 void G4OpenGLImmediateQtViewer::paintGL()
 {
+    
 #ifdef G4DEBUG_VIS_OGL
   printf("\n\nG4OpenGLImmediateQtViewer::paintGL ??\n");
 #endif
-  if (!readyToPaint) {
-    readyToPaint= true;
-    return;
-  }
-  // DO NOT RESIZE IF SIZE HAS NOT CHANGE
-//   if ( !hasToRepaint) {
-//     if (((fWinSize_x == (unsigned int)width())) &&(fWinSize_y == (unsigned int) height())) {
-//       return;
-//     }
-//   }
-#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);
+  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;
+    }
+#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");
 #endif
 }
@@ -252 +277 @@
 
 void G4OpenGLImmediateQtViewer::updateQWidget() {
-  hasToRepaint= true;
+  fNeedRepaint = true;
   updateGL();
-  hasToRepaint= false;
+  fNeedRepaint = false;
 }
 

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

@@ -182 +182 @@
     YPos = offset;
   }
-  //  ResizeGLView(fVP.GetWindowSizeHintX(),fVP.GetWindowSizeHintY());
+  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
-  hasToRepaint =false;
+  fNeedRepaint =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
 }
 
@@ -96 +99 @@
 
   if (fSceneHandler.GetScene() == 0) {
-    hasToRepaint =false;
+    fNeedRepaint =false;
   } else {
-    hasToRepaint =true;
+    fNeedRepaint =true;
   }
 
@@ -117 +120 @@
   // And we loose the redraw of things !
   
-  ComputeView();
+  // avoid problems at initialisation
+  if (readyToPaint) {
+    ComputeView();
+  }
+
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLStoredQtViewer::DrawView  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
@@ -197 +204 @@
   printf("G4OpenGLStoredQtViewer::ComputeView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
 #endif
-  hasToRepaint =true;
 }
 
@@ -205 +211 @@
 */
 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);
-  //  hasToRepaint = true;
+  //  fNeedRepaint = true;
 }
 
@@ -223 +229 @@
     return;
   }
-  // DO NOT RESIZE IF SIZE HAS NOT CHANGE :
-  //    WHEN CLICK ON THE FRAME FOR EXAMPLE
-  //    EXECEPT WHEN MOUSE MOVE EVENT
-//   if ( !hasToRepaint) {
-//     if (((fWinSize_x == (unsigned int)width())) &&(fWinSize_y == (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;
-     
+  RepaintGLView();
+
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n",readyToPaint);
@@ -288 +277 @@
 
 void G4OpenGLStoredQtViewer::updateQWidget() {
-  hasToRepaint= true;
+  fNeedRepaint= true;
   updateGL();
-  hasToRepaint= false;
+  fNeedRepaint= false;
 }
 

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

@@ -137 +137 @@
 void G4OpenGLViewer::ResizeGLView(unsigned int aWidth,unsigned int aHeight)
 {
-  if ((fWinSize_x != aWidth) && (fWinSize_y != aHeight)) {
+  if ((fWinSize_x != aWidth) || (fWinSize_y != aHeight)) {
     fWinSize_x = aWidth;
     fWinSize_y = aHeight;
@@ -144 +144 @@
 }
 
+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
+
+}
 
 /**
@@ -200 +222 @@
 #endif
   glViewport(X, Y, side, side);
+
+  RepaintGLView();
+
   //    glViewport(0, 0, fWinSize_x,fWinSize_y);  
   
@@ -640 +665 @@
   }
 
-  width=8192;
-  height=8192;
+//   width=8192;
+//   height=8192;
 
   if (!fGL2PSAction) return false;

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

@@ -76 +76 @@
 
   pView->fVP.SetZoomFactor (zoomBy);
-  pView->SetView ();
-  pView->ClearView ();
-  pView -> DrawView ();
+  pView->RepaintGLView ();
 }  
 
@@ -108 +106 @@
 
   pView->fVP.SetDolly (dolly);
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 
 }  
@@ -157 +153 @@
   pView->fVP.SetCurrentTargetPoint (tp - stp);
 
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 
   pView->pan_timer = XtAppAddTimeOut 
@@ -207 +201 @@
   pView->fVP.SetCurrentTargetPoint (tp - stp);
   
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView();
 
   pView->pan_timer = XtAppAddTimeOut 

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

@@ -109 +109 @@
   */
 
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 
   pView->rotation_timer = XtAppAddTimeOut 
@@ -182 +180 @@
 
   */
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
   
   pView->rotation_timer = XtAppAddTimeOut 
@@ -275 +271 @@
   pView->fVP.SetViewAndLights (pView->original_vp + d_up + d_third_axis);
 
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
   
   if (pView->frameNo++ == 20) {
@@ -284 +278 @@
       pView->frameNo = 0;
       pView->fVP.SetViewAndLights (pView->original_vp);
-      pView->SetView ();
-      pView->ClearView ();
-      pView->DrawView ();
+      pView->RepaintGLView();
    }
   } else {
@@ -311 +303 @@
   pView->fVP.SetZoomFactor(1.0);
   pView->fVP.SetDolly(0.0);
-  pView->SetView ();
+  pView->RepaintGLView();
   pView->ClearView ();
   pView->DrawView ();

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

@@ -75 +75 @@
   pView->fVP.SetDrawingStyle (style);
   
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView();
 }
 
@@ -108 +106 @@
   pView->fVP.SetRepStyle (style);
 
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 }
 
@@ -145 +141 @@
   }
 
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 }
 
@@ -175 +169 @@
 
   pView->SetNeedKernelVisit (true);
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 }
 
@@ -210 +202 @@
   }
 
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 }
 
@@ -239 +229 @@
   }
 
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 }
 
@@ -269 +257 @@
 
   pView->SetNeedKernelVisit (true);
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView ();
 }
 
@@ -306 +292 @@
   }
 
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
+  pView->RepaintGLView();
 }  
 

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

@@ -63 +63 @@
 
   pView->ResizeGLView((G4int) width,(G4int) height);
+  // will call  pView->RepaintGLView() if necessary;
 
   glXMakeCurrent (pView->dpy, XtWindow(pView->glxarea), pView->cx);
@@ -69 +70 @@
   printf("G4OpenGLXmViewer::expose_callback\n");
 #endif
-  // FIXME : L.Garnier 11 Mai 2009 : Should be erase
-  pView->SetView ();
-  pView->ClearView ();
-  pView->DrawView ();
-  // ENDOF Fixme
 
 }