Changeset 1314 for trunk/source/visualization/OpenGL

Timestamp:

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

Author:

garnier

Message:

en test pas dans CVS

Location:

trunk/source/visualization/OpenGL/src

Files:

• G4OpenGLImmediateQtViewer.cc (modified) (2 diffs)
• G4OpenGLQtViewer.cc (modified) (1 diff)
• G4OpenGLStoredViewer.cc (modified) (1 diff)
• G4OpenGLViewer.cc (modified) (1 diff)

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();
+  }
 }