Changeset 1095

Timestamp:

Aug 19, 2009, 3:28:25 PM (15 years ago)

Author:

garnier

Message:

Fix of bad initialization from XGeometry

Location:

trunk/source/visualization/OpenGL

Files:

• History (modified) (2 diffs)
• src/G4OpenGLViewer.cc (modified) (6 diffs)

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.145 2009/07/29 10:04:45 lgarnier Exp $
+$Id: History,v 1.146 2009/08/19 13:28:10 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+18 August 2009 Laurent Garnier
+ - G4OpenGLXmViewer : Fix a wrong initialization introduce by the 
+   new way of handling window size hints (January 2009)
 
 29 July 2009, Laurent Garnier

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewer.cc,v 1.56 2009/05/14 16:38:23 lgarnier Exp $
+// $Id: G4OpenGLViewer.cc,v 1.57 2009/08/19 13:28:10 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -92 +92 @@
   fVP.SetAutoRefresh(true);
   fDefaultVP.SetAutoRefresh(true);
-  fWinSize_x = fVP.GetWindowSizeHintX();
-  fWinSize_y = fVP.GetWindowSizeHintY();
 
   fGL2PSAction = new G4OpenGL2PSAction();
@@ -114 +112 @@
   glDisable (GL_LINE_SMOOTH);
   glDisable (GL_POLYGON_SMOOTH);
+
+  fWinSize_x = fVP.GetWindowSizeHintX();
+  fWinSize_y = fVP.GetWindowSizeHintY();
 }  
 
@@ -493 +494 @@
   bool res;
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::printEPS file:%s Vec:%d\n",getRealPrintFilename().c_str(),fVectoredPs);
+  printf("G4OpenGLViewer::printEPS file:%s Vec:%d Name:%s\n",getRealPrintFilename().c_str(),fVectoredPs,GetName().c_str());
 #endif
   if (fVectoredPs) {
@@ -667 +668 @@
     return 0;
   }
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::getRealPrintSizeX :: %d",fPrintSizeX);
-#endif
   return fPrintSizeX;
 }
@@ -685 +683 @@
     return 0;
   }
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::getRealPrintSizeY :: %d",fPrintSizeY);
-#endif
   return fPrintSizeY;
 }