Changeset 1340 for trunk/source/visualization

Timestamp:

Nov 5, 2010, 3:45:55 PM (15 years ago)

Author:

garnier

Message:

update ti head

Location:

trunk/source/visualization

Files:

• CVS/Entries (modified) (1 diff)
• HepRep/CVS/Entries (modified) (1 diff)
• History (modified) (2 diffs)
• OpenGL/CVS/Entries (modified) (1 diff)
• OpenGL/GNUmakefile (modified) (1 diff)
• OpenGL/History (modified) (2 diffs)
• OpenGL/include/CVS/Entries (modified) (3 diffs)
• OpenGL/include/G4OpenGLQtViewer.hh (modified) (3 diffs)
• OpenGL/include/G4OpenGLStoredSceneHandler.hh (modified) (3 diffs)
• OpenGL/include/G4OpenGLViewer.hh (modified) (1 diff)
• OpenGL/include/G4OpenGLViewerMessenger.hh (modified) (3 diffs)
• OpenGL/src/CVS/Entries (modified) (3 diffs)
• OpenGL/src/G4OpenGLQtViewer.cc (modified) (13 diffs)
• OpenGL/src/G4OpenGLStoredQtViewer.cc (modified) (4 diffs)
• OpenGL/src/G4OpenGLStoredSceneHandler.cc (modified) (5 diffs)
• OpenGL/src/G4OpenGLStoredViewer.cc (modified) (3 diffs)
• OpenGL/src/G4OpenGLViewer.cc (modified) (15 diffs)
• OpenGL/src/G4OpenGLViewerMessenger.cc (modified) (6 diffs)
• OpenInventor/CVS/Entries (modified) (1 diff)
• OpenInventor/History (modified) (2 diffs)
• OpenInventor/src/CVS/Entries (modified) (2 diffs)
• OpenInventor/src/G4OpenInventorViewer.cc (modified) (2 diffs)
• XXX/CVS/Entries (modified) (1 diff)
• XXX/History (modified) (2 diffs)
• XXX/src/CVS/Entries (modified) (1 diff)
• XXX/src/G4XXXSGViewer.cc (modified) (2 diffs)
• XXX/src/G4XXXStoredViewer.cc (modified) (2 diffs)
• externals/gl2ps/CVS/Entries (modified) (1 diff)
• externals/gl2ps/History (modified) (2 diffs)
• externals/gl2ps/include/CVS/Entries (modified) (1 diff)
• externals/gl2ps/include/Geant4_gl2ps.h (modified) (1 diff)
• externals/gl2ps/include/gl2ps.h (modified) (3 diffs)
• externals/gl2ps/src/CVS/Entries (modified) (1 diff)
• externals/gl2ps/src/G4OpenGL2PSAction.cc (modified) (2 diffs)
• externals/gl2ps/src/gl2ps.cc (modified) (21 diffs)
• externals/zlib/CVS/Entries (modified) (1 diff)
• management/CVS/Entries (modified) (1 diff)
• management/History (modified) (2 diffs)
• management/include/CVS/Entries (modified) (2 diffs)
• management/include/G4VisCommandsViewerSet.hh (modified) (2 diffs)
• management/src/CVS/Entries (modified) (2 diffs)
• management/src/G4ViewParameters.cc (modified) (1 diff)
• management/src/G4VisCommandsViewerSet.cc (modified) (5 diffs)
• test/G4History.macro (modified) (21 diffs)
• test/History (modified) (2 diffs)
• test/test19.cc (modified) (3 diffs)
• test/test19.g4m (modified) (1 diff)

trunk/source/visualization/CVS/Entries

@@ -13 +13 @@
 /CMakeLists.txt/1.1/Wed Sep 29 19:11:25 2010//
 /GNUmakefile/1.27/Thu Sep 30 11:54:25 2010//
-/History/1.481/Thu Sep 30 06:16:17 2010//
+/History/1.484/Fri Nov  5 10:16:45 2010//

trunk/source/visualization/HepRep/CVS/Entries

@@ -5 +5 @@
 /History/1.135/Thu Sep 30 06:16:21 2010//
 /README/1.23/Mon Jul 12 14:53:10 2010//
-/sources.cmake/1.1/Wed Sep 29 19:11:58 2010//
+/sources.cmake/1.2/Fri Oct  8 10:03:41 2010//

trunk/source/visualization/History

@@ -1 @@
-$Id: History,v 1.481 2010/06/15 16:41:14 allison Exp $
+$Id: History,v 1.484 2010/10/27 11:20:27 allison Exp $
 -------------------------------------------------------------------
 
@@ -24 +24 @@
 History file for visualization category
 ---------------------------------------
+
+27th October 2010  John Allison
+- vistest-V09-03-01: Replaced MyPhysicsList by QGSP_BERT.
+
+8th October 2010  John Allison  (vis-V09-03-09 with co-working tags...)
+- Co-working tags: interfaces-V09-03-12 + config-V09-03-08
+- visman-V09-03-12:
+  o Added /vis/viewer/set/defaultColour and defaultTextColour.
+- opengl-V09-03-07/08:
+  o Improved kernel visit trigger.
+  o Time-slices fade to background colour.
+  o Many improvements to Qt.
+- openinventor-V09-03-01:
+  o Improved kernel visit trigger.
+- visXXX-V08-03-00:
+  o Improved kernel visit trigger.
+- visexternal-V09-03-00:
+  o G4OpenGL2PSAction : add new method to set viewport.
+- gMocren-V09-03-04:
+  o Added missing inclusion of <sstream>.
 
 15th June 2010  John Allison  (vis-V09-03-08)

trunk/source/visualization/OpenGL/CVS/Entries

@@ -4 +4 @@
 /Doxyfile/1.4/Mon Jul 12 14:53:12 2010//
 /GNUmakefile/1.13/Thu Sep 30 06:16:41 2010//
-/History/1.180/Thu Sep 30 11:54:25 2010//
 /sources.cmake/1.1/Wed Sep 29 19:12:14 2010//
+/History/1.187/Fri Nov  5 10:16:45 2010//

trunk/source/visualization/OpenGL/GNUmakefile

@@ -11 +11 @@
 
 # For debug mode
-# CPPFLAGS += -DG4DEBUG_VIS_OGL
+CPPFLAGS += -DG4DEBUG_VIS_OGL
 
 GLOBLIBS  = libG4vis_management.lib libG4modeling.lib libG4gl2ps.lib

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.180 2010/06/23 13:29:23 lgarnier Exp $
+$Id: History,v 1.187 2010/11/05 06:25:23 allison Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+5th November 2010  John Allison
+- G4OpenGLStoredSceneHandler, G4OpenGLViewerMessenger:
+  o Introduced a display list limit to avoid memory exhaustion.
+  o Introduced /vis/ogl/set/displayListLimit.
+
+8th October 2010  Laurent Garnier
+- G4OpenGQtViewer.cc:
+  o Add menu for changing text color, default color, background color
+  o Toogle projection now call directly command instead of redefinding it
+
+6th October 2010  John Allison  (opengl-V09-03-08 with co-working tags...)
+- Co-working tags: interfaces-V09-03-12 + config-V09-03-08
+- G4OpenGLStoredViewer.cc:
+  o Added default colour and default text colour to list of parameters
+    that trigger a kernel visit.
+
+5th October 2010  John Allison
+- G4OpenGLStoredViewer.cc: Time-slices fade to background colour.
+
+5th October 2010  Laurent Garnier
+- Change lots of shortcuts in Qt
+- Add 'google earth like' rotation
 
 23th June 2010  Laurent Garnier

trunk/source/visualization/OpenGL/include/CVS/Entries

@@ -14 +14 @@
 /G4OpenGLQtExportDialog.hh/1.7/Thu Sep 30 06:16:49 2010//
 /G4OpenGLQtMovieDialog.hh/1.4/Thu Sep 30 06:16:49 2010//
-/G4OpenGLQtViewer.hh/1.23/Thu Sep 30 06:16:49 2010//
 /G4OpenGLSceneHandler.hh/1.30/Thu Sep 30 06:16:49 2010//
 /G4OpenGLSceneHandler.icc/1.9/Thu Sep 30 06:16:49 2010//
 /G4OpenGLStoredQt.hh/1.2/Thu Sep 30 06:16:49 2010//
 /G4OpenGLStoredQtViewer.hh/1.10/Thu Sep 30 06:16:49 2010//
-/G4OpenGLStoredSceneHandler.hh/1.28/Thu Sep 30 06:16:49 2010//
 /G4OpenGLStoredViewer.hh/1.10/Thu Sep 30 06:16:49 2010//
 /G4OpenGLStoredWin32.hh/1.8/Thu Sep 30 06:16:49 2010//
@@ -28 +26 @@
 /G4OpenGLStoredXmViewer.hh/1.8/Thu Sep 30 06:16:50 2010//
 /G4OpenGLTransform3D.hh/1.8/Thu Sep 30 06:16:50 2010//
-/G4OpenGLViewer.hh/1.32/Thu Sep 30 06:16:50 2010//
-/G4OpenGLViewerMessenger.hh/1.7/Thu Sep 30 06:16:50 2010//
 /G4OpenGLWin32Viewer.hh/1.15/Thu Sep 30 06:16:50 2010//
 /G4OpenGLXViewer.hh/1.32/Thu Sep 30 06:16:50 2010//
@@ -48 +44 @@
 /G4OpenGLXmViewer.hh/1.11/Thu Sep 30 06:16:50 2010//
 /G4OpenGLXmViewerMessenger.hh/1.5/Thu Sep 30 06:16:50 2010//
+/G4OpenGLViewer.hh/1.33/Tue Oct  5 15:45:19 2010//
+/G4OpenGLQtViewer.hh/1.25/Fri Oct  8 10:07:31 2010//
+/G4OpenGLStoredSceneHandler.hh/1.29/Fri Nov  5 10:16:52 2010//
+/G4OpenGLViewerMessenger.hh/1.8/Fri Nov  5 10:16:52 2010//
 D

trunk/source/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.hh,v 1.23 2010/06/04 15:27:47 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.hh,v 1.25 2010/10/08 10:07:31 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -231 +231 @@
   void actionDrawingLineSurfaceRemoval();
   void actionSaveImage();
+  void actionChangeBackgroundColor();
+  void actionChangeTextColor();
+  void actionChangeDefaultColor();
   void actionMovieParameters();
 
@@ -238 +241 @@
   void toggleRepresentation(bool);
   void toggleProjection(bool);
-  void toggleBackground(bool);
   void toggleTransparency(bool);
   void toggleAntialiasing(bool);

trunk/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredSceneHandler.hh,v 1.28 2009/02/04 16:48:40 lgarnier Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4OpenGLStoredSceneHandler.hh,v 1.29 2010/11/05 06:25:23 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -69 +69 @@
   void ClearTransientStore ();
 
+  static G4int GetDisplayListLimit() {return fDisplayListLimit;}
+  static void SetDisplayListLimit(G4int lim) {fDisplayListLimit = lim;}
+
 protected:
 
@@ -77 +80 @@
   static G4int     fSceneIdCount;   // static counter for OpenGLStored scenes.
   G4int            fDisplayListId;  // Workspace.
-  G4bool  fMemoryForDisplayLists;   // avoid memory overflow
+  G4bool fMemoryForDisplayLists;    // avoid memory overflow
+  static G4int fDisplayListLimit;   // avoid memory overflow
+  static G4int fDisplayListBase;    // avoid memory overflow
   G4int fAddPrimitivePreambleNestingDepth;
   

trunk/source/visualization/OpenGL/include/G4OpenGLViewer.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewer.hh,v 1.32 2009/05/14 16:38:23 lgarnier Exp $
+// $Id: G4OpenGLViewer.hh,v 1.33 2010/10/05 15:45:19 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

trunk/source/visualization/OpenGL/include/G4OpenGLViewerMessenger.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewerMessenger.hh,v 1.7 2009/05/18 09:07:12 lgarnier Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4OpenGLViewerMessenger.hh,v 1.8 2010/11/05 06:25:23 allison Exp $
+// GEANT4 tag $Name:  $
 
 #ifndef G4OPENGLVIEWERMESSENGER_HH
@@ -41 +41 @@
 class G4UIcmdWithABool;
 class G4UIcmdWithAString;
+class G4UIcmdWithAnInteger;
 
 class G4OpenGLViewerMessenger: public G4UImessenger {
@@ -57 +58 @@
   G4UIdirectory* fpDirectorySet;
   G4UIcommand* fpCommandDisplayHeadTime;
+  G4UIcmdWithAnInteger* fpCommandDisplayListLimit;
   G4UIcommand* fpCommandDisplayLightFront;
   G4UIcommand* fpCommandEndTime;

trunk/source/visualization/OpenGL/src/CVS/Entries

@@ -14 +14 @@
 /G4OpenGLSceneHandler.cc/1.59/Thu Sep 30 06:16:59 2010//
 /G4OpenGLStoredQt.cc/1.10/Thu Sep 30 06:16:59 2010//
-/G4OpenGLStoredSceneHandler.cc/1.42/Thu Sep 30 06:16:59 2010//
-/G4OpenGLStoredViewer.cc/1.26/Thu Sep 30 06:16:59 2010//
 /G4OpenGLStoredWin32.cc/1.15/Thu Sep 30 06:17:00 2010//
 /G4OpenGLStoredWin32Viewer.cc/1.22/Thu Sep 30 06:17:00 2010//
@@ -23 +21 @@
 /G4OpenGLStoredXmViewer.cc/1.26/Thu Sep 30 06:17:00 2010//
 /G4OpenGLTransform3D.cc/1.9/Thu Sep 30 06:17:00 2010//
-/G4OpenGLViewer.cc/1.62/Thu Sep 30 06:17:00 2010//
-/G4OpenGLViewerMessenger.cc/1.18/Thu Sep 30 06:17:00 2010//
 /G4OpenGLWin32Viewer.cc/1.20/Thu Sep 30 06:17:00 2010//
 /G4OpenGLXViewer.cc/1.55/Thu Sep 30 06:17:00 2010//
@@ -49 +45 @@
 /G4OpenGLXmWindowHandlingCallbacks.cc/1.11/Thu Sep 30 06:17:09 2010//
 /G4OpenGLImmediateQtViewer.cc/1.22/Thu Sep 30 11:54:33 2010//
-/G4OpenGLQtViewer.cc/1.52/Thu Sep 30 11:54:33 2010//
 /G4OpenGLStoredQtViewer.cc/1.32/Thu Sep 30 11:54:33 2010//
+/G4OpenGLViewer.cc/1.63/Tue Oct  5 15:45:19 2010//
+/G4OpenGLStoredViewer.cc/1.29/Wed Oct  6 15:59:03 2010//
+/G4OpenGLQtViewer.cc/1.55/Fri Oct  8 10:07:31 2010//
+/G4OpenGLStoredSceneHandler.cc/1.43/Fri Nov  5 10:16:52 2010//
+/G4OpenGLViewerMessenger.cc/1.19/Fri Nov  5 10:16:52 2010//
 D

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.52 2010/06/23 13:29:23 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.55 2010/10/08 10:07:31 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -79 +79 @@
 #include <qgl.h> // include <qglwidget.h>
 #include <qdialog.h>
+#include <qcolordialog.h>
 #include <qevent.h> //include <qcontextmenuevent.h>
 
@@ -111 +112 @@
   //  fWindow->makeCurrent();
 
-#ifdef G4DEBUG_VIS_OGL
-#if QT_VERSION < 0x040000
-  printf("G4OpenGLQtViewer::CreateMainWindow :: ++++++++++++++ add new TAB %s  W:%d H:%d SizeHinX:%d SizeHintY:%d\n",name.ascii(),getWinWidth(),getWinHeight(),fVP.GetWindowSizeHintX(),fVP.GetWindowSizeHintY());
-#else
-  printf("G4OpenGLQtViewer::CreateMainWindow :: ++++++++++++++ add new TAB %s  W:%d H:%d SizeHinX:%d SizeHintY:%d\n",name.toStdString().c_str(),getWinWidth(),getWinHeight(),fVP.GetWindowSizeHintX(),fVP.GetWindowSizeHintY());
-#endif
-#endif
   //G4Qt* interactorManager = G4Qt::getInstance ();
 
@@ -552 +546 @@
 #endif
 
-
-
-#if QT_VERSION < 0x040000
-  QPopupMenu *mBackground = new QPopupMenu(mStyle);
-  mStyle->insertItem("&Background color",mBackground);
+  // Background Color
+
+  QAction *backgroundColorChooser ;
+#if QT_VERSION < 0x040000
+  QPopupMenu *mBackgroundColor = new QPopupMenu(mStyle);
+  mStyle->insertItem("&Background color",mBackgroundColor);
 
 #if QT_VERSION < 0x030200
-  QAction *white = new QAction("&White","&White",CTRL+Key_W,mBackground,0,true);
-  QAction *black =  new QAction("&Black","&Black",CTRL+Key_B,mBackground,0,true);
-#else
-  QAction *white = new QAction("&White",CTRL+Key_W,mBackground);
-  QAction *black =  new QAction("&Black",CTRL+Key_B,mBackground);
-  white->setToggleAction(true);
-  black->setToggleAction(true);
-#endif
-  white->addTo(mBackground);
-  black->addTo(mBackground);
-
-#else
-  QMenu *mBackground = mStyle->addMenu("&Background color");
-  QAction *white = mBackground->addAction("White");
-  QAction *black = mBackground->addAction("Black");
-
-#endif
-  if (background.GetRed() == 1. &&
-      background.GetGreen() == 1. &&
-      background.GetBlue() == 1.) {
-    createRadioAction(white,black,SLOT(toggleBackground(bool)),1);
-  } else {
-    createRadioAction(white,black,SLOT(toggleBackground(bool)),2);
-  }
+  backgroundColorChooser =  new QAction("&Choose ...","&Choose ...",CTRL+Key_C,mBackgroundColor,0,true);
+#else
+  backgroundColorChooser =  new QAction("&Choose ...","&Choose ...",CTRL+Key_C,mBackgroundColor);
+#endif
+  backgroundColorChooser->addTo(mBackgroundColor);
+  QObject ::connect(backgroundColorChooser, 
+                    SIGNAL(activated()),
+                    this,
+                    SLOT(actionChangeBackgroundColor()));
+
+#else
+  // === Action Menu ===
+  backgroundColorChooser = mStyle->addAction("Background color");
+  QObject ::connect(backgroundColorChooser, 
+                    SIGNAL(triggered()),
+                    this,
+                    SLOT(actionChangeBackgroundColor()));
+#endif
+
+  // Text Color
+
+  QAction *textColorChooser ;
+#if QT_VERSION < 0x040000
+  QPopupMenu *mTextColor = new QPopupMenu(mStyle);
+  mStyle->insertItem("&Text color",mTextColor);
+
+#if QT_VERSION < 0x030200
+  textColorChooser =  new QAction("&Choose ...","&Choose ...",CTRL+Key_C,mTextColor,0,true);
+#else
+  textColorChooser =  new QAction("&Choose ...","&Choose ...",CTRL+Key_C,mTextColor);
+#endif
+  textColorChooser->addTo(mTextColor);
+  QObject ::connect(textColorChooser, 
+                    SIGNAL(activated()),
+                    this,
+                    SLOT(actionChangeTextColor()));
+
+#else
+  // === Action Menu ===
+  textColorChooser = mStyle->addAction("Text color");
+  QObject ::connect(textColorChooser, 
+                    SIGNAL(triggered()),
+                    this,
+                    SLOT(actionChangeTextColor()));
+#endif
+
+  // Default Color
+
+  QAction *defaultColorChooser ;
+#if QT_VERSION < 0x040000
+  QPopupMenu *mDefaultColor = new QPopupMenu(mStyle);
+  mStyle->insertItem("&Default color",mDefaultColor);
+
+#if QT_VERSION < 0x030200
+  defaultColorChooser =  new QAction("&Choose ...","&Choose ...",CTRL+Key_C,mDefaultColor,0,true);
+#else
+  defaultColorChooser =  new QAction("&Choose ...","&Choose ...",CTRL+Key_C,mDefaultColor);
+#endif
+  defaultColorChooser->addTo(mDefaultColor);
+  QObject ::connect(defaultColorChooser, 
+                    SIGNAL(activated()),
+                    this,
+                    SLOT(actionChangeDefaultColor()));
+
+#else
+  // === Action Menu ===
+  defaultColorChooser = mStyle->addAction("Default color");
+  QObject ::connect(defaultColorChooser, 
+                    SIGNAL(triggered()),
+                    this,
+                    SLOT(actionChangeDefaultColor()));
+#endif
 
 
@@ -1101 +1144 @@
 
   if (check == 1) {
-    fVP.SetFieldHalfAngle (0);
+    G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/set/projection o");
   } else {
-
-    // look for the default parameter hidden in G4UIcommand parameters
-    G4UImanager* UI = G4UImanager::GetUIpointer();
-    if(UI==NULL)
-      return;
-    G4UIcommandTree * treeTop = UI->GetTree();
-
-    // find command
-    G4UIcommand* command = treeTop->FindPath("/vis/viewer/set/projection");
-    if (!command)
-      return;
-
-    // find param
-    G4UIparameter * angleParam = NULL;
-    for(G4int i=0;  i<command->GetParameterEntries(); i++)
-    {
-      if( command->GetParameter(i)->GetParameterName() == "field-half-angle" ) {
-        angleParam = command->GetParameter(i);
-      }
-    }
-    if (!angleParam)
-      return;
-
-    // find unit
-    G4UIparameter * unitParam = NULL;
-    for(G4int i=0;  i<command->GetParameterEntries(); i++)
-    {
-      if( command->GetParameter(i)->GetParameterName() == "unit" ) {
-        unitParam = command->GetParameter(i);
-      }
-    }
-    if (!unitParam)
-      return;
-
-    G4double defaultValue = command->ConvertToDouble(angleParam->GetDefaultValue())
-                            * G4UnitDefinition::GetValueOf(unitParam->GetDefaultValue()); 
-    if (defaultValue > 89.5 || defaultValue <= 0.0) {
-      G4cerr << "Field half angle should be 0 < angle <= 89.5 degrees. Check your default Field half angle parameter";
-    } else {
-      G4cout << "Perspective view has been set to default value. Field half angle="<<angleParam->GetDefaultValue() <<" " << G4endl;
-      fVP.SetFieldHalfAngle (defaultValue);
-      SetView ();
-    }
+    G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/set/projection p");
   }  
   updateQWidget();
 }
 
-
-/**
-   SLOT Activate by a click on the background menu
-@param check : 1 white, 0 black
-*/
-void G4OpenGLQtViewer::toggleBackground(bool check) {
-
-  //   //I need to revisit the kernel if the background colour changes and
-  //   //hidden line removal is enabled, because hlr drawing utilises the
-  //   //background colour in its drawing...
-  //   // (Note added by JA 13/9/2005) Background now handled in view
-  //   // parameters.  A kernel visit is triggered on change of background.
-  if (check == 1) {
-    ((G4ViewParameters&)this->GetViewParameters()).
-      SetBackgroundColour(G4Colour(1.,1.,1.));  // White
-  } else {
-    ((G4ViewParameters&)this->GetViewParameters()).
-      SetBackgroundColour(G4Colour(0.,0.,0.));  // Black
-  }
-  updateQWidget();
-}
 
 /**
@@ -1230 +1210 @@
 void G4OpenGLQtViewer::toggleAux(bool check) {
   if (check) {
+    fVP.SetAuxEdgeVisible(true);
+  } else {
     fVP.SetAuxEdgeVisible(false);
-  } else {
-    fVP.SetAuxEdgeVisible(true);
   }
   SetNeedKernelVisit (true);
@@ -1397 +1377 @@
   }
   
+}
+
+
+void G4OpenGLQtViewer::actionChangeBackgroundColor() {
+
+  //   //I need to revisit the kernel if the background colour changes and
+  //   //hidden line removal is enabled, because hlr drawing utilises the
+  //   //background colour in its drawing...
+  //   // (Note added by JA 13/9/2005) Background now handled in view
+  //   // parameters.  A kernel visit is triggered on change of background.
+
+  QColor color;
+  color = QColorDialog::getColor(Qt::black, fGLWindow);
+  if (color.isValid()) {
+    QString com = "/vis/viewer/set/background ";
+    QString num;
+    com += num.setNum(((float)color.red())/256)+" ";
+    com += num.setNum(((float)color.green())/256)+" ";
+    com += num.setNum(((float)color.blue())/256)+" ";
+    G4UImanager::GetUIpointer()->ApplyCommand(com.toStdString().c_str());
+    updateQWidget();
+  }
+}
+
+void G4OpenGLQtViewer::actionChangeTextColor() {
+
+  QColor color;
+  color = QColorDialog::getColor(Qt::yellow, fGLWindow);
+  if (color.isValid()) {
+    QString com = "/vis/viewer/set/defaultTextColour ";
+    QString num;
+    com += num.setNum(((float)color.red())/256)+" ";
+    com += num.setNum(((float)color.green())/256)+" ";
+    com += num.setNum(((float)color.blue())/256)+" ";
+    G4UImanager::GetUIpointer()->ApplyCommand(com.toStdString().c_str());
+    updateQWidget();
+  }
+}
+
+void G4OpenGLQtViewer::actionChangeDefaultColor() {
+
+  QColor color;
+  color = QColorDialog::getColor(Qt::white, fGLWindow);
+  printf("actionChangeDefaultColor\n");
+  if (color.isValid()) {
+    QString com = "/vis/viewer/set/defaultColour ";
+    QString num;
+    com += num.setNum(((float)color.red())/256)+" ";
+    com += num.setNum(((float)color.green())/256)+" ";
+    com += num.setNum(((float)color.blue())/256)+" ";
+    G4UImanager::GetUIpointer()->ApplyCommand(com.toStdString().c_str());
+    updateQWidget();
+  }
 }
 
@@ -1510 +1543 @@
 
         if (fMouseAction == STYLE1) {  // rotate
-#ifdef G4DEBUG_VIS_OGL
-          printf("G4OpenGLQtViewer:: ___________________________________\n");
-          printf("G4OpenGLQtViewer:: mouse move\n");
-#endif
           if (fNoKeyPress) {
-#ifdef G4DEBUG_VIS_OGL
-            printf("G4OpenGLQtViewer:: rotate normal\n");
-#endif
             rotateQtScene(((float)delta.x())/correctionFactor,((float)delta.y())/correctionFactor);
           } else if (fAltKeyPress) {
-#ifdef G4DEBUG_VIS_OGL
-            printf("G4OpenGLQtViewer:: rotate view\n");
-#endif
             rotateQtSceneInViewDirection(((float)delta.x())/correctionFactor,((float)delta.y())/correctionFactor);
           }
@@ -1529 +1552 @@
           moveScene(-((float)delta.x())/correctionFactor,-((float)delta.y())/correctionFactor,0,true);
         }
-#ifdef G4DEBUG_VIS_OGL
-        printf("G4OpenGLQtViewer::G4MouseReleaseEvent Fps:%f x:%d y:%d cycle:%f\n",(float)1000/lastMoveTime.elapsed(),delta.x(),delta.y(),correctionFactor);
-#endif
         lastMoveTime.start();
       }
@@ -1583 +1603 @@
   if (fMouseAction == STYLE1) {  // rotate
     if (mButtons & Qt::LeftButton) {
-#ifdef G4DEBUG_VIS_OGL
-      printf("G4OpenGLQtViewer:: ___________________________________\n");
-      printf("G4OpenGLQtViewer:: mouse move %f %f\n",((float)deltaX),((float)deltaY));
-#endif
       if (fNoKeyPress) {
-#ifdef G4DEBUG_VIS_OGL
-        printf("G4OpenGLQtViewer:: rotate normal\n");
-#endif
         rotateQtScene(((float)deltaX),((float)deltaY));
       } else if (fAltKeyPress) {
-#ifdef G4DEBUG_VIS_OGL
-        printf("G4OpenGLQtViewer:: rotate view\n");
-#endif
         rotateQtSceneInViewDirection(((float)deltaX),((float)deltaY));
       } else if (fShiftKeyPress) {
@@ -1608 +1618 @@
         moveScene(-(float)deltaX*factor,-(float)deltaY*factor,0,false);
       } else if (fControlKeyPress) {
-#ifdef G4DEBUG_VIS_OGL
-        printf("G4OpenGLQtViewer:: zoom\n");
-#endif
         fVP.SetZoomFactor(fVP.GetZoomFactor()*(1+((float)deltaY))); 
       }
@@ -2024 +2031 @@
   }
 #else
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLQtViewer:: ________________Key Press\n");
-#endif
   if (modifier & Qt::AltModifier ) {
     fAltKeyPress = true;
     fNoKeyPress = false;
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLQtViewer:: ________________ALT\n");
-#endif
   }
   if (modifier & Qt::ShiftModifier ) {
     fShiftKeyPress = true;
     fNoKeyPress = false;
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLQtViewer:: ________________Shift\n");
-#endif
   }
   if (modifier & Qt::ControlModifier ) {
     fControlKeyPress = true;
     fNoKeyPress = false;
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLQtViewer:: ________________Control\n");
-#endif
   }
 #endif
@@ -2848 +2843 @@
   // G4UImanager* UI = 
   G4UImanager::GetUIpointer();
-#ifdef G4DEBUG_VIS_OGL
-  //  printf("G4OpenGLQtViewer::getParentWidget :: UImanager %d  G4Qt:%d et via GetUIQt:%d---------------------\n",UI,UI->GetSession(),interactorManager,interactorManager->GetUIVisWidget());
-#endif
   
   bool found = false;

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

@@ -48 +48 @@
 {
 
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::constructor VVVVVVVVVVVV\n");
-#endif
 #if QT_VERSION < 0x040000
   setFocusPolicy(QWidget::StrongFocus); // enable keybord events
@@ -59 +56 @@
   fIsRepainting = false;
 
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::constructor ^^^^^^^^^^^^\n");
-#endif
   if (fViewId < 0) return;  // In case error in base class instantiation.
 }
@@ -73 +67 @@
 
 void G4OpenGLStoredQtViewer::Initialise() {
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::Initialise VVVVVVVVVVVV\n");
-#endif
   fReadyToPaint = false;
   CreateMainWindow (this,QString(GetName()));
@@ -81 +72 @@
   
   fReadyToPaint = true;
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::Initialise ^^^^^^^^^^^^\n");
-#endif
 }
 
 void G4OpenGLStoredQtViewer::initializeGL () {
 
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::InitialiseGL () 0\n");
-#endif
   //  return;
   InitializeGLView ();
 
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::InitialiseGL () 1\n");
-#endif
 
   // clear the buffers and window.

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredSceneHandler.cc,v 1.42 2010/06/03 08:23:02 allison Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4OpenGLStoredSceneHandler.cc,v 1.43 2010/11/05 06:25:23 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -106 +106 @@
   if (fMemoryForDisplayLists) {
     fDisplayListId = glGenLists (1);
-    if (glGetError() == GL_OUT_OF_MEMORY) {  // Could pre-allocate?
+    if (glGetError() == GL_OUT_OF_MEMORY ||
+        fDisplayListId > fDisplayListLimit + fDisplayListBase) {
       G4cout <<
         "********************* WARNING! ********************"
-        "\nUnable to allocate any more display lists in OpenGL."
-        "\n     Continuing drawing in IMMEDIATE MODE."
+        "\n  Display list limit reached in OpenGL."
+        "\n  Continuing drawing in IMMEDIATE MODE."
+        "\n  Current limit: "
+             << fDisplayListLimit <<
+        ".  Change with \"/vis/ogl/set/displayListLimit\"."
         "\n***************************************************"
              << G4endl;
@@ -351 +355 @@
     glDeleteLists(fTOList[i].fDisplayListId, 1);
   fTOList.clear ();
+
+  fDisplayListBase = fDisplayListId;
 }
 
@@ -361 +367 @@
     glDeleteLists(fTOList[i].fDisplayListId, 1);
   fTOList.clear ();
+
+  fDisplayListBase = fDisplayListId;
 
   // Make sure screen corresponds to graphical database...
@@ -463 +471 @@
 G4int G4OpenGLStoredSceneHandler::fSceneIdCount = 0;
 
+G4int G4OpenGLStoredSceneHandler::fDisplayListLimit = 50000;
+
+G4int G4OpenGLStoredSceneHandler::fDisplayListBase = 0;
+
 #endif

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredViewer.cc,v 1.26 2009/04/08 16:55:44 lgarnier Exp $
-// GEANT4 tag $Name: vis-V09-03-06 $
+// $Id: G4OpenGLStoredViewer.cc,v 1.29 2010/10/06 10:05:52 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -88 +88 @@
       (lastVP.GetNoOfSides ()       != fVP.GetNoOfSides ())       ||
       (lastVP.IsMarkerNotHidden ()  != fVP.IsMarkerNotHidden ())  ||
+      (lastVP.GetDefaultVisAttributes()->GetColour() !=
+       fVP.GetDefaultVisAttributes()->GetColour())                ||
+      (lastVP.GetDefaultTextVisAttributes()->GetColour() !=
+       fVP.GetDefaultTextVisAttributes()->GetColour())            ||
       (lastVP.GetBackgroundColour ()!= fVP.GetBackgroundColour ())||
       (lastVP.IsPicking ()          != fVP.IsPicking ())
@@ -165 +169 @@
         glMultMatrixd (oglt.GetGLMatrix ());
         if (fVP.IsPicking()) glLoadName(to.fPickName);
-        G4Colour& c = to.fColour;
+        const G4Colour& c = to.fColour;
+        const G4Colour& bg = fVP.GetBackgroundColour();
         G4double bsf = 1.;  // Brightness scaling factor.
         if (fFadeFactor > 0. && to.fEndTime < fEndTime)
           bsf = 1. - fFadeFactor *
             ((fEndTime - to.fEndTime) / (fEndTime - fStartTime));
-        glColor3d(bsf * c.GetRed (), bsf * c.GetGreen (), bsf * c.GetBlue ());
+        glColor3d
+          (bsf * c.GetRed() + (1. - bsf) * bg.GetRed(),
+           bsf * c.GetGreen() + (1. - bsf) * bg.GetGreen(),
+           bsf * c.GetBlue() + (1. - bsf) * bg.GetBlue());
         glCallList (to.fDisplayListId);
         glPopMatrix();

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewer.cc,v 1.62 2010/05/11 10:22:37 allison Exp $
+// $Id: G4OpenGLViewer.cc,v 1.63 2010/10/05 15:45:19 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -113 +113 @@
   glDisable (GL_POLYGON_SMOOTH);
 
-  //  if (fVP != NULL) {
-    fWinSize_x = fVP.GetWindowSizeHintX();
-    fWinSize_y = fVP.GetWindowSizeHintY();
-    //  }
+  fWinSize_x = fVP.GetWindowSizeHintX();
+  fWinSize_y = fVP.GetWindowSizeHintY();
 }  
 
@@ -177 +175 @@
   }
     
-  glViewport(0, 0, fWinSize_x,fWinSize_y); 
-
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::ResizeGLView END %d %d &:%d\n",fWinSize_x,fWinSize_y,this);
-#endif
-  
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::ResizeGLView viewport X:%d Y:%d\n",fWinSize_x,fWinSize_y);
+#endif
+  glViewport(0, 0, fWinSize_x,fWinSize_y);   
+
+
 }
 
@@ -191 +189 @@
     return;
   }
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::SetView\n");
-#endif
   // Calculates view representation based on extent of object being
   // viewed and (initial) viewpoint.  (Note: it can change later due
@@ -338 +333 @@
   background = fVP.GetBackgroundColour ();
 
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::SetView END\n");
-#endif
 }
 
@@ -461 +453 @@
   glGetIntegerv (GL_UNPACK_ALIGNMENT, &alignment);
 
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::grabPixels colors:%d swap:%d lsb:%d rowlenght:%d sr:%d sp:%d align:%d\n",inColor,swapbytes, lsbfirst, rowlength,skiprows, skippixels, alignment);
+#endif
+
+
   glPixelStorei (GL_UNPACK_SWAP_BYTES, GL_FALSE);
   glPixelStorei (GL_UNPACK_LSB_FIRST, GL_FALSE);
@@ -469 +466 @@
   glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
 
+  glFlush();
   glReadBuffer(GL_FRONT);
   glReadPixels (0, 0, (GLsizei)width, (GLsizei)height, format, GL_UNSIGNED_BYTE, (GLvoid*) buffer);
-
+  //  glReadPixels (0, 0, (GLsizei)width, (GLsizei)height, GL_RGB, GL_UNSIGNED_BYTE, (GLvoid*) buffer);
   glPixelStorei (GL_UNPACK_SWAP_BYTES, swapbytes);
   glPixelStorei (GL_UNPACK_LSB_FIRST, lsbfirst);
@@ -529 +527 @@
 bool G4OpenGLViewer::printNonVectoredEPS () {
 
-  int width = getRealPrintSizeX();
-  int height = getRealPrintSizeY();
-
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::printNonVectoredEPS file:%s Vec:%d X:%d Y:%d col:%d fWinX:%d fWinY:%d\n",getRealPrintFilename().c_str(),fVectoredPs,width,height,fPrintColour,fWinSize_x,fWinSize_y);
+  GLint viewport[4];
+  glGetIntegerv(GL_VIEWPORT, viewport);
+
+  int width2 = getRealPrintSizeX();
+  int height2 = getRealPrintSizeY();
+  int width = viewport[2]; // FIXME : Why -1 ????
+  int height = viewport[3];
+
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::printNonVectoredEPS file:%s Vec:%d X:%d Y:%d X2:%d Y2:%d col:%d fWinX:%d fWinY:%d\n",getRealPrintFilename().c_str(),fVectoredPs,width,height,width2,height2,fPrintColour,fWinSize_x,fWinSize_y);
 #endif
   FILE* fp;
@@ -621 +624 @@
   int height = getRealPrintSizeY();
 
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::printGl2PS file:%s Vec:%d X:%d Y:%d col:%d fWinX:%d fWinY:%d\n",getRealPrintFilename().c_str(),fVectoredPs,width,height,fPrintColour,fWinSize_x,fWinSize_y);
+#endif
+
   if (!fGL2PSAction) return false;
 
@@ -643 +650 @@
 
     // Set the viewport
-    //    fGL2PSAction->setViewport(0, 0, getRealPrintSizeX(),getRealPrintSizeY());  
+    //    fGL2PSAction->setViewport(0, 0, width, height);  
     // By default, we choose the line width (trajectories...)
     fGL2PSAction->setLineWidth(1);
@@ -693 +700 @@
     return 0;
   }
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::getRealPrintSizeX %d\n",fPrintSizeX);
+#endif
   return fPrintSizeX;
 }
@@ -712 +722 @@
     return 0;
   }
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::getRealPrintSizeY %d\n",fPrintSizeY);
+#endif
   return fPrintSizeY;
 }
@@ -825 +838 @@
   //phi spin stuff here
   
-
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::rotateScene dx:%f dy:%f delta:%f\n",dx,dy, deltaRotation);
-#endif
-
   vp = fVP.GetViewpointDirection ().unit ();
   up = fVP.GetUpVector ().unit ();
   
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::rotateScene     vp: %f %f %f\n",vp.x(),vp.y(),vp.z());
-#endif
   yprime = (up.cross(vp)).unit();
   zprime = (vp.cross(yprime)).unit();
@@ -855 +860 @@
   // to allow more than 360° rotation
 
-  //   const G4Point3D targetPoint
-  //     = fSceneHandler.GetScene()->GetStandardTargetPoint()
-  //     + fVP.GetCurrentTargetPoint ();
-  //   G4double radius = fSceneHandler.GetScene()->GetExtent().GetExtentRadius();
-  //   if(radius<=0.) radius = 1.;
-  //  const G4double cameraDistance = fVP.GetCameraDistance (radius);
-  //  const G4Point3D cameraPosition =
-  //    targetPoint + cameraDistance * fVP.GetViewpointDirection().unit();
-
   if (fVP.GetLightsMoveWithCamera()) {
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::rotateScene GetLightsMoveWithCamera: %f \n",new_vp.z()*vp.z());
-#endif
     new_up = (new_vp.cross(yprime)).unit();
     if (new_vp.z()*vp.z() <0) {
-#ifdef G4DEBUG_VIS_OGL
-      printf("G4OpenGLViewer::rotateScene  R_____________________________________________\n");
-#endif
       new_up.set(new_up.x(),-new_up.y(),new_up.z());
     }
   } else {
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLViewer::rotateScene : %f \n",new_vp.z()*vp.z());
-#endif
     new_up = up;
     if (new_vp.z()*vp.z() <0) {
-#ifdef G4DEBUG_VIS_OGL
-      printf("G4OpenGLViewer::rotateScene  X_____________________________________________\n");
-#endif
       new_up.set(new_up.x(),-new_up.y(),new_up.z());
     }
@@ -902 +886 @@
   delta = a2 - a1;
   // So new viewpoint is...
-
   viewPoint = new_vp.unit() + delta;
-
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLViewer::rotateScene     up: %f %f %f\n",up.x(),up.y(),up.z());
-  printf("G4OpenGLViewer::rotateScene new up: %f %f %f\n",new_up.x(),new_up.y(),new_up.z());
-  printf("G4OpenGLViewer::rotateScene new vp: %f %f %f delta:%f %f %f\n",new_vp.x(),new_vp.y(),new_vp.z(),delta.x(),delta.y(),delta.z());
-#endif
-  
-
+  
   fVP.SetViewAndLights (viewPoint);
-
-
 }
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewerMessenger.cc,v 1.18 2009/05/14 16:38:23 lgarnier Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4OpenGLViewerMessenger.cc,v 1.19 2010/11/05 06:25:23 allison Exp $
+// GEANT4 tag $Name:  $
 
 #ifdef G4VIS_BUILD_OPENGL_DRIVER
@@ -41 +41 @@
 #include "G4UIcmdWithABool.hh"
 #include "G4UIcmdWithAString.hh"
+#include "G4UIcmdWithAnInteger.hh"
 #include "G4VisManager.hh"
 #include <sstream>
@@ -179 +180 @@
   fpCommandDisplayLightFront->SetParameter(parameter);
 
+  fpCommandDisplayListLimit =
+    new G4UIcmdWithAnInteger("/vis/ogl/set/displayListLimit", this);
+  fpCommandDisplayListLimit->SetGuidance
+    ("Set/reset display list limit (to avoid memory exhaustion).");
+  fpCommandDisplayListLimit->SetParameterName
+    ("displayListLimit", omitable = true);
+  fpCommandDisplayListLimit->SetDefaultValue(50000);
+
   fpCommandEndTime =
     new G4UIcommand("/vis/ogl/set/endTime", this);
@@ -241 +250 @@
   delete fpCommandFade;
   delete fpCommandEndTime;
+  delete fpCommandDisplayListLimit;
   delete fpCommandDisplayLightFront;
   delete fpCommandDisplayHeadTime;
@@ -322 +332 @@
       G4cout <<
   "G4OpenGLViewerMessenger::SetNewValue: Current viewer is not of type OGLS."
-  "\n  The time slice viewing feature is only implemented for OGL Stored"
-  "\n  viewers at present.  Use \"/vis/viewer/select\" or \"/vis/open OGLS...\"."
+  "\n  This feature is only implemented for OGL Stored viewers."
+  "\n  Use \"/vis/viewer/select\" or \"/vis/open OGLS...\"."
              << G4endl;
       return;
@@ -414 +424 @@
     }
 
+  G4OpenGLSceneHandler* pOGLSceneHandler =
+    dynamic_cast<G4OpenGLSceneHandler*>(pViewer->GetSceneHandler());
+
+  if (!pOGLSceneHandler) {
+    G4cout <<
+  "G4OpenGLViewerMessenger::SetNewValue: Current scene handler is not of type"
+  "\n  OGL.  Use \"/vis/sceneHandler/select\" or \"/vis/open\"."
+           << G4endl;
+    return;
+  }
+
+  G4OpenGLStoredSceneHandler* pOGLSSceneHandler =
+    dynamic_cast<G4OpenGLStoredSceneHandler*>(pViewer->GetSceneHandler());
+
+  if (!pOGLSSceneHandler) {
+    G4cout <<
+  "G4OpenGLViewerMessenger::SetNewValue: Current scene handler is not of type"
+  "\n  OGLS (Stored).  This feature is only implemented for OGL Stored"
+  "\n  scene handlers.  Use \"/vis/viewer/select\" or \"/vis/open OGLS...\"."
+           << G4endl;
+    return;
+  }
+
+  if (command == fpCommandDisplayListLimit)
+    {
+      G4int displayListLimit =
+        fpCommandDisplayListLimit->GetNewIntValue(newValue);
+      pOGLSSceneHandler->SetDisplayListLimit(displayListLimit);
+    }
 }
 

trunk/source/visualization/OpenInventor/CVS/Entries

@@ -3 +3 @@
 /CMakeLists.txt/1.1/Wed Sep 29 19:12:22 2010//
 /GNUmakefile/1.10/Thu Sep 30 06:17:09 2010//
-/History/1.105/Thu Sep 30 06:17:09 2010//
 /sources.cmake/1.1/Wed Sep 29 19:12:30 2010//
+/History/1.107/Wed Oct  6 15:53:50 2010//

trunk/source/visualization/OpenInventor/History

@@ -1 @@
-$Id: History,v 1.105 2010/05/26 14:30:46 allison Exp $
+$Id: History,v 1.107 2010/10/06 15:46:21 allison Exp $
 -------------------------------------------------------------------
 
@@ -20 +20 @@
 History file for visualization/OpenInventor
 -------------------------------------------
+
+6th October 2010  John Allison  (openinventor-V09-03-01)
+- G4OpenInventorViewer.cc:
+  o Added default colour and default text colour to list of parameters
+    that trigger a kernel visit.
 
 26th May 2010  John Allison  (openinventor-V09-03-00)

trunk/source/visualization/OpenInventor/src/CVS/Entries

@@ -2 +2 @@
 /G4OpenInventorSceneHandler.cc/1.55/Thu Sep 30 06:17:10 2010//
 /G4OpenInventorTransform3D.cc/1.8/Thu Sep 30 06:17:10 2010//
-/G4OpenInventorViewer.cc/1.60/Thu Sep 30 06:17:10 2010//
 /G4OpenInventorWin.cc/1.8/Thu Sep 30 06:17:10 2010//
 /G4OpenInventorWinViewer.cc/1.26/Thu Sep 30 06:17:10 2010//
@@ -22 +21 @@
 /SoTrd.cc/1.8/Thu Sep 30 06:17:12 2010//
 /SoTubs.cc/1.8/Thu Sep 30 06:17:12 2010//
+/G4OpenInventorViewer.cc/1.61/Wed Oct  6 15:53:54 2010//
 D

trunk/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4OpenInventorViewer.cc,v 1.60 2009/02/16 15:31:05 lgarnier Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4OpenInventorViewer.cc,v 1.61 2010/10/06 10:09:57 allison Exp $
+// GEANT4 tag $Name:  $
 
 #ifdef G4VIS_BUILD_OI_DRIVER
@@ -177 +177 @@
       (vp.GetNoOfSides ()       != fVP.GetNoOfSides ())       ||
       (vp.IsMarkerNotHidden ()  != fVP.IsMarkerNotHidden ())  ||
+      (vp.GetDefaultVisAttributes()->GetColour() !=
+       fVP.GetDefaultVisAttributes()->GetColour())            ||
+      (vp.GetDefaultTextVisAttributes()->GetColour() !=
+       fVP.GetDefaultTextVisAttributes()->GetColour())        ||
       (vp.GetBackgroundColour ()!= fVP.GetBackgroundColour ())||
       (vp.IsPicking ()          != fVP.IsPicking ())          ||

trunk/source/visualization/XXX/CVS/Entries

@@ -3 +3 @@
 /CMakeLists.txt/1.1/Wed Sep 29 19:13:27 2010//
 /GNUmakefile/1.8/Thu Sep 30 06:17:20 2010//
-/History/1.28/Thu Sep 30 06:17:20 2010//
 /sources.cmake/1.1/Wed Sep 29 19:13:35 2010//
+/History/1.30/Wed Oct  6 15:58:25 2010//

trunk/source/visualization/XXX/History

@@ -1 @@
-$Id: History,v 1.28 2009/10/21 15:28:53 allison Exp $
+$Id: History,v 1.30 2010/10/06 15:49:24 allison Exp $
 -------------------------------------------------------------------
 
@@ -20 +20 @@
 History file for visualization/XXX sub-category (a template graphics system)
 ---------------------------------------------------------------------------
+
+6th October 2010  John Allison  (visXXX-V08-03-00)
+- G4XXXSGViewer.cc, G4XXXStoredViewer.cc:
+  o Added default colour and default text colour to list of parameters
+    that trigger a kernel visit.
 
 21st October 2009  John Allison  (visXXX-V09-02-00 coworks greps-V09-02-02)

trunk/source/visualization/XXX/src/CVS/Entries

@@ -5 +5 @@
 /G4XXXSG.cc/1.2/Thu Sep 30 06:17:21 2010//
 /G4XXXSGSceneHandler.cc/1.6/Thu Sep 30 06:17:21 2010//
-/G4XXXSGViewer.cc/1.4/Thu Sep 30 06:17:21 2010//
 /G4XXXSceneHandler.cc/1.32/Thu Sep 30 06:17:21 2010//
 /G4XXXStored.cc/1.2/Thu Sep 30 06:17:21 2010//
 /G4XXXStoredSceneHandler.cc/1.9/Thu Sep 30 06:17:21 2010//
-/G4XXXStoredViewer.cc/1.5/Thu Sep 30 06:17:28 2010//
 /G4XXXViewer.cc/1.9/Thu Sep 30 06:17:28 2010//
+/G4XXXSGViewer.cc/1.5/Wed Oct  6 10:14:06 2010//
+/G4XXXStoredViewer.cc/1.6/Wed Oct  6 10:14:07 2010//
 D

trunk/source/visualization/XXX/src/G4XXXSGViewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4XXXSGViewer.cc,v 1.4 2006/08/29 16:11:25 allison Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4XXXSGViewer.cc,v 1.5 2010/10/06 10:12:03 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -133 +133 @@
       (lastVP.GetNoOfSides ()       != fVP.GetNoOfSides ())       ||
       (lastVP.IsMarkerNotHidden ()  != fVP.IsMarkerNotHidden ())  ||
+      (lastVP.GetDefaultVisAttributes()->GetColour() !=
+       fVP.GetDefaultVisAttributes()->GetColour())                ||
+      (lastVP.GetDefaultTextVisAttributes()->GetColour() !=
+       fVP.GetDefaultTextVisAttributes()->GetColour())            ||
       (lastVP.GetBackgroundColour ()!= fVP.GetBackgroundColour ())
       ) {

trunk/source/visualization/XXX/src/G4XXXStoredViewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4XXXStoredViewer.cc,v 1.5 2006/08/29 16:11:25 allison Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4XXXStoredViewer.cc,v 1.6 2010/10/06 10:12:03 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -129 +129 @@
       (lastVP.GetNoOfSides ()       != fVP.GetNoOfSides ())       ||
       (lastVP.IsMarkerNotHidden ()  != fVP.IsMarkerNotHidden ())  ||
+      (lastVP.GetDefaultVisAttributes()->GetColour() !=
+       fVP.GetDefaultVisAttributes()->GetColour())                ||
+      (lastVP.GetDefaultTextVisAttributes()->GetColour() !=
+       fVP.GetDefaultTextVisAttributes()->GetColour())            ||
       (lastVP.GetBackgroundColour ()!= fVP.GetBackgroundColour ())
       ) {

trunk/source/visualization/externals/gl2ps/CVS/Entries

@@ -3 +3 @@
 /CMakeLists.txt/1.1/Wed Sep 29 19:14:00 2010//
 /GNUmakefile/1.5/Thu Sep 30 06:17:28 2010//
-/History/1.16/Thu Sep 30 06:17:28 2010//
 /sources.cmake/1.1/Wed Sep 29 19:14:08 2010//
+/History/1.18/Wed Nov  3 16:40:34 2010//

trunk/source/visualization/externals/gl2ps/History

@@ -1 @@
-$Id: History,v 1.16 2010/04/26 16:28:18 lgarnier Exp $
+$Id: History,v 1.18 2010/11/03 16:40:34 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+
+3rd November 2010, Laurent Garnier
+- Update gl2ps to 1.3.5 (before it was 1.3.3)
+
+6th October 2010, John Allison  (visexternal-V09-03-00)
+- Tagged.
 
 26th April 2010, Laurent Garnier

trunk/source/visualization/externals/gl2ps/include/CVS/Entries

@@ -1 +1 @@
 /G4OpenGL2PSAction.hh/1.4/Thu Sep 30 06:17:28 2010//
-/Geant4_gl2ps.h/1.2/Mon Jul 12 14:53:17 2010//
-/gl2ps.h/1.2/Mon Jul 12 14:53:17 2010//
+/Geant4_gl2ps.h/1.3/Wed Nov  3 15:19:14 2010//
+/gl2ps.h/1.3/Wed Nov  3 16:40:15 2010//
 D

trunk/source/visualization/externals/gl2ps/include/Geant4_gl2ps.h

@@ -27 +27 @@
 #define Geant4_gl2ps_h
 
-// gl2ps-1.3.3
+// gl2ps-1.3.5
 // The gl2ps code is prefixed by Geant4_ in order
 // to avoid clashes with other gl2ps code that may come at link

trunk/source/visualization/externals/gl2ps/include/gl2ps.h

@@ -53 +53 @@
  * to provide one.
  *
- * For the latest info about gl2ps, see http://www.geuz.org/gl2ps/.
+ * For the latest info about gl2ps and a full list of contributors,
+ * see http://www.geuz.org/gl2ps/.
+ *
  * Please report all bugs and problems to <gl2ps@geuz.org>.
  */
@@ -68 +70 @@
 #  if defined(_MSC_VER)
 #    pragma warning(disable:4115)
+#    pragma warning(disable:4996)
 #  endif
 #  include <windows.h>
@@ -103 +106 @@
 #define GL2PS_MAJOR_VERSION 1
 #define GL2PS_MINOR_VERSION 3
-#define GL2PS_PATCH_VERSION 3
+#define GL2PS_PATCH_VERSION 5
 #define GL2PS_EXTRA_VERSION ""
 

trunk/source/visualization/externals/gl2ps/src/CVS/Entries

@@ -1 @@
-/G4OpenGL2PSAction.cc/1.5/Thu Sep 30 06:17:28 2010//
-/gl2ps.cc/1.8/Thu Sep 30 06:17:31 2010//
+/G4OpenGL2PSAction.cc/1.6/Wed Nov  3 16:40:34 2010//
+/gl2ps.cc/1.9/Wed Nov  3 15:22:18 2010//
 D

trunk/source/visualization/externals/gl2ps/src/G4OpenGL2PSAction.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGL2PSAction.cc,v 1.5 2010/04/26 16:28:18 lgarnier Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4OpenGL2PSAction.cc,v 1.6 2010/11/03 16:40:34 lgarnier Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -139 +139 @@
   if(!fFile) return;
   int options = GL2PS_OCCLUSION_CULL | 
-     GL2PS_BEST_ROOT | GL2PS_SILENT | GL2PS_DRAW_BACKGROUND;
+    GL2PS_BEST_ROOT | GL2PS_SILENT | GL2PS_DRAW_BACKGROUND | GL2PS_USE_CURRENT_VIEWPORT;
+//   int options = GL2PS_OCCLUSION_CULL | 
+//      GL2PS_BEST_ROOT | GL2PS_SILENT | GL2PS_DRAW_BACKGROUND;
   int sort = GL2PS_BSP_SORT;
   //int sort = GL2PS_SIMPLE_SORT;

trunk/source/visualization/externals/gl2ps/src/gl2ps.cc

@@ -62 +62 @@
  * to provide one.
  *
- * Contributors:
- *   Michael Sweet <mike@easysw.com>
- *   Marc Ume <marc.ume@digitalgraphics.be>
- *   Jean-Francois Remacle <remacle@gce.ucl.ac.be>
- *   Bart Kaptein <B.L.Kaptein@lumc.nl>
- *   Quy Nguyen-Dai <quy@nguyendai.org>
- *   Sam Buss <sbuss@ucsd.edu>
- *   Shane Hill <Shane.Hill@dsto.defence.gov.au>
- *   Romain Boman <r_boman@yahoo.fr>
- *   Rouben Rostamian <rostamian@umbc.edu>
- *   Diego Santa Cruz <Diego.SantaCruz@epfl.ch>
- *   Shahzad Muzaffar <Shahzad.Muzaffar@cern.ch>
- *   Lassi Tuura <lassi.tuura@cern.ch>
- *   Guy Barrand <barrand@lal.in2p3.fr>
- *   Prabhu Ramachandran <prabhu@aero.iitm.ernet.in>
- *   Micha Bieber <bieber@traits.de>
- *   Olivier Couet <couet@mail.cern.ch>
- *   Shai Ayal <shaiay@gmail.com>
- *   Fabian Wenzel <wenzel@tu-harburg.de>
- *   Ian D. Gay <gay@sfu.ca>
- *   Cosmin Truta <cosmin@cs.toronto.edu>
- *   Baiju Devani <b.devani@gmail.com>
- *   Alexander Danilov <danilov@lanl.gov>
+ * For the latest info about gl2ps and a full list of contributors,
+ * see http://www.geuz.org/gl2ps/.
  *
- * For the latest info about gl2ps, see http://www.geuz.org/gl2ps/.
  * Please report all bugs and problems to <gl2ps@geuz.org>.
  */
@@ -92 +70 @@
 #include "Geant4_gl2ps.h"
 
-#include <cmath>
+#include <math.h>
 #include <string.h>
 #include <sys/types.h>
@@ -119 +97 @@
 #define GL2PS_ZOFFSET       5.0e-2F
 #define GL2PS_ZOFFSET_LARGE 20.0F
-#define GL2PS_ZERO(arg)     (std::fabs(arg) < 1.e-20)
+#define GL2PS_ZERO(arg)     (fabs(arg) < 1.e-20)
 
 /* Primitive types */
@@ -349 +327 @@
   void *ptr;
 
-  if(!size) return(NULL);
+  if(!size) return NULL;
   ptr = malloc(size);
   if(!ptr){
     gl2psMsg(GL2PS_ERROR, "Couldn't allocate requested memory");
-    exit(1);
-  }
-  return(ptr);
+    return NULL;
+  }
+  return ptr;
 }
 
 static void *gl2psRealloc(void *ptr, size_t size)
 {
-  if(!size) return(NULL);
+  if(!size) return NULL;
   ptr = realloc(ptr, size);
   if(!ptr){
     gl2psMsg(GL2PS_ERROR, "Couldn't reallocate requested memory");
-    exit(1);
-  }
-  return(ptr);
+    return NULL;
+  }
+  return ptr;
 }
 
@@ -589 +567 @@
   list->array = NULL;
   gl2psListRealloc(list, n);
-  return(list);
+  return list;
 }
 
@@ -620 +598 @@
   if(!list)
     return 0;
-  return(list->n);
+  return list->n;
 }
 
@@ -633 +611 @@
     return NULL;
   }
-  return(&list->array[index * list->size]);
+  return &list->array[index * list->size];
 }
 
@@ -747 +725 @@
   
   for(i = 1; i < n; i++){
-    if(std::fabs(rgba[0][0] - rgba[i][0]) > threshold[0] ||
-       std::fabs(rgba[0][1] - rgba[i][1]) > threshold[1] ||
-       std::fabs(rgba[0][2] - rgba[i][2]) > threshold[2])
+    if(fabs(rgba[0][0] - rgba[i][0]) > threshold[0] ||
+       fabs(rgba[0][1] - rgba[i][1]) > threshold[1] ||
+       fabs(rgba[0][2] - rgba[i][2]) > threshold[2])
       return GL_FALSE;
   }
@@ -1105 +1083 @@
 static GLfloat gl2psComparePointPlane(GL2PSxyz point, GL2PSplane plane)
 {
-  return(plane[0] * point[0] + 
-         plane[1] * point[1] + 
-         plane[2] * point[2] + 
-         plane[3]);
+  return (plane[0] * point[0] + 
+          plane[1] * point[1] + 
+          plane[2] * point[2] + 
+          plane[3]);
 }
 
 static GLfloat gl2psPsca(GLfloat *a, GLfloat *b)
 {
-  return(a[0]*b[0] + a[1]*b[1] + a[2]*b[2]);
+  return (a[0]*b[0] + a[1]*b[1] + a[2]*b[2]);
 }
 
@@ -1451 +1429 @@
   q = *(GL2PSprimitive**)a;
   w = *(GL2PSprimitive**)b;
-  return(q->type < w->type ? 1 : -1);
+  return (q->type < w->type ? 1 : -1);
 }
 
@@ -1499 +1477 @@
 }
 
-static void gl2psFreeImagemap(GL2PSimagemap *list){
+static void gl2psFreeImagemap(GL2PSimagemap *list)
+{
   GL2PSimagemap *next;
   while(list != NULL){
@@ -2393 +2372 @@
         current += 2; used -= 2;
         node->image->height = (GLint)current[2];
-        prim->verts[0].xyz[0] = prim->verts[0].xyz[0] - (int)(node->image->width / 2) + 0.5;
-        prim->verts[0].xyz[1] = prim->verts[0].xyz[1] - (int)(node->image->height / 2) + 0.5;
+        prim->verts[0].xyz[0] = prim->verts[0].xyz[0] - (int)(node->image->width / 2) + 0.5F;
+        prim->verts[0].xyz[1] = prim->verts[0].xyz[1] - (int)(node->image->height / 2) + 0.5F;
         for(i = 1; i < 4; i++){
           for(v = 0; v < 3; v++){
@@ -2490 +2469 @@
       for(col = 0; col < width; col++){ 
         gl2psGetRGB(im, col, row, &dr, &dg, &db);
-        fgrey = (0.30 * dr + 0.59 * dg + 0.11 * db);
+        fgrey = (0.30F * dr + 0.59F * dg + 0.11F * db);
         grey = (unsigned char)(255. * fgrey);
         gl2psWriteByte(grey);
@@ -3353 +3332 @@
 }
 
-static void gl2psPrintTeXBeginViewport(GLint [4])
+static void gl2psPrintTeXBeginViewport(GLint viewport[4])
 {
   glRenderMode(GL_FEEDBACK);
@@ -3446 +3425 @@
 static void gl2psPutPDFText(GL2PSstring *text, int cnt, GLfloat x, GLfloat y)
 {
-  gl2ps->streamlength += 
-    gl2psPrintf("BT\n"
-                "/F%d %d Tf\n"
-                "%f %f Td\n"
-                "(%s) Tj\n"
-                "ET\n", 
-                cnt, text->fontsize, x, y, text->str);  
+  GLfloat rad, crad, srad;
+  
+  if(text->angle == 0.0F){
+    gl2ps->streamlength += gl2psPrintf
+      ("BT\n"
+       "/F%d %d Tf\n"
+       "%f %f Td\n"
+       "(%s) Tj\n"
+       "ET\n", 
+       cnt, text->fontsize, x, y, text->str);
+  }
+  else{
+    rad = M_PI * text->angle / 180.0F;
+    srad = (GLfloat)sin(rad);
+    crad = (GLfloat)cos(rad);
+    gl2ps->streamlength += gl2psPrintf
+      ("BT\n"
+       "/F%d %d Tf\n"
+       "%f %f %f %f %f %f Tm\n"
+       "(%s) Tj\n"
+       "ET\n",
+       cnt, text->fontsize, crad, srad, -srad, crad, x, y, text->str);
+  }
 }
 
 static void gl2psPutPDFImage(GL2PSimage *image, int cnt, GLfloat x, GLfloat y)
 {
-  gl2ps->streamlength += 
-    gl2psPrintf("q\n"
-                "%d 0 0 %d %f %f cm\n"
-                "/Im%d Do\n"
-                "Q\n",
-                (int)image->width, (int)image->height, x, y, cnt);
+  gl2ps->streamlength += gl2psPrintf
+    ("q\n"
+     "%d 0 0 %d %f %f cm\n"
+     "/Im%d Do\n"
+     "Q\n",
+     (int)image->width, (int)image->height, x, y, cnt);
 }
 
@@ -4526 +4521 @@
                                          int gray)
 {
-  int x, y;
+  int x, y, shift;
   GLfloat r, g, b, a;
 
@@ -4532 +4527 @@
     return 0;
 
-  if(gray && gray !=8 && gray != 16)
+  if(gray && gray != 8 && gray != 16)
     gray = 8;
 
   gray /= 8;
   
+  shift = (sizeof(unsigned long) - 1) * 8;
+
   for(y = 0; y < im->height; ++y){
     for(x = 0; x < im->width; ++x){
       a = gl2psGetRGB(im, x, y, &r, &g, &b);
       if(im->format == GL_RGBA && gray){
-        (*action)((unsigned long)(a*255) << 24, gray);
+        (*action)((unsigned long)(a * 255) << shift, gray);
       }
       else{
-        (*action)((unsigned long)(r*255) << 24, 1);
-        (*action)((unsigned long)(g*255) << 24, 1);
-        (*action)((unsigned long)(b*255) << 24, 1);
+        (*action)((unsigned long)(r * 255) << shift, 1);
+        (*action)((unsigned long)(g * 255) << shift, 1);
+        (*action)((unsigned long)(b * 255) << shift, 1);
       }
     }
@@ -4962 +4959 @@
     for(i = 0; i < 3; i++){
       xyz2[0][i] = xyz[0][i]; 
-      xyz2[1][i] = 0.5 * (xyz[0][i] + xyz[1][i]);
-      xyz2[2][i] = 0.5 * (xyz[0][i] + xyz[2][i]);
+      xyz2[1][i] = 0.5F * (xyz[0][i] + xyz[1][i]);
+      xyz2[2][i] = 0.5F * (xyz[0][i] + xyz[2][i]);
     }
     for(i = 0; i < 4; i++){
       rgba2[0][i] = rgba[0][i]; 
-      rgba2[1][i] = 0.5 * (rgba[0][i] + rgba[1][i]);
-      rgba2[2][i] = 0.5 * (rgba[0][i] + rgba[2][i]);
+      rgba2[1][i] = 0.5F * (rgba[0][i] + rgba[1][i]);
+      rgba2[2][i] = 0.5F * (rgba[0][i] + rgba[2][i]);
     }
     gl2psPrintSVGSmoothTriangle(xyz2, rgba2);
     for(i = 0; i < 3; i++){
-      xyz2[0][i] = 0.5 * (xyz[0][i] + xyz[1][i]);
+      xyz2[0][i] = 0.5F * (xyz[0][i] + xyz[1][i]);
       xyz2[1][i] = xyz[1][i]; 
-      xyz2[2][i] = 0.5 * (xyz[1][i] + xyz[2][i]);
+      xyz2[2][i] = 0.5F * (xyz[1][i] + xyz[2][i]);
     }
     for(i = 0; i < 4; i++){
-      rgba2[0][i] = 0.5 * (rgba[0][i] + rgba[1][i]);
+      rgba2[0][i] = 0.5F * (rgba[0][i] + rgba[1][i]);
       rgba2[1][i] = rgba[1][i]; 
-      rgba2[2][i] = 0.5 * (rgba[1][i] + rgba[2][i]);
+      rgba2[2][i] = 0.5F * (rgba[1][i] + rgba[2][i]);
     }
     gl2psPrintSVGSmoothTriangle(xyz2, rgba2);
     for(i = 0; i < 3; i++){
-      xyz2[0][i] = 0.5 * (xyz[0][i] + xyz[2][i]);
+      xyz2[0][i] = 0.5F * (xyz[0][i] + xyz[2][i]);
       xyz2[1][i] = xyz[2][i]; 
-      xyz2[2][i] = 0.5 * (xyz[1][i] + xyz[2][i]);
+      xyz2[2][i] = 0.5F * (xyz[1][i] + xyz[2][i]);
     }
     for(i = 0; i < 4; i++){
-      rgba2[0][i] = 0.5 * (rgba[0][i] + rgba[2][i]);
+      rgba2[0][i] = 0.5F * (rgba[0][i] + rgba[2][i]);
       rgba2[1][i] = rgba[2][i]; 
-      rgba2[2][i] = 0.5 * (rgba[1][i] + rgba[2][i]);
+      rgba2[2][i] = 0.5F * (rgba[1][i] + rgba[2][i]);
     }
     gl2psPrintSVGSmoothTriangle(xyz2, rgba2);
     for(i = 0; i < 3; i++){
-      xyz2[0][i] = 0.5 * (xyz[0][i] + xyz[1][i]);
-      xyz2[1][i] = 0.5 * (xyz[1][i] + xyz[2][i]); 
-      xyz2[2][i] = 0.5 * (xyz[0][i] + xyz[2][i]);
+      xyz2[0][i] = 0.5F * (xyz[0][i] + xyz[1][i]);
+      xyz2[1][i] = 0.5F * (xyz[1][i] + xyz[2][i]); 
+      xyz2[2][i] = 0.5F * (xyz[0][i] + xyz[2][i]);
     }
     for(i = 0; i < 4; i++){
-      rgba2[0][i] = 0.5 * (rgba[0][i] + rgba[1][i]);
-      rgba2[1][i] = 0.5 * (rgba[1][i] + rgba[2][i]); 
-      rgba2[2][i] = 0.5 * (rgba[0][i] + rgba[2][i]);
+      rgba2[0][i] = 0.5F * (rgba[0][i] + rgba[1][i]);
+      rgba2[1][i] = 0.5F * (rgba[1][i] + rgba[2][i]); 
+      rgba2[2][i] = 0.5F * (rgba[0][i] + rgba[2][i]);
     }
     gl2psPrintSVGSmoothTriangle(xyz2, rgba2);
@@ -5035 +5032 @@
 }
 
-#if defined(GL2PS_HAVE_LIBPNG)
 static void gl2psPrintSVGPixmap(GLfloat x, GLfloat y, GL2PSimage *pixmap)
-#else
-static void gl2psPrintSVGPixmap(GLfloat, GLfloat, GL2PSimage *)
-#endif
 {
 #if defined(GL2PS_HAVE_LIBPNG)
@@ -5066 +5059 @@
   gl2psListDelete(png);
 #else
-  gl2psMsg(GL2PS_WARNING, "GL2PS has to be compiled with PNG support in "
+  gl2psMsg(GL2PS_WARNING, "GL2PS must be compiled with PNG support in "
            "order to embed images in SVG streams");
 #endif
@@ -5144 +5137 @@
     gl2psPrintf("<text fill=\"%s\" x=\"%g\" y=\"%g\" font-size=\"%d\" ",
                 col, xyz[0][0], xyz[0][1], prim->data.text->fontsize);
+    if(prim->data.text->angle)
+      gl2psPrintf("transform=\"rotate(%g, %g, %g)\" ",
+                  -prim->data.text->angle, xyz[0][0], xyz[0][1]);
     if(!strcmp(prim->data.text->fontname, "Times-Roman"))
       gl2psPrintf("font-family=\"Times\">");

trunk/source/visualization/externals/zlib/CVS/Entries

@@ -1 +1 @@
 D/include////
 D/src////
-/CMakeLists.txt/1.1/Wed Sep 29 19:14:16 2010//
 /GNUmakefile/1.1/Thu Sep 30 06:17:31 2010//
 /History/1.1/Thu Sep 30 06:17:31 2010//
 /README/1.1/Mon Jul 12 14:53:17 2010//
 /sources.cmake/1.1/Wed Sep 29 19:14:24 2010//
+/CMakeLists.txt/1.2/Fri Oct  8 10:03:41 2010//

trunk/source/visualization/management/CVS/Entries

@@ -4 +4 @@
 /Doxyfile/1.2/Mon Jul 12 14:53:19 2010//
 /GNUmakefile/1.17/Thu Sep 30 06:17:35 2010//
-/History/1.153/Thu Sep 30 11:54:27 2010//
 /sources.cmake/1.1/Wed Sep 29 19:15:02 2010//
+/History/1.155/Fri Oct  8 10:03:41 2010//

trunk/source/visualization/management/History

@@ -1 @@
-$Id: History,v 1.153 2010/09/03 15:57:22 gcosmo Exp $
+$Id: History,v 1.155 2010/10/07 07:31:43 allison Exp $
 
 -------------------------------------------------------------------
@@ -26 +26 @@
 History file for visualization management sub-category
 ------------------------------------------------------
+
+4th November 2010  Laurent Garnier Allison
+- Added initialization of fGeometryMask (according to coverity.cern.ch)
+
+6th October 2010  John Allison  (visman-V09-03-12)
+- Added /vis/viewer/set/defaultColour and /vis/viewer/set/defaultTextColour.
 
 3rd September 2010  Gabriele Cosmo  (visman-V09-03-11)

trunk/source/visualization/management/include/CVS/Entries

@@ -26 +26 @@
 /G4VisCommandsSceneHandler.hh/1.8/Thu Sep 30 06:17:37 2010//
 /G4VisCommandsViewer.hh/1.23/Thu Sep 30 06:17:37 2010//
-/G4VisCommandsViewerSet.hh/1.23/Thu Sep 30 06:17:37 2010//
 /G4VisExecutive.hh/1.10/Thu Sep 30 06:17:38 2010//
 /G4VisExecutive.icc/1.26/Thu Sep 30 06:17:38 2010//
@@ -39 +38 @@
 /G4VisModelManager.hh/1.4/Thu Sep 30 06:17:38 2010//
 /G4VisStateDependent.hh/1.5/Thu Sep 30 06:17:38 2010//
+/G4VisCommandsViewerSet.hh/1.24/Wed Oct  6 15:52:57 2010//
 D

trunk/source/visualization/management/include/G4VisCommandsViewerSet.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VisCommandsViewerSet.hh,v 1.23 2009/05/13 18:17:25 allison Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4VisCommandsViewerSet.hh,v 1.24 2010/10/06 10:15:38 allison Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/viewer/set commands - John Allison  16th May 2000
@@ -59 +59 @@
   G4UIcommand*          fpCommandCulling;
   G4UIcmdWithAString*   fpCommandCutawayMode;
+  G4UIcommand*          fpCommandDefaultColour;
+  G4UIcommand*          fpCommandDefaultTextColour;
   G4UIcmdWithABool*     fpCommandEdge;
   G4UIcommand*          fpCommandExplodeFactor;

trunk/source/visualization/management/src/CVS/Entries

@@ -16 +16 @@
 /G4VisCommandsSceneHandler.cc/1.32/Thu Sep 30 06:17:41 2010//
 /G4VisCommandsViewer.cc/1.76/Thu Sep 30 06:17:42 2010//
-/G4VisCommandsViewerSet.cc/1.50/Thu Sep 30 06:17:42 2010//
 /G4VisFeaturesOfDAWNFILE.cc/1.6/Thu Sep 30 06:17:42 2010//
 /G4VisFeaturesOfFukuiRenderer.cc/1.5/Thu Sep 30 06:17:42 2010//
@@ -24 +23 @@
 /G4VisStateDependent.cc/1.6/Thu Sep 30 06:17:43 2010//
 /G4ViewParameters.cc/1.37/Thu Sep 30 11:54:33 2010//
+/G4VisCommandsViewerSet.cc/1.52/Mon Oct 11 09:00:12 2010//
 D

trunk/source/visualization/management/src/G4ViewParameters.cc

@@ -49 +49 @@
   fXNegative(0x0010),
   fYNegative(0x0020),
+  fGeometryMask(0),
   fDrawingStyle (wireframe),
   fAuxEdgeVisible (false),

trunk/source/visualization/management/src/G4VisCommandsViewerSet.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4VisCommandsViewerSet.cc,v 1.50 2009/05/13 18:17:25 allison Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4VisCommandsViewerSet.cc,v 1.52 2010/10/08 12:41:52 allison Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/viewer/set commands - John Allison  16th May 2000
@@ -143 +143 @@
   fpCommandCutawayMode->SetDefaultValue("union");
 
+  fpCommandDefaultColour = new G4UIcommand
+    ("/vis/viewer/set/defaultColour",this);
+  fpCommandDefaultColour->SetGuidance
+    ("Set defaultColour colour and transparency (default white and opaque).");
+  fpCommandDefaultColour->SetGuidance
+    ("Accepts (a) RGB triplet. e.g., \".3 .4 .5\", or"
+     "\n(b) string such as \"white\", \"black\", \"grey\", \"red\"..."
+     "\n(c) an additional number for opacity, e.g., \".3 .4 .5 .6\""
+     "\n    or \"grey ! ! .6\" (note \"!\"'s for unused green and blue parameters),"
+     "\n    e.g. \"! ! ! 0.\" for a transparent colour.");
+  parameter = new G4UIparameter("red_or_string", 's', omitable = true);
+  parameter -> SetDefaultValue ("1.");
+  fpCommandDefaultColour -> SetParameter (parameter);
+  parameter = new G4UIparameter("green", 'd', omitable = true);
+  parameter -> SetDefaultValue (1.);
+  fpCommandDefaultColour -> SetParameter (parameter);
+  parameter = new G4UIparameter ("blue", 'd', omitable = true);
+  parameter -> SetDefaultValue (1.);
+  fpCommandDefaultColour -> SetParameter (parameter);
+  parameter = new G4UIparameter ("opacity", 'd', omitable = true);
+  parameter -> SetDefaultValue (1.);
+  fpCommandDefaultColour -> SetParameter (parameter);
+
+  fpCommandDefaultTextColour = new G4UIcommand
+    ("/vis/viewer/set/defaultTextColour",this);
+  fpCommandDefaultTextColour->SetGuidance
+    ("Set defaultTextColour colour and transparency (default white and opaque).");
+  fpCommandDefaultTextColour->SetGuidance
+    ("Accepts (a) RGB triplet. e.g., \".3 .4 .5\", or"
+     "\n(b) string such as \"white\", \"black\", \"grey\", \"red\"..."
+     "\n(c) an additional number for opacity, e.g., \".3 .4 .5 .6\""
+     "\n    or \"grey ! ! .6\" (note \"!\"'s for unused green and blue parameters),"
+     "\n    e.g. \"! ! ! 0.\" for a transparent colour.");
+  parameter = new G4UIparameter("red_or_string", 's', omitable = true);
+  parameter -> SetDefaultValue ("1.");
+  fpCommandDefaultTextColour -> SetParameter (parameter);
+  parameter = new G4UIparameter("green", 'd', omitable = true);
+  parameter -> SetDefaultValue (1.);
+  fpCommandDefaultTextColour -> SetParameter (parameter);
+  parameter = new G4UIparameter ("blue", 'd', omitable = true);
+  parameter -> SetDefaultValue (1.);
+  fpCommandDefaultTextColour -> SetParameter (parameter);
+  parameter = new G4UIparameter ("opacity", 'd', omitable = true);
+  parameter -> SetDefaultValue (1.);
+  fpCommandDefaultTextColour -> SetParameter (parameter);
+
   fpCommandEdge = new G4UIcmdWithABool("/vis/viewer/set/edge",this);
   fpCommandEdge->SetGuidance
@@ -267 +313 @@
   parameter = new G4UIparameter("field-half-angle",'d',omitable = true);
   parameter->SetDefaultValue(30.);
+  parameter->SetCurrentAsDefault(true);
   fpCommandProjection->SetParameter(parameter);
   parameter = new G4UIparameter("unit",'s',omitable = true);
   parameter->SetDefaultValue("deg");
+  parameter->SetCurrentAsDefault(true);
   fpCommandProjection->SetParameter(parameter);
 
@@ -401 +449 @@
   delete fpCommandCulling;
   delete fpCommandCutawayMode;
+  delete fpCommandDefaultColour;
+  delete fpCommandDefaultTextColour;
   delete fpCommandEdge;
   delete fpCommandExplodeFactor;
@@ -611 +661 @@
   }
 
+  else if (command == fpCommandDefaultColour) {
+    G4String redOrString;
+    G4double green, blue, opacity;
+    std::istringstream iss(newValue);
+    iss >> redOrString >> green >> blue >> opacity;
+    G4Colour colour(1.,1.,1.);  // Default white and opaque.
+    const size_t iPos0 = 0;
+    if (std::isalpha(redOrString[iPos0])) {
+      G4Colour::GetColour(redOrString, colour); // Remains default (white) if
+                                                // not found.
+    } else {
+      colour = G4Colour(G4UIcommand::ConvertTo3Vector(newValue));
+    }
+    colour = G4Colour(colour.GetRed(), colour.GetGreen(), colour.GetBlue(), opacity);
+    G4VisAttributes va = vp.GetDefaultVisAttributes();
+    va.SetColour(colour);
+    vp.SetDefaultVisAttributes(va);
+    if (verbosity >= G4VisManager::confirmations) {
+      G4cout << "Default colour "
+             << vp.GetDefaultVisAttributes()->GetColour()
+             << " requested."
+             << G4endl;
+    }
+  }
+
+  else if (command == fpCommandDefaultTextColour) {
+    G4String redOrString;
+    G4double green, blue, opacity;
+    std::istringstream iss(newValue);
+    iss >> redOrString >> green >> blue >> opacity;
+    G4Colour colour(1.,1.,1.);  // Default white and opaque.
+    const size_t iPos0 = 0;
+    if (std::isalpha(redOrString[iPos0])) {
+      G4Colour::GetColour(redOrString, colour); // Remains default (white) if
+                                                // not found.
+    } else {
+      colour = G4Colour(G4UIcommand::ConvertTo3Vector(newValue));
+    }
+    colour = G4Colour(colour.GetRed(), colour.GetGreen(), colour.GetBlue(), opacity);
+    G4VisAttributes va = vp.GetDefaultTextVisAttributes();
+    va.SetColour(colour);
+    vp.SetDefaultTextVisAttributes(va);
+    if (verbosity >= G4VisManager::confirmations) {
+      G4cout << "Default colour "
+             << vp.GetDefaultTextVisAttributes()->GetColour()
+             << " requested."
+             << G4endl;
+    }
+  }
+
   else if (command == fpCommandEdge) {
     G4ViewParameters::DrawingStyle existingStyle = vp.GetDrawingStyle();

trunk/source/visualization/test/G4History.macro

@@ -6 +6 @@
 /vis/scene/create
 /vis/scene/add/volume
-/vis/sceneHandler/create OGLSXm
+/vis/sceneHandler/create OGLIQt
 /vis/sceneHandler/attach
 /vis/scene/add/volume
@@ -25 +25 @@
 /vis/viewer/refresh viewer-0
 /vis/viewer/update viewer-0
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-1
+/vis/ogl/printEPS
 /vis/viewer/create
 /vis/viewer/refresh
@@ -32 +35 @@
 /vis/viewer/refresh
 /vis/viewer/set/projection perspective 30
-/vis/viewer/refresh
 /vis/viewer/flush
 /vis/viewer/refresh viewer-1
 /vis/viewer/update viewer-1
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-2
+/vis/ogl/printEPS
 /vis/viewer/create
 /vis/viewer/refresh
@@ -45 +50 @@
 /vis/viewer/refresh
 /vis/viewer/set/projection perspective 30
-/vis/viewer/refresh
 /vis/viewer/flush
 /vis/viewer/refresh viewer-2
 /vis/viewer/update viewer-2
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-3
+/vis/ogl/printEPS
 /vis/viewer/create
 /vis/viewer/refresh
@@ -58 +65 @@
 /vis/viewer/refresh
 /vis/viewer/set/projection perspective 30
-/vis/viewer/refresh
 /vis/viewer/flush
 /vis/viewer/refresh viewer-3
 /vis/viewer/update viewer-3
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-4
+/vis/ogl/printEPS
 /run/beamOn
 /vis/scene/create
 /vis/scene/add/logicalVolume expHall_L
 /vis/scene/notifyHandlers
-/vis/sceneHandler/create OGLIQt
-/vis/sceneHandler/attach
 /vis/viewer/create
 /vis/viewer/refresh
@@ -76 +83 @@
 /vis/viewer/refresh viewer-4
 /vis/viewer/update viewer-4
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-5
+/vis/ogl/printEPS
 /vis/scene/create
 /vis/scene/add/logicalVolume intersection_L
 /vis/scene/notifyHandlers
-/vis/sceneHandler/create OGLIQt
-/vis/sceneHandler/attach
 /vis/viewer/create
 /vis/viewer/refresh
@@ -91 +99 @@
 /vis/viewer/refresh viewer-5
 /vis/viewer/update viewer-5
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename /output-OGLIQtoutput-test19-6
+/vis/ogl/printEPS
 /vis/scene/create
 /vis/scene/add/logicalVolume subtraction_L
@@ -102 +113 @@
 /vis/viewer/refresh viewer-5
 /vis/viewer/update viewer-5
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-7
+/vis/ogl/printEPS
 /vis/scene/create
 /vis/scene/add/logicalVolume union_L
@@ -113 +127 @@
 /vis/viewer/refresh viewer-5
 /vis/viewer/update viewer-5
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename /output-OGLIQtoutput-test19-8
+/vis/ogl/printEPS
 /vis/scene/create
 /vis/scene/endOfEventAction accumulate
@@ -121 +138 @@
 /tracking/storeTrajectory 1
 /vis/scene/notifyHandlers
-/vis/sceneHandler/create OGLIQt
-/vis/sceneHandler/attach
 /vis/viewer/create
 /vis/viewer/refresh
@@ -136 +151 @@
 /vis/viewer/refresh viewer-6
 /vis/viewer/update viewer-6
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-9
+/vis/ogl/printEPS
 /vis/viewer/reset
 /vis/viewer/refresh
@@ -157 +175 @@
 /vis/viewer/refresh viewer-6
 /vis/viewer/update viewer-6
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-10
+/vis/ogl/printEPS
 /vis/viewer/reset
 /vis/viewer/refresh
@@ -202 +223 @@
 /vis/viewer/refresh viewer-6
 /vis/viewer/update viewer-6
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-11
+/vis/ogl/printEPS
 /vis/viewer/reset
 /vis/viewer/refresh
@@ -231 +255 @@
 /vis/viewer/refresh viewer-6
 /vis/viewer/update viewer-6
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-12
+/vis/ogl/printEPS
 /vis/viewer/reset
 /vis/viewer/refresh
@@ -244 +271 @@
 /vis/viewer/refresh viewer-6
 /vis/viewer/update viewer-6
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-13
+/vis/ogl/printEPS
 /vis/viewer/reset
 /vis/viewer/refresh
@@ -307 +337 @@
 /vis/viewer/refresh viewer-6
 /vis/viewer/update viewer-6
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-14
+/vis/ogl/printEPS
 /vis/viewer/reset
 /vis/viewer/refresh
@@ -345 +378 @@
 /vis/viewer/refresh viewer-6
 /vis/viewer/update viewer-6
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-15
+/vis/ogl/printEPS
 /vis/viewer/set/viewpointThetaPhi 30 30
 /vis/viewer/refresh
 /vis/viewer/set/projection perspective 30
-/vis/viewer/refresh
-/vis/viewer/flush
-/vis/viewer/refresh viewer-6
-/vis/viewer/update viewer-6
-/vis/sceneHandler/create OGLIQt
-/vis/sceneHandler/attach
+/vis/viewer/flush
+/vis/viewer/refresh viewer-6
+/vis/viewer/update viewer-6
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-16
+/vis/ogl/printEPS
 /vis/viewer/create ! ! 200
 /vis/viewer/refresh
@@ -361 +397 @@
 /vis/viewer/refresh viewer-7
 /vis/viewer/update viewer-7
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-17
+/vis/ogl/printEPS
 /vis/rayTracer/column 150
 /vis/rayTracer/row 100
@@ -368 +407 @@
 /vis/viewer/refresh
 /vis/viewer/set/projection perspective 30
-/vis/viewer/refresh
 /vis/viewer/set/viewpointThetaPhi 45 45
 /vis/viewer/refresh
@@ -374 +412 @@
 /vis/viewer/refresh viewer-8
 /vis/viewer/update viewer-8
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-18
+/vis/ogl/printEPS
 /vis/viewer/create ! ! 200
 /vis/viewer/refresh
@@ -379 +420 @@
 /vis/viewer/refresh viewer-9
 /vis/viewer/update viewer-9
+/vis/ogl/set/printMode vectored
+/vis/ogl/set/printFilename output-OGLIQt/output-test19-19
+/vis/ogl/printEPS

trunk/source/visualization/test/History

@@ -1 @@
-$Id: History,v 1.123 2010/05/11 12:06:08 allison Exp $
+$Id: History,v 1.126 2010/10/27 11:17:48 allison Exp $
 
 History file for visualization/test subdirectory
@@ -5 +5 @@
 
 $Log: History,v $
+Revision 1.126  2010/10/27 11:17:48  allison
+Sorry.. vistest-V09-03-01
+
+Revision 1.125  2010/10/27 11:16:59  allison
+vistest-V09-03-00
+
+Revision 1.124  2010/10/26 16:17:44  allison
+Replaced MyPhysicsList by QGSP_BERT.
+
 Revision 1.123  2010/05/11 12:06:08  allison
 vistest-V09-03-00

trunk/source/visualization/test/test19.cc

@@ -25 +25 @@
 //
 //
-// $Id: test19.cc,v 1.32 2009/11/06 16:01:57 allison Exp $
+// $Id: test19.cc,v 1.34 2010/10/26 16:17:44 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -40 +40 @@
 //#include "SharedSolidDetectorConstruction.hh"
 #include "test19DetectorConstruction.hh"
-#include "MyPhysicsList.hh"
+#include "QGSP_BERT.hh"
 #include "MyRunAction.hh"
 #include "MyPrimaryGeneratorAction.hh"
@@ -90 +90 @@
   runManager -> SetUserInitialization (new test19DetectorConstruction);
   //runManager -> SetUserInitialization (new SharedSolidDetectorConstruction);
-  runManager -> SetUserInitialization (new MyPhysicsList);
+  runManager -> SetUserInitialization (new QGSP_BERT);
 
   // UserAction classes.

trunk/source/visualization/test/test19.g4m

@@ -6 +6 @@
 /control/saveHistory
 /vis/verbose confirmations
-#
-# See list of detector possibilities.
-/test19det/detector
-# Select detector.
-#/test19det/detector 1
-#/test19det/detector 4
-#
-# Initialise run, i.e., create geometry, set cuts, etc.
-/run/initialize
-#
-# Set gun for demo (detector 1)
-#/gun/particle e+
-#/gun/position 0 -100 0 cm
-#/gun/direction 0 1 0
-#
-# for drawing the tracks
-/tracking/storeTrajectory 1
-# if too many tracks cause core dump =storeTrajectory 0
-#
-# Create empty scene.
-/vis/scene/create
-#
-# Add volume to scene - "world" is default.
-/vis/scene/add/volume
-#
-# See list of graphics systems possibilities.
-# help /vis/sceneHandler/create
-#
-# Create a scene handler for a specific graphics system.
-# Edit the next line(s) to choose another graphic system
-#/vis/sceneHandler/create DAWNFILE
-#/vis/sceneHandler/create DAWN
-#/vis/sceneHandler/create OGLIXm
-#/vis/sceneHandler/create OGLSXm
-#/vis/sceneHandler/create OGLIX
-/vis/sceneHandler/create OGLSX
-#/vis/sceneHandler/create OGLSXm
-#/vis/sceneHandler/create VRML1
-#/vis/sceneHandler/create VRML1FILE
-#
-# Add world volume.
-/vis/scene/add/volume
-/vis/scene/add/axes 0 0 0 2 m
-/vis/scene/add/text 0 0 0 mm 50 -120 -200 test19 example text
-#
-# Add logo
-/vis/scene/add/logo
-#
-# Add scale
-/vis/scene/add/scale
-#
-# Add event id
-/vis/scene/add/eventID
-#
-# Create a viewer.
-/vis/viewer/create
-#
-# John's personal preferences
-/vis/viewer/set/lightsMove camera
-/vis/viewer/set/hiddenMarker true
-#
-/vis/viewer/set/lineSegmentsPerCircle 100
-# flush not necessary for auto-refresh drivers like OGL abd OI, but leave
-# (all that happens is an extra refresh).
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-1
-/vis/ogl/printEPS
-#
-# Create another viewer.
-/vis/viewer/create
-#
-/vis/viewer/set/viewpointThetaPhi 35 35
-/vis/viewer/set/style surface
-/vis/viewer/set/projection perspective 30
-#
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-2
-/vis/ogl/printEPS
-#
-# Now hidden line removal.
-/vis/viewer/create
-#
-/vis/viewer/set/viewpointThetaPhi 35 35
-/vis/viewer/set/style wireframe
-/vis/viewer/set/hiddenEdge
-/vis/viewer/set/projection perspective 30
-#
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-3
-/vis/ogl/printEPS
-#
-# Now hidden line *and* hidden surface removal.
-/vis/viewer/create
-#
-/vis/viewer/set/viewpointThetaPhi 35 35
-/vis/viewer/set/style surface
-/vis/viewer/set/hiddenEdge
-/vis/viewer/set/projection perspective 30
-#
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-4
-/vis/ogl/printEPS
-#
-# Start a run to initialise/optimise geometry and draw user-drawn transients.
-/run/beamOn
-#
-# Test logical volume model...
-/vis/scene/create
-/vis/scene/add/logicalVolume expHall_L
-/vis/sceneHandler/create OGLIQt
-/vis/viewer/create
-/vis/viewer/set/viewpointThetaPhi 35 35
-/vis/scene/notifyHandlers
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-5
-/vis/ogl/printEPS
-#
-# Logical volume of Boolean solids...
-/vis/scene/create
-/vis/scene/add/logicalVolume intersection_L
-/vis/sceneHandler/create OGLIQt
-/vis/viewer/create
-/vis/viewer/reset
-/vis/viewer/set/viewpointThetaPhi 35 35
-/vis/scene/notifyHandlers
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-6
-/vis/ogl/printEPS
-#
-/vis/scene/create
-/vis/scene/add/logicalVolume subtraction_L
-/vis/sceneHandler/attach
-/vis/viewer/reset
-/vis/viewer/set/viewpointThetaPhi 35 35
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-7
-/vis/ogl/printEPS
-#
-/vis/scene/create
-/vis/scene/add/logicalVolume union_L
-/vis/sceneHandler/attach
-/vis/viewer/reset
-/vis/viewer/set/viewpointThetaPhi 35 35
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-8
-/vis/ogl/printEPS
-#
-# Send geantino through...
-/vis/scene/create
-/vis/scene/endOfEventAction accumulate
-/vis/scene/endOfRunAction accumulate
-/vis/scene/add/volume
-/vis/scene/add/trajectories 5000
-#/vis/sceneHandler/create OGLSX
-/vis/sceneHandler/create OGLIQt
-/vis/viewer/create
-/vis/viewer/reset
-/vis/viewer/set/viewpointThetaPhi 35 35
-/vis/scene/notifyHandlers
-/tracking/verbose 2
-/run/beamOn 1
-/tracking/verbose 0
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-9
-/vis/ogl/printEPS
-#
-# Rotated tracker tube
-/vis/viewer/reset
-#/vis/viewer/panTo 0 -200 cm
-/vis/viewer/set/upVector 1 0 0
-/vis/viewer/set/viewpointVector 0 1 0
-#/vis/viewer/zoom 5
-/vis/viewer/set/auxiliaryEdge true
-/vis/viewer/refresh
-/gun/direction 1 0 0
-/gun/position -200 -200 150 cm
-/run/beamOn
-/gun/position -200 -200 200 cm
-/run/beamOn
-/gun/position -200 -200 250 cm
-/run/beamOn
-/gun/position -200 -200 300 cm
-/run/beamOn
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-10
-/vis/ogl/printEPS
-#
-# G4Trap1
-/vis/viewer/reset
-#/vis/viewer/panTo -200 200 cm  # Originally intended to be absolute coords.
-/vis/viewer/pan -275 75 cm
-/vis/viewer/zoom 5
-/vis/viewer/refresh
-/gun/direction -1 0 0
-/gun/position -20 120 -200 cm
-/run/beamOn
-/gun/position -20 130 -200 cm
-/run/beamOn
-/gun/position -20 140 -200 cm
-/run/beamOn
-/gun/position -20 150 -200 cm
-/run/beamOn
-/gun/position -20 160 -200 cm
-/run/beamOn
-/gun/position -20 170 -200 cm
-/run/beamOn
-/gun/position -20 180 -200 cm
-/run/beamOn
-/gun/position -20 190 -200 cm
-/run/beamOn
-/gun/position -20 200 -200 cm
-/run/beamOn
-/gun/position -20 210 -200 cm
-/run/beamOn
-/gun/position -20 220 -200 cm
-/run/beamOn
-/gun/position -20 230 -200 cm
-/run/beamOn
-/gun/position -20 240 -200 cm
-/run/beamOn
-/gun/position -20 250 -200 cm
-/run/beamOn
-/gun/position -20 260 -200 cm
-/run/beamOn
-/gun/position -20 270 -200 cm
-/run/beamOn
-/gun/position -20 280 -200 cm
-/run/beamOn
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-11
-/vis/ogl/printEPS
-#
-# G4Trap2
-/vis/viewer/reset
-#/vis/viewer/panTo -200 400 cm
-/vis/viewer/pan -275 275 cm
-/vis/viewer/set/viewpointThetaPhi 90 180
-#/vis/viewer/panTo -200 0 cm
-/vis/viewer/pan -200 0 cm
-/vis/viewer/zoom 5
-/vis/viewer/refresh
-/gun/direction 0 0 -1
-/gun/position -200 400 -20 cm
-/run/beamOn
-/gun/position -200 380 -20 cm
-/run/beamOn
-/gun/position -200 420 -20 cm
-/run/beamOn
-/gun/position -200 360 -20 cm
-/run/beamOn
-/gun/position -200 440 -20 cm
-/run/beamOn
-/gun/position -200 340 -20 cm
-/run/beamOn
-/gun/position -200 460 -20 cm
-/run/beamOn
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-12
-/vis/ogl/printEPS
-#
-# Displaced solid.
-/vis/viewer/reset
-#/vis/viewer/panTo 200 -200 cm
-/vis/viewer/pan 125 -325 cm
-/vis/viewer/zoom 5
-/vis/viewer/refresh
-/gun/position 100 -180 0 cm
-/gun/direction 1 0 0
-/run/beamOn
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-13
-/vis/ogl/printEPS
-#
-# Boolean solid.
-/vis/viewer/reset
-#/vis/viewer/panTo 250 -50 cm
-/vis/viewer/pan 175 -175 cm
-/vis/viewer/zoom 3
-/vis/viewer/refresh
-/gun/direction 1 0 0
-/gun/position 50 -105 0 cm
-/run/beamOn
-/gun/position 50 -100 0 cm
-/run/beamOn
-/gun/position 50 -95 0 cm
-/run/beamOn
-/gun/position 50 -90 0 cm
-/run/beamOn
-/gun/position 50 -85 0 cm
-/run/beamOn
-/gun/position 50 -80 0 cm
-/run/beamOn
-/gun/position 50 -75 0 cm
-/run/beamOn
-/gun/position 50 -70 0 cm
-/run/beamOn
-/gun/position 50 -65 0 cm
-/run/beamOn
-/gun/position 50 -60 0 cm
-/run/beamOn
-/gun/position 50 -55 0 cm
-/run/beamOn
-/gun/position 50 -50 0 cm
-/run/beamOn
-/gun/position 50 -45 0 cm
-/run/beamOn
-/gun/position 50 -40 0 cm
-/run/beamOn
-/gun/position 50 -35 0 cm
-/run/beamOn
-/gun/position 50 -30 0 cm
-/run/beamOn
-/gun/position 50 -25 0 cm
-/run/beamOn
-/gun/position 50 -20 0 cm
-/run/beamOn
-/gun/position 50 -15 0 cm
-/run/beamOn
-/gun/position 50 -10 0 cm
-/run/beamOn
-/gun/position 50 -5 0 cm
-/run/beamOn
-/gun/position 50 0 0 cm
-/run/beamOn
-/gun/position 50 5 0 cm
-/run/beamOn
-/gun/position 50 10 0 cm
-/run/beamOn
-/gun/position 50 15 0 cm
-/run/beamOn
-/gun/position 50 20 0 cm
-/run/beamOn
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-14
-/vis/ogl/printEPS
-#
-# To view replicas...
-# Investigating BaBar problem...
-# G4SmartVoxelHeader::BuildNodes - PANIC! Daughter physical volume
-# name = EB20 is entirely outside mother logical volume name = EBMX
-/vis/viewer/reset
-#/vis/viewer/panTo -200 0 cm
-/vis/viewer/pan -275 -125 cm
-/vis/viewer/zoom 7
-/vis/viewer/refresh
-/gun/direction 0 1 0
-# The following just crash with replicas...
-/gun/position -200 -100 0 cm
-/run/beamOn
-/gun/position -195 -100 0 cm
-/run/beamOn
-/gun/position -190 -100 0 cm
-/run/beamOn
-/gun/position -185 -100 0 cm
-/run/beamOn
-/gun/position -180 -100 0 cm
-/run/beamOn
-/gun/position -160 -100 0 cm
-/run/beamOn
-#...end
-/gun/position -200 0 0 cm
-# The following just crash with replicas...
-/gun/direction 1 1 0
-/run/beamOn
-/gun/direction 0 1 0
-/run/beamOn
-/gun/direction 1 .2 0
-/run/beamOn
-/gun/direction -1 1 0
-/run/beamOn
-/gun/direction -1 -1 0
-/run/beamOn
-/gun/direction 0 -1 0
-/run/beamOn
-/gun/direction 1 -1 0
-/run/beamOn
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-15
-/vis/ogl/printEPS
-#...end
-#
-/vis/viewer/set/viewpointThetaPhi 30 30
-/vis/viewer/set/projection perspective 30
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-16
-/vis/ogl/printEPS
-#
-#/vis/sceneHandler/create OIX
-/vis/sceneHandler/create OGLIQt
-#/vis/viewer/create
-/vis/viewer/create ! ! 200
-/vis/viewer/set/viewpointThetaPhi 30 30
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-17
-/vis/ogl/printEPS
-#
-# You can use /vis/rayTracer/... commands
-/vis/rayTracer/column 150
-/vis/rayTracer/row 100
-/vis/rayTracer/backgroundColour .3 .2 .1
-/vis/rayTracer/trace
-#
-/vis/viewer/create ! ! 200x300
-/vis/viewer/set/projection perspective  30
-/vis/viewer/set/viewpointThetaPhi 45 45
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-18
-/vis/ogl/printEPS
-#
-# Odd!!?  JPEG image seems upside down for default view direction...
-/vis/viewer/create ! ! 200
-/vis/viewer/flush
-/vis/ogl/set/printMode vectored
-/vis/ogl/set/printSize 800 600
-/vis/ogl/set/printFilename output-test19-19
-/vis/ogl/printEPS
+
+#/control/execute test19-OGLSX.g4m
+#/control/execute test19-OGLIX.g4m
+/control/execute test19-OGLIQt.g4m
+#/control/execute test19-OGLSQt.g4m
 exit