Changeset 1049

Timestamp:

May 26, 2009, 3:34:36 PM (15 years ago)

Author:

garnier

Message:

update pas dans CVS

Location:

trunk/source/visualization/OpenGL

Files:

• include/G4OpenGLXmViewer.hh (modified) (2 diffs)
• src/G4OpenGLImmediateSceneHandler.cc (modified) (1 diff)
• src/G4OpenGLImmediateViewer.cc (modified) (1 diff)
• src/G4OpenGLImmediateWin32.cc (modified) (2 diffs)
• src/G4OpenGLImmediateWin32Viewer.cc (modified) (3 diffs)
• src/G4OpenGLImmediateXm.cc (modified) (1 diff)
• src/G4OpenGLSceneHandler.cc (modified) (1 diff)
• src/G4OpenGLStoredWin32.cc (modified) (1 diff)
• src/G4OpenGLStoredX.cc (modified) (1 diff)
• src/G4OpenGLStoredXm.cc (modified) (1 diff)
• src/G4OpenGLTransform3D.cc (modified) (1 diff)
• src/G4OpenGLViewer.cc (modified) (2 diffs)
• src/G4OpenGLXmSliderBar.cc (modified) (1 diff)
• src/G4OpenGLXmVWidgetComponent.cc (modified) (1 diff)
• src/G4OpenGLXmVWidgetContainer.cc (modified) (1 diff)
• src/G4OpenGLXmVWidgetShell.cc (modified) (1 diff)
• src/G4OpenGLXmViewer.cc (modified) (2 diffs)
• src/G4OpenGLXmViewerMessenger.cc (modified) (1 diff)
• src/G4OpenGLXmWindowHandlingCallbacks.cc (modified) (2 diffs)

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

@@ -202 +202 @@
                                XtPointer callData);
   
+  static void activate_callback (Widget w, 
+                               XtPointer clientData, 
+                               XtPointer callData);
+  
   static void actions_callback (Widget w, 
                                 XtPointer clientData, 
@@ -373 +377 @@
   G4OpenGLXmViewer (const G4OpenGLXmViewer&);
   G4OpenGLXmViewer& operator = (const G4OpenGLXmViewer&);
-  
 };
 

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

@@ -58 +58 @@
 (G4VGraphicsSystem& system,const G4String& name):
   G4OpenGLSceneHandler (system, fSceneIdCount++, name)
-{}
+{
+#ifdef G4DEBUG_VIS_OGL
+  printf("INIT G4OpenGLImmediateSceneHandler (after G4OpenGLSceneHandler (system, fSceneIdCount++, name)\n");
+#endif
+}
 
 G4OpenGLImmediateSceneHandler::~G4OpenGLImmediateSceneHandler ()

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

@@ -42 +42 @@
 G4VViewer (scene, -1),
 G4OpenGLViewer (scene)
-{}
+{
+#ifdef G4DEBUG_VIS_OGL
+  printf("INIT G4OpenGLImmediateViewer (after G4VViewer and G4OpenGLVIewer \n");
+#endif
+}
 
 void G4OpenGLImmediateViewer::ProcessView ()

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateWin32.cc,v 1.11 2006/08/14 12:07:19 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4OpenGLImmediateWin32.cc,v 1.13 2009/05/20 09:58:10 lgarnier Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -60 +60 @@
 (G4VSceneHandler& scene, const G4String& name) {
   G4VViewer* pView =
-    new G4OpenGLImmediateWin32Viewer 
+    new G4OpenGLImmediateWin32Viewer
     ((G4OpenGLImmediateSceneHandler&) scene, name);
   if (pView) {

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateWin32Viewer.cc,v 1.17 2009/01/13 09:47:05 lgarnier Exp $
+// $Id: G4OpenGLImmediateWin32Viewer.cc,v 1.19 2009/05/20 10:19:51 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -35 +35 @@
 
 #include "G4OpenGLImmediateWin32Viewer.hh"
+#include "G4OpenGLImmediateSceneHandler.hh"
 
 #include "G4ios.hh"
@@ -80 +81 @@
   //Win32 version needed
   //glXMakeCurrent (dpy, win, cx);
-  glViewport (0, 0, fWinSize_x, fWinSize_y);
+  glViewport (0, 0, getWinWidth(), getWinHeight());
 
   if(style!=G4ViewParameters::hlr &&

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

@@ -50 +50 @@
                      G4VGraphicsSystem::threeD)
 {
+#ifdef G4DEBUG_VIS_OGL
+  printf("INIT G4OpenGLImmediateXm (after   G4VGraphicsSystem (,,)\n");
+#endif
   G4OpenGLViewerMessenger::GetInstance();
   G4OpenGLXmViewerMessenger::GetInstance();

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

@@ -74 +74 @@
   fProcessing2D (false),
   fProcessingPolymarker(false)
-{}
+{
+#ifdef G4DEBUG_VIS_OGL
+  printf("INIT G4OpenGLSceneHandler (after G4OpenGLSceneHandler G4VSceneHandler (system, id, name)\n");
+#endif
+}
 
 G4OpenGLSceneHandler::~G4OpenGLSceneHandler ()

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

@@ -25 +25 @@
 //
 //
-<<<<<<< G4OpenGLStoredWin32.cc
 // $Id: G4OpenGLStoredWin32.cc,v 1.14 2006/08/14 12:07:19 allison Exp $
 // GEANT4 tag $Name: geant4-09-02-ref-02 $
-=======
-// $Id: G4OpenGLStoredWin32.cc,v 1.15 2009/01/19 16:53:42 lgarnier Exp $
-// GEANT4 tag $Name:  $
->>>>>>> 1.15
 //
 // 

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

@@ -25 +25 @@
 //
 //
-<<<<<<< G4OpenGLStoredX.cc
 // $Id: G4OpenGLStoredX.cc,v 1.14 2007/08/21 14:05:51 allison Exp $
 // GEANT4 tag $Name: geant4-09-02-ref-02 $
-=======
-// $Id: G4OpenGLStoredX.cc,v 1.15 2009/01/19 16:53:42 lgarnier Exp $
-// GEANT4 tag $Name:  $
->>>>>>> 1.15
 //
 // 

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

@@ -25 +25 @@
 //
 //
-<<<<<<< G4OpenGLStoredXm.cc
-// $Id: G4OpenGLStoredXm.cc,v 1.11 2006/08/14 12:07:19 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
-=======
 // $Id: G4OpenGLStoredXm.cc,v 1.12 2009/01/19 16:53:42 lgarnier Exp $
 // GEANT4 tag $Name:  $
->>>>>>> 1.12
 //
 // 

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

@@ -25 +25 @@
 //
 //
-<<<<<<< G4OpenGLTransform3D.cc
 // $Id: G4OpenGLTransform3D.cc,v 1.8 2006/06/29 21:19:32 gunter Exp $
 // GEANT4 tag $Name: geant4-09-02-ref-02 $
-=======
-// $Id: G4OpenGLTransform3D.cc,v 1.9 2009/01/19 16:53:42 lgarnier Exp $
-// GEANT4 tag $Name:  $
->>>>>>> 1.9
 //
 // 

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

@@ -667 +667 @@
     return 0;
   }
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::getRealPrintSizeX :: %d",fPrintSizeX);
+#endif
   return fPrintSizeX;
 }
@@ -682 +685 @@
     return 0;
   }
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::getRealPrintSizeY :: %d",fPrintSizeY);
+#endif
   return fPrintSizeY;
 }

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

@@ -25 +25 @@
 //
 //
-<<<<<<< G4OpenGLXmSliderBar.cc
 // $Id: G4OpenGLXmSliderBar.cc,v 1.7 2006/06/29 21:20:00 gunter Exp $
 // GEANT4 tag $Name: geant4-09-02-ref-02 $
-=======
-// $Id: G4OpenGLXmSliderBar.cc,v 1.8 2009/01/19 16:53:42 lgarnier Exp $
-// GEANT4 tag $Name:  $
->>>>>>> 1.8
 //
 //Slider bar class. Inherits from G4OpenGLXmVWidgetComponent

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

@@ -25 +25 @@
 //
 //
-<<<<<<< G4OpenGLXmVWidgetComponent.cc
 // $Id: G4OpenGLXmVWidgetComponent.cc,v 1.5 2006/06/29 21:20:08 gunter Exp $
 // GEANT4 tag $Name: geant4-09-02-ref-02 $
-=======
-// $Id: G4OpenGLXmVWidgetComponent.cc,v 1.6 2009/01/19 16:53:42 lgarnier Exp $
-// GEANT4 tag $Name:  $
->>>>>>> 1.6
 //
 //Base class for all Motif component widgets

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

@@ -25 +25 @@
 //
 //
-<<<<<<< G4OpenGLXmVWidgetContainer.cc
 // $Id: G4OpenGLXmVWidgetContainer.cc,v 1.5 2006/06/29 21:20:10 gunter Exp $
 // GEANT4 tag $Name: geant4-09-02-ref-02 $
-=======
-// $Id: G4OpenGLXmVWidgetContainer.cc,v 1.7 2009/03/13 09:50:03 lgarnier Exp $
-// GEANT4 tag $Name:  $
->>>>>>> 1.7
 //
 //Base class for all Motif container widgets

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

@@ -25 +25 @@
 //
 //
-<<<<<<< G4OpenGLXmVWidgetShell.cc
 // $Id: G4OpenGLXmVWidgetShell.cc,v 1.5 2006/06/29 21:20:14 gunter Exp $
 // GEANT4 tag $Name: geant4-09-02-ref-02 $
-=======
-// $Id: G4OpenGLXmVWidgetShell.cc,v 1.6 2009/01/19 16:53:42 lgarnier Exp $
-// GEANT4 tag $Name:  $
->>>>>>> 1.6
 //
 //Base class for all Motif shell widgets

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

@@ -629 +629 @@
                         frame      // widget to be used for work window
                         );
-
+  
   XtRealizeWidget(shell);
   
@@ -636 +636 @@
 
   win = XtWindow (glxarea);
+  
+  /* Change once the bit gravity of the Drawing Area; default
+     is north west and we want forget, so that resize
+     always generates exposure events */
+   XSetWindowAttributes attrs;
+   attrs.bit_gravity = ForgetGravity ;
+   XChangeWindowAttributes(XtDisplay(glxarea), win,
+                               CWBitGravity, &attrs);
 
   glXMakeCurrent (dpy, win, cx);
 
-  // This should be add AFTER glXMakeCurrent done because it will fire a resizeCallback
+   // This should be add AFTER glXMakeCurrent done because it will fire a resizeCallback
   XtAddCallback (glxarea, 
-                 XmNresizeCallback, 
-                 resize_callback, 
-                 this);
-
+                 XmNresizeCallback, 
+                 resize_callback, 
+                 this);
+  
   XtAddCallback (glxarea, 
                  XmNexposeCallback, 
                  expose_callback, 
+                 this);
+
+  XtAddCallback (glxarea, 
+                 XmNactivateCallback, 
+                 activate_callback, 
                  this);
 

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

@@ -25 +25 @@
 //
 //
-<<<<<<< G4OpenGLXmViewerMessenger.cc
 // $Id: G4OpenGLXmViewerMessenger.cc,v 1.4 2006/06/29 21:20:18 gunter Exp $
 // GEANT4 tag $Name: geant4-09-02-ref-02 $
-=======
-// $Id: G4OpenGLXmViewerMessenger.cc,v 1.5 2009/01/19 16:53:42 lgarnier Exp $
-// GEANT4 tag $Name:  $
->>>>>>> 1.5
 
 #ifdef G4VIS_BUILD_OPENGLXM_DRIVER

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

@@ -35 +35 @@
 
 #ifdef G4VIS_BUILD_OPENGLXM_DRIVER
-
+//#define RESIZE_TEST
 #include "G4OpenGLXmViewer.hh"
 
+
+
+// L. Garnier 20 May 2009
+// Each resize event send 2-3-4 expose events. Sequence on MacOsX 10.5 is : 
+// - Expose(s) callback for pixels top/left from resize button
+// - Resize callback
+// - Expose for main part of content
+// - Expose(s) for new part of content
+//
+// BUT we want to redraw things only ONE time.
+// First expose is send with size=="before resize" size and x,y !=0
+// and  x+dw!=w || y+dh !=h
 void G4OpenGLXmViewer::resize_callback (Widget w, 
                                       XtPointer clientData, 
-                                      XtPointer x) 
-{
-  expose_callback(w,clientData,x);
-}
-
-
-
-void G4OpenGLXmViewer::expose_callback (Widget w, 
-                                      XtPointer clientData, 
-                                      XtPointer) 
-{
+                                      XtPointer callData) 
+{
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLXmViewer::resize_callback \n");
+#endif
+  XmDrawingAreaCallbackStruct *data = (XmDrawingAreaCallbackStruct *)callData;
+
+  XEvent                       event;
+
+  // flush others resize events
+#ifdef G4DEBUG_VIS_OGL
+  while (XCheckWindowEvent(XtDisplay(w), data->window,
+                           ResizeRedirectMask, &event)) {
+    printf("G4OpenGLXmViewer::resize_callback ------ next RESIZE ! %d\n");
+  }
+#endif
+#ifdef RESIZE_TEST
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
   Dimension width, height;
@@ -58 +76 @@
                  XmNheight, &height, 
                  NULL);
-
   pView->ResizeWindow(width,height);
-
-  glXMakeCurrent (pView->dpy, XtWindow(pView->glxarea), pView->cx);
-
+#endif
+}
+
+
+void G4OpenGLXmViewer::activate_callback (Widget w, 
+                                      XtPointer clientData, 
+                                      XtPointer callData) 
+{
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLXmViewer::activate_callback \n");
+#endif
+}
+
+void G4OpenGLXmViewer::expose_callback (Widget w, 
+                                      XtPointer clientData, 
+                                      XtPointer callData) 
+{
+  /* ensure last expose event in sequence */
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLXmViewer::expose_callback ?\n");
+#endif
+  XmDrawingAreaCallbackStruct *data = (XmDrawingAreaCallbackStruct *)callData;
+
+  XEvent                       event;
+
+  Dimension width, height;
+  G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
+
+  XtVaGetValues (w, 
+                 XmNwidth, &width, 
+                 XmNheight, &height, 
+                 NULL);
+  
+  XSetWindowAttributes xswa;
+  xswa.bit_gravity = ForgetGravity ;
+  XChangeWindowAttributes(XtDisplay(w), XtWindow(w),
+                          CWBitGravity, &xswa);
+  
+    // look for next 
+    //    while (XCheckTypedWindowEvent(XtDisplay(w), XtWindow(w), ResizeRequest, &event)) {
+    //    printf("G4OpenGLXmViewer::expose_callback --- event type :%d\n",event.type);
+    //    printf("G4OpenGLXmViewer::expose_callback --- resize %d\n",event.type);
+    //  }
+    
+  // Several expose events are send for each area to be redraw.
+  // Because we want to optimise redrawing, we only need to redraw once.
+    if (((XExposeEvent *) data->event)->count != 0) {
+#ifdef G4DEBUG_VIS_OGL
+      printf("G4OpenGLXmViewer::expose_callback NOOOOO %d %d type:%d number:%d send:%d x:%d y:%d w:%d h:%d c:%d\n",width,height,
+           ((XExposeEvent *) data->event)->type,
+           ((XExposeEvent *) data->event)->serial,
+           ((XExposeEvent *) data->event)->send_event,
+           ((XExposeEvent *) data->event)->x,
+           ((XExposeEvent *) data->event)->y,
+           ((XExposeEvent *) data->event)->width,
+           ((XExposeEvent *) data->event)->height,
+           ((XExposeEvent *) data->event)->count);
+
+
+#endif
+      return;
+    }
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLXmViewer::expose_callback Should redraw %d %d type:%d number:%d send:%d x:%d y:%d w:%d h:%d c:%d\n",width,height,
+           ((XExposeEvent *) data->event)->type,
+           ((XExposeEvent *) data->event)->serial,
+           ((XExposeEvent *) data->event)->send_event,
+           ((XExposeEvent *) data->event)->x,
+           ((XExposeEvent *) data->event)->y,
+           ((XExposeEvent *) data->event)->width,
+           ((XExposeEvent *) data->event)->height,
+           ((XExposeEvent *) data->event)->count);
+#endif
+    
+#ifdef G4DEBUG_VIS_OGL
+    while (XCheckMaskEvent(XtDisplay(w), ResizeRedirectMask, &event)) {
+      //       printf("G4OpenGLXmViewer::expose_callback ------ next EXPOSE ! %d\n");
+      //     }
+      //     while (XCheckWindowEvent(XtDisplay(w), data->window,
+      //                              ResizeRedirectMask, &event)) {
+      printf("G4OpenGLXmViewer::expose_callback ------ next RESIZE ! \n");
+    }
+#endif
+  
+#ifdef RESIZE_TEST
+    glXMakeCurrent (pView->dpy, XtWindow(pView->glxarea), pView->cx);
+#ifdef G4DEBUG_VIS_OGL
+  G4cout << "G4OpenGLXmViewer::expose_callback" << G4endl;
+  printf("G4OpenGLXmViewer::expose_callback Call SetView()\n");
+#endif
   pView->SetView ();
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLXmViewer::expose_callback Call SetView() END \n");
+  printf("G4OpenGLXmViewer::expose_callback Call ClearView() \n");
+#endif
   pView->ClearView ();
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLXmViewer::expose_callback Call ClearView() END \n");
+  printf("G4OpenGLXmViewer::expose_callback Call DrawView() \n");
+#endif
   pView->DrawView ();
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLXmViewer::expose_callback Call DrawView() END \n");
+  G4cout << "G4OpenGLXmViewer::expose_callback END" << G4endl;
+#endif
+#endif
+  return;
+    
+ 
 }