Changeset 1113

Timestamp:

Oct 2, 2009, 3:45:41 PM (15 years ago)

Author:

garnier

Message:

en debug.....

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc (modified) (6 diffs)

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

@@ -44 +44 @@
 // Also seems to be required for HP's CC and AIX xlC, at least.
 
+
+// FIXME : L.Garnier 22 Sept 09
+// This include should be the first, because we should include 
+// qobject.h first. I don't know why, but on macOSX 10.5.8, if
+// we do not, it says :
+// /Library/Frameworks/QtCore.framework/Headers/qglobal.h:1895: error: redefinition of ‘class QTypeInfo<char>’
+// /Library/Frameworks/QtCore.framework/Headers/qglobal.h:1894: error: previous definition of ‘class QTypeInfo<char>’
+
+#include "G4OpenGLQtViewer.hh"
 #include "G4OpenGLSceneHandler.hh"
 #include "G4OpenGLViewer.hh"
@@ -252 +261 @@
 void G4OpenGLSceneHandler::AddPrimitive (const G4Text& text) {
 
+#ifdef G4DEBUG_VIS_OGL
+  printf ("G4OpenGLSceneHandler::AddPrimitives TEXT\n");
+#endif  
   // Loads G4Atts for picking...
   if (fpViewer->GetViewParameters().IsPicking()) {
+#ifdef G4DEBUG_VIS_OGL
+  printf ("G4OpenGLSceneHandler::AddPrimitives PICKING\n");
+#endif  
     G4AttHolder* holder = new G4AttHolder;
     LoadAtts(text, holder);
@@ -265 +280 @@
   G4String textString = text.GetText();
 
+#ifdef G4DEBUG_VIS_OGL
+  printf ("G4OpenGLSceneHandler::AddPrimitives TEXT -%s-X:%f Y:%f Z:%f- - Red:%f Green:%f Blue:%f--\n",textString.c_str(),position.x(),position.y(),position.z(),c.GetRed (), c.GetGreen (), c.GetBlue ());
+#endif  
+
   G4int font_base = G4OpenGLFontBaseStore::GetFontBase(fpViewer,size);
+#ifdef G4DEBUG_VIS_OGL
+  printf ("G4OpenGLSceneHandler::AddPrimitives getFontBase ?size=%f-recu:%d-\n",size,font_base);
+#endif  
   if (font_base < 0) {
+#ifdef G4DEBUG_VIS_OGL
+    printf ("G4OpenGLSceneHandler::AddPrimitives NO FONT BASE--\n");
+#endif  
+    
+#ifdef G4DEBUG_VIS_OGL
+    printf ("G4OpenGLSceneHandler::AddPrimitives SPECIAL CASE\n");
+#endif  
+    G4OpenGLQtViewer* oGLSQtViewer = dynamic_cast<G4OpenGLQtViewer*>(fpViewer);
+    if (oGLSQtViewer) {
+      // FIXME : No font for the moment
+      const char* textCString = textString.c_str();
+      oGLSQtViewer->drawText(textCString,position.x(),position.y(),position.z(),size);
+    }
     static G4int callCount = 0;
     ++callCount;
     if (callCount <= 10 || callCount%100 == 0) {
+      
+      
+      
       G4cout <<
         "G4OpenGLSceneHandler::AddPrimitive (const G4Text&) call count "
@@ -287 +325 @@
   const char* textCString = textString.c_str();
   glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ());
-  glDisable (GL_DEPTH_TEST);
-  glDisable (GL_LIGHTING);
+  G4OpenGLQtViewer* oGLSQtViewer = dynamic_cast<G4OpenGLQtViewer*>(fpViewer);
+
+  if (oGLSQtViewer) {
+    // FIXME : No font for the moment
+    oGLSQtViewer->drawText(textCString,position.x(),position.y(),position.z(),size);
+  } else {
+    glDisable (GL_DEPTH_TEST);
+    glDisable (GL_LIGHTING);
+    
+    glRasterPos3d(position.x(),position.y(),position.z());
+    // No action on offset or layout at present.
+    glPushAttrib(GL_LIST_BIT);
+    glListBase(font_base);
+    glCallLists(strlen(textCString), GL_UNSIGNED_BYTE, (GLubyte *)textCString);
+    glPopAttrib();
+  }
+  //     //////////////
+  //     makeCurrent();
+  //     glPushAttrib(GL_LIST_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT);
+  //     glRasterPos3d(x, y, z);
+  //     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+  //     glEnable(GL_BLEND);
+  //     glListBase(fontDisplayListBase(fnt, listBase));
+  //     glCallLists(str.length(), GL_UNSIGNED_BYTE, str.local8Bit());
+  //     glPopAttrib();
+  //     //////////////
   
-  glRasterPos3d(position.x(),position.y(),position.z());
-  // No action on offset or layout at present.
-   glPushAttrib(GL_LIST_BIT);
-   glListBase(font_base);
-   glCallLists(strlen(textCString), GL_UNSIGNED_BYTE, (GLubyte *)textCString);
-   glPopAttrib();
+#ifdef G4DEBUG_VIS_OGL
+  printf ("G4OpenGLSceneHandler::AddPrimitives TEXT\n");
+#endif  
 }
 
@@ -442 +501 @@
   // Assume all facets are planar convex quadrilaterals.
   // Draw each facet individually
-  
+#ifdef G4DEBUG_VIS_OGL
+  printf ("G4OpenGLSceneHandler::AddPrimitives BEGIN poly\n");
+#endif  
   if (polyhedron.GetNoFacets() == 0) return;
+#ifdef G4DEBUG_VIS_OGL
+    printf ("G4OpenGLSceneHandler::AddPrimitives BEGIN 2 poly %d ++ %d\n",fpViewer,fpViewer->GetViewParameters().IsPicking());
+#endif
 
   // Loads G4Atts for picking...
@@ -449 +513 @@
     G4AttHolder* holder = new G4AttHolder;
     const G4Visible vis;
-    printf ("G4OpenGLSceneHandler::AddPrimitives poly %d",&polyhedron);
-    LoadAtts(vis, holder);
+#ifdef G4DEBUG_VIS_OGL
+    printf ("G4OpenGLSceneHandler::AddPrimitives poly %d\n",&polyhedron);
+#endif
+    LoadAtts(polyhedron, holder);
     //    LoadAtts(polyhedron, holder);
     fPickMap[fPickName] = holder;