Changeset 1288 for trunk/source/visualization/management/include/G4VisExecutive.icc

Timestamp:

Jun 1, 2010, 6:36:22 PM (14 years ago)

Author:

garnier

Message:

update from CVS

File:

• trunk/source/visualization/management/include/G4VisExecutive.icc (modified) (6 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VisExecutive.icc,v 1.22 2009/10/12 11:54:50 akimura Exp $
+// $Id: G4VisExecutive.icc,v 1.26 2010/05/30 11:30:49 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -43 +43 @@
 #include "G4RayTracer.hh"
 #include "G4HitFilterFactories.hh"
+#include "G4DigiFilterFactories.hh"
 #include "G4TrajectoryFilterFactories.hh"
 #include "G4TrajectoryModelFactories.hh"
@@ -91 +92 @@
 #include "G4VRML2.hh"
 #endif
+
+  G4VisExecutive::G4VisExecutive (const G4String& verbosityString):
+    G4VisManager(verbosityString)       
+  {}
 
 // The inline keyword prevents the compiler making an external
@@ -118 +123 @@
 #endif
 
+// Register OGL graphics system with generic nicknames
+#ifdef G4VIS_USE_OPENGL
+  G4VGraphicsSystem* ogl  = 0;
+  G4VGraphicsSystem* ogli = 0;
+  G4VGraphicsSystem* ogls = 0;
+// Follow G4UIExecutive
+#if defined(G4UI_USE_QT)
+#ifdef G4VIS_USE_OPENGLQT
+  ogl  = new G4OpenGLStoredQt;
+  ogli = new G4OpenGLImmediateQt;
+  ogls = new G4OpenGLStoredQt;
+#endif
+#elif defined(G4UI_USE_XM)
+#ifdef G4VIS_USE_OPENGLXM
+  ogl  = new G4OpenGLStoredXm;
+  ogli = new G4OpenGLImmediateXm;
+  ogls = new G4OpenGLStoredXm;
+#endif
+#elif defined(G4UI_USE_WIN32)
+#ifdef G4VIS_USE_OPENGLWIN32
+  ogl  = new G4OpenGLStoredWin32;
+  ogli = new G4OpenGLImmediateWin32;
+  ogls = new G4OpenGLStoredWin32;
+#endif
+#elif defined(G4UI_USE_TCSH)
+#if defined (G4VIS_USE_OPENGLX)
+  ogl  = new G4OpenGLStoredX;
+  ogli = new G4OpenGLImmediateX;
+  ogls = new G4OpenGLStoredX;
+#elif defined (G4VIS_USE_OPENGLWIN32)
+  ogl  = new G4OpenGLStoredWin32;
+  ogli = new G4OpenGLImmediateWin32;
+  ogls = new G4OpenGLStoredWin32;
+#endif
+#else
+#if defined (G4VIS_USE_OPENGLX)
+  ogl  = new G4OpenGLStoredX;
+  ogli = new G4OpenGLImmediateX;
+  ogls = new G4OpenGLStoredX;
+#elif defined (G4VIS_USE_OPENGLWIN32)
+  ogl  = new G4OpenGLStoredWin32;
+  ogli = new G4OpenGLImmediateWin32;
+  ogls = new G4OpenGLStoredWin32;
+#endif
+#endif
+  if (ogl) {
+    ogl->SetNickName("OGL");
+    RegisterGraphicsSystem (ogl);
+  }
+  if (ogli) {
+    ogli->SetNickName("OGLI");
+    RegisterGraphicsSystem (ogli);
+  }
+  if (ogls) {
+    ogls->SetNickName("OGLS");
+    RegisterGraphicsSystem (ogls);
+  }
+#endif
+
 #ifdef G4VIS_USE_OPENGLX
   RegisterGraphicsSystem (new G4OpenGLImmediateX);
@@ -136 +200 @@
   RegisterGraphicsSystem (new G4OpenGLImmediateQt);
   RegisterGraphicsSystem (new G4OpenGLStoredQt);
+#endif
+
+// Register OI graphics system with generic nickname
+#ifdef G4VIS_USE_OI
+  G4VGraphicsSystem* oi  = 0;
+#ifdef G4VIS_USE_OIX
+  oi = new G4OpenInventorX;
+#endif
+#ifdef G4VIS_USE_OIWIN32
+  oi = new G4OpenInventorWin32;
+#endif
+  if (oi) {
+    oi->SetNickName("OI");
+    RegisterGraphicsSystem (oi);
+  }
 #endif
 
@@ -176 +255 @@
    // Hit filter models
    RegisterModelFactory(new G4HitAttributeFilterFactory());
+
+   // Digi filter models
+   RegisterModelFactory(new G4DigiAttributeFilterFactory());
 }