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

Timestamp:

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

Author:

garnier

Message:

before tag

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc (modified) (7 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLXViewer.cc,v 1.55 2009/05/13 10:28:00 lgarnier Exp $
+// $Id: G4OpenGLXViewer.cc,v 1.56 2010/11/10 17:57:16 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -38 +38 @@
 #include "G4VViewer.hh"
 #include "G4OpenGLSceneHandler.hh"
-#include <GL/glu.h>
 
 #include "G4OpenGLFontBaseStore.hh"
@@ -50 +49 @@
 #include "G4Normal3D.hh"
 #include "G4StateManager.hh"
+#include "G4VisManager.hh"
 
 #include <X11/Xatom.h>
@@ -197 +197 @@
     if (!cmap) {
       fViewId = -1;  // This flags an error.
-      G4cerr <<
-   "G4OpenGLViewer::G4OpenGLViewer failed to allocate a standard colormap."
-             << G4endl;
+      if (G4VisManager::GetVerbosity() >= G4VisManager::errors)
+        G4cerr <<
+  "G4OpenGLViewer::G4OpenGLViewer failed to allocate a standard colormap."
+               << G4endl;
       return;
     }
-    G4cout << "Got standard cmap" << G4endl;
+    if (G4VisManager::GetVerbosity() >= G4VisManager::confirmations)
+      G4cout << "Got standard cmap" << G4endl;
   } else {
     cmap = XCreateColormap (dpy, 
@@ -208 +210 @@
                             vi -> visual, 
                             AllocNone);
-    G4cout << "Created own cmap" << G4endl;
+    if (G4VisManager::GetVerbosity() >= G4VisManager::confirmations)
+      G4cout << "Created own cmap" << G4endl;
   }
 
   if (!cmap) {
     fViewId = -1;  // This flags an error.
-    G4cerr << "G4OpenGLViewer::G4OpenGLViewer failed to allocate a Colormap."
-         << G4endl;
+    if (G4VisManager::GetVerbosity() >= G4VisManager::errors)
+      G4cout << "G4OpenGLViewer::G4OpenGLViewer failed to allocate a Colormap."
+             << G4endl;
     return;
   }
@@ -250 +254 @@
     size_hints->flags |= PPosition;
   }
-  G4cout << "Window name: " << fName << G4endl;
+  if (G4VisManager::GetVerbosity() >= G4VisManager::confirmations)
+    G4cout << "Window name: " << fName << G4endl;
   strncpy (charViewName, fName, 100);
   char *window_name = charViewName;
@@ -337 +342 @@
 }
 
+void G4OpenGLXViewer::drawText(const char * textString,int x,int y,int z, int size){
+  
+  CreateFontLists ();
+  // gl2ps or GL window ?
+  if (! drawGl2psText(textString,size)) {
+
+    G4int font_base = G4OpenGLFontBaseStore::GetFontBase(this,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 \""
+               << textString
+               << "\"\n  at "
+               << "x:"<< x
+               << "y:"<< y
+               << "z:"<< z
+               << ", size " << size
+          //               << ", offsets " << text.GetXOffset () << ", " << text.GetYOffset ()
+               << G4endl;
+      }
+      return;
+    }
+    // No action on offset or layout at present.
+    glPushAttrib(GL_LIST_BIT);
+    glListBase(font_base);
+    glCallLists(strlen(textString), GL_UNSIGNED_BYTE, (GLubyte *)textString);
+    glPopAttrib();
+  }
+}
+
+
 G4OpenGLXViewer::G4OpenGLXViewer (G4OpenGLSceneHandler& scene):
 G4VViewer (scene, -1),