Changeset 1346 for trunk/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc

Timestamp:

Dec 22, 2010, 11:33:38 AM (13 years ago)

Author:

garnier

Message:

before tag

File:

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

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

@@ -46 +46 @@
 #include "G4OpenGLSceneHandler.hh"
 #include "G4OpenGLViewer.hh"
-#include "G4OpenGLFontBaseStore.hh"
+#include "G4OpenGLQtViewer.hh"
+#include "G4OpenGLXViewer.hh"
 #include "G4OpenGLTransform3D.hh"
 #include "G4Point3D.hh"
@@ -268 +269 @@
   G4String textString = text.GetText();
 
-  G4int font_base = G4OpenGLFontBaseStore::GetFontBase(fpViewer,size);
-  if (font_base < 0) {
-    static G4int callCount = 0;
-    ++callCount;
-    if (callCount <= 10 || callCount%100 == 0) {
-      G4cout <<
-        "G4OpenGLSceneHandler::AddPrimitive (const G4Text&) call count "
-             << callCount <<
-        "\n  No fonts available."
-        "\n  Called with text \""
-             << text.GetText ()
-             << "\"\n  at " << position
-             << ", size " << size
-             << ", offsets " << text.GetXOffset () << ", " << text.GetYOffset ()
-             << ", type " << G4int(sizeType)
-             << ", colour " << c
-             << G4endl;
-    }
-    return;
-  }
   const char* textCString = textString.c_str();
+  GLfloat color[4]; /* Ask OpenGL for the current color */
+  glGetFloatv(GL_CURRENT_COLOR, color);
   glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ());
   glDisable (GL_DEPTH_TEST);
@@ -294 +277 @@
   
   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();
+  //FIXME : We should do a virtual method drawText in all viewers
+  // Not the same way to draw text in Qt
+#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
+  G4OpenGLQtViewer* pQtViewer = dynamic_cast<G4OpenGLQtViewer*>(fpViewer);
+  if (pQtViewer) { 
+    pQtViewer->drawText(textCString,position.x(),position.y(),position.z(),size);
+  }
+#endif
+
+  // nor for X
+#ifdef G4VIS_BUILD_OPENGLX_DRIVER
+  G4OpenGLXViewer* pXViewer = dynamic_cast<G4OpenGLXViewer*>(fpViewer);
+  if (pXViewer) { 
+
+    pXViewer->drawText(textCString,position.x(),position.y(),position.z(),size);
+  }
+#endif
+  glColor3d (color[0], color[1], color[2]);
+
 }