Changeset 1314

Timestamp:

Jun 18, 2010, 10:20:17 AM (14 years ago)

Author:

garnier

Message:

en test pas dans CVS

Location:

trunk/source

Files:

• interfaces/basic/src/G4UIQt.cc (modified) (1 diff)
• visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc (modified) (2 diffs)
• visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (1 diff)
• visualization/OpenGL/src/G4OpenGLStoredViewer.cc (modified) (1 diff)
• visualization/OpenGL/src/G4OpenGLViewer.cc (modified) (1 diff)
• visualization/management/include/G4VisExecutive.icc (modified) (5 diffs)

trunk/source/interfaces/basic/src/G4UIQt.cc

@@ -157 +157 @@
 
 #ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::Initialise after main window creation +++++++++++\n");
+  printf("G4UIQt::Initialise after main window creation +++++++++++ %d\n");
 #endif
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateQtViewer.cc,v 1.20 2010/06/04 16:21:47 lgarnier Exp $
+// $Id: G4OpenGLImmediateQtViewer.cc,v 1.21 2010/06/04 16:23:07 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -161 +161 @@
     //    return ;
   }
-#ifdef G4DEBUG_VIS_OGL
-  printf("\n\nG4OpenGLImmediateQtViewer::paintGL ??\n");
-#endif
   if (!fReadyToPaint) {
     fReadyToPaint= true;

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

@@ -134 +134 @@
   G4UIQt * uiQt = static_cast<G4UIQt*> (UI->GetG4UIWindow());
   
-  bool isTabbedView = uiQt->AddTabWidget(fWindow,name,getWinWidth(),getWinHeight());
+  bool isTabbedView = false;
+  if ( uiQt) {
+    isTabbedView = uiQt->AddTabWidget(fWindow,name,getWinWidth(),getWinHeight());
+  }
+#ifdef G4DEBUG_VIS_OGL
+  else {
+    printf("G4OpenGLQtViewer::CreateMainWindow :: UIQt NOt found \n");
+  }
+#endif
 
   if (!isTabbedView) { // we have to do a dialog

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

@@ -156 +156 @@
     for (size_t i = 0; i < fG4OpenGLStoredSceneHandler.fTOList.size(); ++i) {
 #ifdef G4DEBUG_VIS_OGL
-      printf("-");
+      //      printf("-");
 #endif
       G4OpenGLStoredSceneHandler::TO& to =

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

@@ -113 +113 @@
   glDisable (GL_POLYGON_SMOOTH);
 
-  fWinSize_x = fVP.GetWindowSizeHintX();
-  fWinSize_y = fVP.GetWindowSizeHintY();
+  if (fVP) {
+    fWinSize_x = fVP.GetWindowSizeHintX();
+    fWinSize_y = fVP.GetWindowSizeHintY();
+  }
 }  
 

trunk/source/visualization/management/include/G4VisExecutive.icc

@@ -131 +131 @@
 #if defined(G4UI_USE_QT)
 #ifdef G4VIS_USE_OPENGLQT
+#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
   ogl  = new G4OpenGLStoredQt;
   ogli = new G4OpenGLImmediateQt;
   ogls = new G4OpenGLStoredQt;
 #endif
+#endif
 #elif defined(G4UI_USE_XM)
 #ifdef G4VIS_USE_OPENGLXM
+#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
   ogl  = new G4OpenGLStoredXm;
   ogli = new G4OpenGLImmediateXm;
   ogls = new G4OpenGLStoredXm;
 #endif
+#endif
 #elif defined(G4UI_USE_WIN32)
 #ifdef G4VIS_USE_OPENGLWIN32
+#ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
   ogl  = new G4OpenGLStoredWin32;
   ogli = new G4OpenGLImmediateWin32;
   ogls = new G4OpenGLStoredWin32;
 #endif
+#endif
 #elif defined(G4UI_USE_TCSH)
 #if defined (G4VIS_USE_OPENGLX)
+#ifdef G4VIS_BUILD_OPENGLX_DRIVER
   ogl  = new G4OpenGLStoredX;
   ogli = new G4OpenGLImmediateX;
   ogls = new G4OpenGLStoredX;
+#endif
 #elif defined (G4VIS_USE_OPENGLWIN32)
+#ifdef G4VIS_BUILD_OPENGWIN32_DRIVER
   ogl  = new G4OpenGLStoredWin32;
   ogli = new G4OpenGLImmediateWin32;
   ogls = new G4OpenGLStoredWin32;
 #endif
+#endif
 #else
 #if defined (G4VIS_USE_OPENGLX)
+#ifdef G4VIS_BUILD_OPENGLX_DRIVER
   ogl  = new G4OpenGLStoredX;
   ogli = new G4OpenGLImmediateX;
   ogls = new G4OpenGLStoredX;
+#endif
 #elif defined (G4VIS_USE_OPENGLWIN32)
+#ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
   ogl  = new G4OpenGLStoredWin32;
   ogli = new G4OpenGLImmediateWin32;
@@ -168 +181 @@
 #endif
 #endif
+#endif
   if (ogl) {
     ogl->SetNickName("OGL");
@@ -183 +197 @@
 
 #ifdef G4VIS_USE_OPENGLX
+#ifdef G4VIS_BUILD_OPENGLX_DRIVER
   RegisterGraphicsSystem (new G4OpenGLImmediateX);
   RegisterGraphicsSystem (new G4OpenGLStoredX);
 #endif
+#endif
 
 #ifdef G4VIS_USE_OPENGLWIN32
+#ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
   RegisterGraphicsSystem (new G4OpenGLImmediateWin32);
   RegisterGraphicsSystem (new G4OpenGLStoredWin32);
 #endif
+#endif
 
 #ifdef G4VIS_USE_OPENGLXM
+#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
   RegisterGraphicsSystem (new G4OpenGLImmediateXm);
   RegisterGraphicsSystem (new G4OpenGLStoredXm);
 #endif
+#endif
 
 #ifdef G4VIS_USE_OPENGLQT
+#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
   RegisterGraphicsSystem (new G4OpenGLImmediateQt);
   RegisterGraphicsSystem (new G4OpenGLStoredQt);
+#endif
 #endif
 
@@ -206 +228 @@
   G4VGraphicsSystem* oi  = 0;
 #ifdef G4VIS_USE_OIX
+#ifdef G4VIS_BUILD_OI_DRIVER
   oi = new G4OpenInventorX;
 #endif
+#endif
 #ifdef G4VIS_USE_OIWIN32
+#ifdef G4VIS_BUILD_OIWIN32_DRIVER
   oi = new G4OpenInventorWin32;
+#endif
 #endif
   if (oi) {
@@ -218 +244 @@
 
 #ifdef G4VIS_USE_OIX
+#ifdef G4VIS_BUILD_OIX_DRIVER
   RegisterGraphicsSystem (new G4OpenInventorX);
 #endif
+#endif
 
 #ifdef G4VIS_USE_OIWIN32
+#ifdef G4VIS_BUILD_OIWIN32_DRIVER
   RegisterGraphicsSystem (new G4OpenInventorWin32);
 #endif
+#endif
 
 #ifdef G4VIS_USE_RAYTRACERX
+#ifdef G4VIS_BUILD_RAYTRACERX_DRIVER
   RegisterGraphicsSystem (new G4RayTracerX);
 #endif
+#endif
 
 #ifdef G4VIS_USE_VRML
+#ifdef G4VIS_BUILD_VRML_DRIVER
   RegisterGraphicsSystem (new G4VRML1);
   RegisterGraphicsSystem (new G4VRML2);
+#endif
 #endif