Changeset 908 for trunk/source/visualization/OpenGL

Timestamp:

Jan 16, 2009, 3:22:04 PM (15 years ago)

Author:

garnier

Message:

update with CVS

Location:

trunk/source/visualization/OpenGL

Files:

• include/G4OpenGLViewer.hh (modified) (1 diff)
• src/G4OpenGLImmediateQtViewer.cc (modified) (2 diffs)
• src/G4OpenGLImmediateXmViewer.cc (modified) (1 diff)
• src/G4OpenGLQtViewer.cc (modified) (2 diffs)
• src/G4OpenGLStoredQtViewer.cc (modified) (2 diffs)
• src/G4OpenGLViewer.cc (modified) (5 diffs)
• src/G4OpenGLXViewer.cc (modified) (1 diff)
• src/G4OpenGLXmViewer.cc (modified) (2 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewer.hh,v 1.24 2009/01/13 09:47:05 lgarnier Exp $
+// $Id: G4OpenGLViewer.hh,v 1.25 2009/01/16 08:29:17 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateQtViewer.cc,v 1.8 2009/01/13 09:47:05 lgarnier Exp $
+// $Id: G4OpenGLImmediateQtViewer.cc,v 1.9 2009/01/15 18:14:58 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -202 +202 @@
   printf("G4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint);
 #endif
-//   fWinSize_x = (unsigned int) width();
-//   fWinSize_y = (unsigned int) height();
-
-  //  setupViewport(width(),height());
 
   SetView();

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateXmViewer.cc,v 1.17 2006/07/03 16:38:13 allison Exp $
+// $Id: G4OpenGLImmediateXmViewer.cc,v 1.18 2009/01/13 12:07:12 allison Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.31 2009/01/13 09:47:05 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.32 2009/01/15 18:14:58 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -174 +174 @@
 
   //useful for MACOSX, we have to compt the menuBar height
-  unsigned int offset = QApplication::desktop()->height() 
+  int offset = QApplication::desktop()->height() 
                       - QApplication::desktop()->availableGeometry().height();
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.cc,v 1.21 2009/01/13 09:47:05 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.cc,v 1.22 2009/01/15 18:14:58 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -235 +235 @@
   printf("G4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint);
 #endif
-//   fWinSize_x = (unsigned int) width();
-//   fWinSize_y = (unsigned int) height();
-
-  //  setupViewport(width(),height());
 
   SetView();

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewer.cc,v 1.43 2009/01/13 09:47:05 lgarnier Exp $
+// $Id: G4OpenGLViewer.cc,v 1.45 2009/01/15 18:14:58 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -156 +156 @@
 {
 #ifdef G4DEBUG
-  printf("G4OpenGLQtViewer::setupViewport\n");
+  printf("G4OpenGLViewer::setupViewport\n");
 #endif
 
@@ -167 +167 @@
 void G4OpenGLViewer::SetView () {
 
-#ifdef G4DEBUG
-  printf("G4OpenGLViewer::SetView ------------\n");
-#endif
   if (!fSceneHandler.GetScene()) {
-    G4cerr << "G4OpenGLStoredQtViewer: Creating a Viewer without a scene is not allowed. \nPlease use /vis/scene/create before /vis/open/.... "
+    G4cerr << "G4OpenGLStoredViewer: Creating a Viewer without a scene is not allowed. \nPlease use /vis/scene/create before /vis/open/.... "
            << G4endl;
     return;
@@ -210 +207 @@
   
   // FIXME
-  //  const G4int& width = fVP.GetWindowSizeHintX();
-  //  const G4int& height = fVP.GetWindowSizeHintY();
-  //  G4int side = width;
-  //  if (height < width) side = height;
-  //  glViewport((width - side) / 2, (height - side) / 2, side, side);
   ResizeGLView();
+  //SHOULD SetWindowsSizeHint()...
 
   glMatrixMode (GL_PROJECTION); // set up Frustum.
@@ -225 +218 @@
   if (fVP.GetFieldHalfAngle() == 0.) {
     glOrtho (left, right, bottom, top, pnear, pfar);
-#ifdef G4DEBUG
-  printf("G4OpenGLViewer::SetView ------------rescale\n");
-#endif
   }
   else {
     glFrustum (left, right, bottom, top, pnear, pfar);
-#ifdef G4DEBUG
-  printf("G4OpenGLViewer::SetView ------------Frustum\n");
-#endif
-  }
-  
+  }  
 
   glMatrixMode (GL_MODELVIEW); // apply further transformations to scene.

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

@@ -82 +82 @@
 extern "C" {
   static Bool G4OpenGLXViewerWaitForNotify (Display*, XEvent* e, char* arg) {
-#ifdef G4DEBUG
-    printf("G4OpenGLXViewerWaitForNotify\n");
-#endif
     return (e->type == MapNotify) && (e->xmap.window == (Window) arg);
   }

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLXmViewer.cc,v 1.25 2009/01/13 09:47:05 lgarnier Exp $
+// $Id: G4OpenGLXmViewer.cc,v 1.26 2009/01/15 18:14:58 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -600 +600 @@
   // 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,