Changeset 1241 for trunk

Timestamp:

Mar 10, 2010, 11:29:32 AM (14 years ago)

Author:

garnier

Message:

update

Location:

trunk/source/visualization

Files:

• OpenGL/src/G4OpenGLImmediateSceneHandler.cc (modified) (2 diffs)
• OpenGL/src/G4OpenGLViewer.cc (modified) (5 diffs)
• management/GNUmakefile (modified) (1 diff)
• management/History (modified) (2 diffs)
• management/src/G4VSceneHandler.cc (modified) (4 diffs)
• management/src/G4VisManager.cc (modified) (6 diffs)

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

@@ -217 +217 @@
 {
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateSceneHandler::RequestPrimitives \n");
+  //  printf("G4OpenGLImmediateSceneHandler::RequestPrimitives \n");
 #endif
   if (fReadyForTransients) {
@@ -255 +255 @@
   G4VSceneHandler::RequestPrimitives (solid);
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLImmediateSceneHandler::RequestPrimitives END\n");
+  //  printf("G4OpenGLImmediateSceneHandler::RequestPrimitives END\n");
 #endif
 }

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

@@ -195 +195 @@
     }
   }
-  GLsizei side = fWinSize_x;
-  if (fWinSize_y < fWinSize_x) side = fWinSize_y;
+//   GLsizei side = fWinSize_x;
+//   if (fWinSize_y < fWinSize_x) side = fWinSize_y;
   
   // SPECIAL CASE if fWinSize_x is even (69 for example) 
@@ -208 +208 @@
 
   // SPECIAL CASE
-  if ((fWinSize_x - side)%2) {
-    //    fWinSize_x --;
-
-    side = fWinSize_x;
-    if (fWinSize_y < fWinSize_x) side = fWinSize_y;
-  }
-  if ((fWinSize_y - side)%2) {
-    //    fWinSize_y --;
-
-    side = fWinSize_x;
-    if (fWinSize_y < fWinSize_x) side = fWinSize_y;
-  }
-  
-  GLint X = (fWinSize_x - side) / 2;
-  GLint Y = (fWinSize_y - side) / 2;
-  
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::ResizeGLView X:%d Y:%d W:%d H:%d --side%d\n",(fWinSize_x - side) / 2,(fWinSize_y - side) / 2,fWinSize_x,fWinSize_y,side);
-#endif
-  glViewport(X, Y, side, side);
-  //    glViewport(0, 0, fWinSize_x,fWinSize_y);  
+//   if ((fWinSize_x - side)%2) {
+//     //    fWinSize_x --;
+
+//     side = fWinSize_x;
+//     if (fWinSize_y < fWinSize_x) side = fWinSize_y;
+//   }
+//   if ((fWinSize_y - side)%2) {
+//     //    fWinSize_y --;
+
+//     side = fWinSize_x;
+//     if (fWinSize_y < fWinSize_x) side = fWinSize_y;
+//   }
+  
+//   GLint X = (fWinSize_x - side) / 2;
+//   GLint Y = (fWinSize_y - side) / 2;
+  
+#ifdef G4DEBUG_VIS_OGL
+  //  printf("G4OpenGLViewer::ResizeGLView X:%d Y:%d W:%d H:%d --side%d\n",(fWinSize_x - side) / 2,(fWinSize_y - side) / 2,fWinSize_x,fWinSize_y,side);
+#endif
+
+  //  glViewport(X, Y, side, side);
+  glViewport(0, 0, fWinSize_x,fWinSize_y);  
   
 
@@ -256 +257 @@
   glLightfv (GL_LIGHT0, GL_DIFFUSE, diffuse);
   
+  G4double ratioX = 1;
+  G4double ratioY = 1;
+  if (fWinSize_y > fWinSize_x) {
+    ratioX = ((G4double)fWinSize_y) / ((G4double)fWinSize_x);
+  }
+  if (fWinSize_x > fWinSize_y) {
+    ratioY = ((G4double)fWinSize_x) / ((G4double)fWinSize_y);
+  }
+  
   // Get radius of scene, etc.
   // Note that this procedure properly takes into account zoom, dolly and pan.
@@ -268 +278 @@
   const GLdouble pnear  = fVP.GetNearDistance (cameraDistance, radius);
   const GLdouble pfar   = fVP.GetFarDistance  (cameraDistance, pnear, radius);
-  const GLdouble right  = fVP.GetFrontHalfHeight (pnear, radius);
+  const GLdouble right  = fVP.GetFrontHalfHeight (pnear, radius) * ratioY;
   const GLdouble left   = -right;
-  const GLdouble bottom = left;
-  const GLdouble top    = right;
+  const GLdouble top    = fVP.GetFrontHalfHeight (pnear, radius) * ratioX;
+  const GLdouble bottom = -top;
   
   // FIXME
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::SetView Call ResizeGLView VVVVVV\n");
+  printf("G4OpenGLViewer::SetView Call ResizeGLView VVVVVV sizeX:%d sizeY:%d ratioX:%f ratioY:%f\n",fWinSize_x,fWinSize_y,ratioX,ratioY);
 #endif
   ResizeGLView();
@@ -291 +301 @@
   if (fVP.GetFieldHalfAngle() == 0.) {
     glOrtho (left, right, bottom, top, pnear, pfar);
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLViewer::SetView glOrtho %f %f %f %f %f %f\n",left, right, bottom, top, pnear, pfar);
+#endif
   }
   else {

trunk/source/visualization/management/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.16 2009/11/04 12:58:43 allison Exp $
+# $Id: GNUmakefile,v 1.17 2010/03/08 16:34:17 lgarnier Exp $
 # -------------------------------------------------------------
 # GNUmakefile for visualization library.  John Allison, 5/7/95.

trunk/source/visualization/management/History

@@ -1 @@
-$Id: History,v 1.137 2009/11/22 14:08:09 allison Exp $
+$Id: History,v 1.138 2010/03/08 16:34:17 lgarnier Exp $
 
 -------------------------------------------------------------------
@@ -26 +26 @@
 History file for visualization management sub-category
 ------------------------------------------------------
+8th March 2010 Laurent Garnier
+-G4VisManager.cc : Add protection against null pointer
 
 22nd November 2009  John Allison  (visman-V09-02-08)

trunk/source/visualization/management/src/G4VSceneHandler.cc

@@ -118 +118 @@
 
 G4VSceneHandler::~G4VSceneHandler () {
-//   G4ViewerListIterator i;
-//   for (i = fViewerList.begin(); i != fViewerList.end(); ++i) {
-//      delete *i;
-//    }
   G4VViewer* last;
   while( ! fViewerList.empty() ) {
@@ -471 +467 @@
 
 void G4VSceneHandler::RequestPrimitives (const G4VSolid& solid) {
-#ifdef G4DEBUG_VIS_MANAGEMENT
-  printf("G4VSceneHandler::RequestPrimitives\n");
-#endif
   BeginPrimitives (*fpObjectTransformation);
   G4NURBS* pNURBS = 0;
@@ -520 +513 @@
     break;
   }
-#ifdef G4DEBUG_VIS_MANAGEMENT
-  printf("G4VSceneHandler::RequestPrimitives BEFORE END\n");
-#endif
   EndPrimitives ();
-#ifdef G4DEBUG_VIS_MANAGEMENT
-  printf("G4VSceneHandler::RequestPrimitives END\n");
-#endif
 }
 
 void G4VSceneHandler::ProcessScene (G4VViewer&) {
-#ifdef G4DEBUG_VIS_MANAGEMENT
-  printf("G4VSceneHandler::ProcessScene\n");
-#endif
 
   if (!fpScene) return;
@@ -667 +651 @@
 
   fMarkForClearingTransientStore = tmpMarkForClearingTransientStore;
-#ifdef G4DEBUG_VIS_MANAGEMENT
-  printf("G4VSceneHandler::ProcessScene END\n");
-#endif
 }
 

trunk/source/visualization/management/src/G4VisManager.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VisManager.cc,v 1.122 2009/11/04 12:58:00 allison Exp $
+// $Id: G4VisManager.cc,v 1.123 2010/03/08 16:34:17 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -174 +174 @@
 
 G4VisManager::~G4VisManager () {
-  printf("G4VisManager::~G4VisManager DELETING \n");
   fpInstance = 0;
   size_t i;
   for (i = 0; i < fSceneList.size (); ++i) {
-    printf("G4VisManager::~G4VisManager DELETING 1 \n");
     delete fSceneList[i];
   }
   for (i = 0; i < fAvailableSceneHandlers.size (); ++i) {
-  printf("G4VisManager::~G4VisManager DELETING 2\n");
   if (fAvailableSceneHandlers[i] != NULL) {
     delete fAvailableSceneHandlers[i];
@@ -188 +185 @@
   }
   for (i = 0; i < fAvailableGraphicsSystems.size (); ++i) {
-    printf("G4VisManager::~G4VisManager DELETING 3\n");
     if (fAvailableGraphicsSystems[i]) {
       delete fAvailableGraphicsSystems[i];
@@ -198 +194 @@
   }
   for (i = 0; i < fMessengerList.size (); ++i) {
-  printf("G4VisManager::~G4VisManager DELETING 4\n");
     delete fMessengerList[i];
   }
   for (i = 0; i < fDirectoryList.size (); ++i) {
-  printf("G4VisManager::~G4VisManager DELETING 5\n");
     delete fDirectoryList[i];
   }
 
-  printf("G4VisManager::~G4VisManager DELETING 6\n");
   delete fpTrajDrawModelMgr;
-  printf("G4VisManager::~G4VisManager DELETING 7\n");
   delete fpTrajFilterMgr;
-  printf("G4VisManager::~G4VisManager DELETING 8\n");
   delete fpHitFilterMgr;
-  printf("G4VisManager::~G4VisManager DELETING 9\n");
 }
 
@@ -388 +378 @@
   return happy;
 }
-
-
 
 const G4VTrajectoryModel*
@@ -830 +818 @@
   }
 
-  }
+}
 void G4VisManager::NotifyHandlers () {