Ignore:
Timestamp:
Dec 22, 2010, 11:33:38 AM (15 years ago)
Author:
garnier
Message:

before tag

Location:
trunk/source/visualization/management
Files:
72 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/visualization/management/CVS/Entries

    r1340 r1346  
    11D/include////
    22D/src////
    3 /CMakeLists.txt/1.1/Wed Sep 29 19:14:49 2010//
    4 /Doxyfile/1.2/Mon Jul 12 14:53:19 2010//
    5 /GNUmakefile/1.17/Thu Sep 30 06:17:35 2010//
    6 /sources.cmake/1.1/Wed Sep 29 19:15:02 2010//
    7 /History/1.155/Fri Oct  8 10:03:41 2010//
     3/CMakeLists.txt/1.1/Wed Sep 29 19:14:49 2010//Tgeant4-09-04-ref-00
     4/History/1.160.2.1/Wed Dec 22 10:23:43 2010//Tgeant4-09-04-ref-00
     5/sources.cmake/1.1/Wed Sep 29 19:15:02 2010//Tgeant4-09-04-ref-00
  • trunk/source/visualization/management/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00
  • trunk/source/visualization/management/GNUmakefile

    r1337 r1346  
    1010
    1111# For debug mode
    12 # CPPFLAGS += -DG4DEBUG_VIS_MANAGEMENT
     12CPPFLAGS += -DG4DEBUG_VIS_MANAGEMENT
    1313
    1414GLOBLIBS  = libG4modeling.lib
  • trunk/source/visualization/management/History

    r1340 r1346  
    1 $Id: History,v 1.155 2010/10/07 07:31:43 allison Exp $
     1$Id: History,v 1.160.2.1 2010/12/14 15:55:56 gcosmo Exp $
    22
    33-------------------------------------------------------------------
     
    2727------------------------------------------------------
    2828
    29 4th November 2010  Laurent Garnier Allison
    30 - Added initialization of fGeometryMask (according to coverity.cern.ch)
     2914th December 2010  Gabriele Cosmo  (visman-V09-03-16)
     30- G4VisManager: moved GetVerbosity() static method to non-inline to allow for
     31  Windows DLL exporting.
     32
     3313th November 2010  John Allison  (visman-V09-03-15)
     34- G4VisCommandScene.cc:
     35  o Backed out change in /vis/scene/notifyHandlers.
     36  o Improved comments.
     37- G4VisManager.hh: Tidied layout.
     38
     3910th November 2010  Laurent Garnier
     40- G4VisCommandScene.cc:
     41  o In /vis/scene/notifyHandlers: Add a clear for Transient Store.
     42
     437th November 2010  John Allison  (visman-V09-03-14)
     44- G4VisExecutive.icc: Inlined constructor.
     45- G4VisManager.cc: Fixed Coverity warning.
     46- G4VisCommandsViewer.cc: Fixed Coverity warning.
     47
     486th November 2010  John Allison
     49- G4VisCommandsSceneAdd.cc: Fixed Coverity warning.
     50
     515th November 2010  John Allison  (visman-V09-03-13)
     52- G4VSceneHandler.cc and G4ViewParameters.cc:
     53  o Fixed Coverity warning.
    3154
    32556th October 2010  John Allison  (visman-V09-03-12)
  • trunk/source/visualization/management/include/CVS/Entries

    r1340 r1346  
    1 /G4GraphicsSystemList.hh/1.9/Thu Sep 30 06:17:36 2010//
    2 /G4Scene.hh/1.19/Thu Sep 30 06:17:36 2010//
    3 /G4Scene.icc/1.15/Thu Sep 30 06:17:36 2010//
    4 /G4SceneHandlerList.hh/1.8/Thu Sep 30 06:17:36 2010//
    5 /G4SceneList.hh/1.10/Thu Sep 30 06:17:36 2010//
    6 /G4VGraphicsSystem.hh/1.12/Thu Sep 30 06:17:36 2010//
    7 /G4VGraphicsSystem.icc/1.8/Thu Sep 30 06:17:36 2010//
    8 /G4VSceneHandler.hh/1.44/Thu Sep 30 06:17:36 2010//
    9 /G4VSceneHandler.icc/1.20/Thu Sep 30 06:17:36 2010//
    10 /G4VUserVisAction.hh/1.8/Thu Sep 30 06:17:36 2010//
    11 /G4VViewer.hh/1.18/Thu Sep 30 06:17:36 2010//
    12 /G4VViewer.icc/1.11/Thu Sep 30 06:17:36 2010//
    13 /G4VVisCommand.hh/1.18/Thu Sep 30 06:17:36 2010//
    14 /G4VVisCommand.icc/1.5/Thu Sep 30 06:17:36 2010//
    15 /G4ViewParameters.hh/1.30/Thu Sep 30 06:17:37 2010//
    16 /G4ViewParameters.icc/1.18/Thu Sep 30 06:17:37 2010//
    17 /G4ViewerList.hh/1.8/Thu Sep 30 06:17:37 2010//
    18 /G4VisCommandModelCreate.hh/1.3/Thu Sep 30 06:17:37 2010//
    19 /G4VisCommands.hh/1.8/Thu Sep 30 06:17:37 2010//
    20 /G4VisCommandsCompound.hh/1.9/Thu Sep 30 06:17:37 2010//
    21 /G4VisCommandsGeometry.hh/1.3/Thu Sep 30 06:17:37 2010//
    22 /G4VisCommandsGeometrySet.hh/1.4/Thu Sep 30 06:17:37 2010//
    23 /G4VisCommandsListManager.hh/1.3/Thu Sep 30 06:17:37 2010//
    24 /G4VisCommandsScene.hh/1.19/Thu Sep 30 06:17:37 2010//
    25 /G4VisCommandsSceneAdd.hh/1.21/Thu Sep 30 06:17:37 2010//
    26 /G4VisCommandsSceneHandler.hh/1.8/Thu Sep 30 06:17:37 2010//
    27 /G4VisCommandsViewer.hh/1.23/Thu Sep 30 06:17:37 2010//
    28 /G4VisExecutive.hh/1.10/Thu Sep 30 06:17:38 2010//
    29 /G4VisExecutive.icc/1.26/Thu Sep 30 06:17:38 2010//
    30 /G4VisFeaturesOfDAWNFILE.hh/1.5/Thu Sep 30 06:17:38 2010//
    31 /G4VisFeaturesOfFukuiRenderer.hh/1.5/Thu Sep 30 06:17:38 2010//
    32 /G4VisFeaturesOfOpenGL.hh/1.6/Thu Sep 30 06:17:38 2010//
    33 /G4VisFeaturesOfOpenInventor.hh/1.5/Thu Sep 30 06:17:38 2010//
    34 /G4VisFilterManager.hh/1.4/Thu Sep 30 06:17:38 2010//
    35 /G4VisListManager.hh/1.8/Thu Sep 30 06:17:38 2010//
    36 /G4VisManager.hh/1.75/Thu Sep 30 06:17:38 2010//
    37 /G4VisManager.icc/1.22/Thu Sep 30 06:17:38 2010//
    38 /G4VisModelManager.hh/1.4/Thu Sep 30 06:17:38 2010//
    39 /G4VisStateDependent.hh/1.5/Thu Sep 30 06:17:38 2010//
    40 /G4VisCommandsViewerSet.hh/1.24/Wed Oct  6 15:52:57 2010//
     1/G4VisManager.icc/1.22/Tue Jun  1 16:08:15 2010//
     2/G4GraphicsSystemList.hh/1.9/Thu Jun 29 21:27:54 2006//Tgeant4-09-04-ref-00
     3/G4Scene.hh/1.19/Wed Nov  4 12:49:16 2009//Tgeant4-09-04-ref-00
     4/G4Scene.icc/1.15/Wed Nov  4 12:49:16 2009//Tgeant4-09-04-ref-00
     5/G4SceneHandlerList.hh/1.8/Thu Jun 29 21:28:00 2006//Tgeant4-09-04-ref-00
     6/G4SceneList.hh/1.10/Thu Jun 29 21:28:02 2006//Tgeant4-09-04-ref-00
     7/G4VGraphicsSystem.hh/1.12/Thu May 20 07:55:47 2010//Tgeant4-09-04-ref-00
     8/G4VGraphicsSystem.icc/1.8/Thu May 20 07:55:47 2010//Tgeant4-09-04-ref-00
     9/G4VSceneHandler.hh/1.44/Sun May 30 11:30:49 2010//Tgeant4-09-04-ref-00
     10/G4VSceneHandler.icc/1.20/Thu Jan 11 16:38:14 2007//Tgeant4-09-04-ref-00
     11/G4VUserVisAction.hh/1.8/Thu Jun 29 21:28:12 2006//Tgeant4-09-04-ref-00
     12/G4VViewer.hh/1.18/Thu Jun 29 21:28:14 2006//Tgeant4-09-04-ref-00
     13/G4VViewer.icc/1.11/Thu Jun 29 21:28:16 2006//Tgeant4-09-04-ref-00
     14/G4VVisCommand.hh/1.18/Thu Jun 29 21:28:18 2006//Tgeant4-09-04-ref-00
     15/G4VVisCommand.icc/1.5/Thu Jun 29 21:28:20 2006//Tgeant4-09-04-ref-00
     16/G4ViewParameters.hh/1.30/Wed Jan 21 16:59:22 2009//Tgeant4-09-04-ref-00
     17/G4ViewParameters.icc/1.18/Wed Jan 21 16:59:22 2009//Tgeant4-09-04-ref-00
     18/G4ViewerList.hh/1.8/Thu Jun 29 21:28:26 2006//Tgeant4-09-04-ref-00
     19/G4VisCommandModelCreate.hh/1.3/Thu Jun 29 21:28:28 2006//Tgeant4-09-04-ref-00
     20/G4VisCommands.hh/1.8/Mon Mar  9 12:42:00 2009//Tgeant4-09-04-ref-00
     21/G4VisCommandsCompound.hh/1.9/Thu Jun 29 21:28:32 2006//Tgeant4-09-04-ref-00
     22/G4VisCommandsGeometry.hh/1.3/Thu Jun 29 21:28:34 2006//Tgeant4-09-04-ref-00
     23/G4VisCommandsGeometrySet.hh/1.4/Tue Jun 15 16:33:55 2010//Tgeant4-09-04-ref-00
     24/G4VisCommandsListManager.hh/1.3/Thu Jun 29 21:28:38 2006//Tgeant4-09-04-ref-00
     25/G4VisCommandsScene.hh/1.19/Tue Nov 14 14:59:54 2006//Tgeant4-09-04-ref-00
     26/G4VisCommandsSceneAdd.hh/1.21/Thu Jun  3 10:17:44 2010//Tgeant4-09-04-ref-00
     27/G4VisCommandsSceneHandler.hh/1.8/Thu Jun 29 21:28:44 2006//Tgeant4-09-04-ref-00
     28/G4VisCommandsViewer.hh/1.23/Wed Sep 13 13:17:29 2006//Tgeant4-09-04-ref-00
     29/G4VisCommandsViewerSet.hh/1.24/Wed Oct  6 10:15:38 2010//Tgeant4-09-04-ref-00
     30/G4VisExecutive.hh/1.10/Fri May 28 16:48:03 2010//Tgeant4-09-04-ref-00
     31/G4VisExecutive.icc/1.27/Sun Nov  7 11:14:33 2010//Tgeant4-09-04-ref-00
     32/G4VisFeaturesOfDAWNFILE.hh/1.5/Thu Jun 29 21:28:54 2006//Tgeant4-09-04-ref-00
     33/G4VisFeaturesOfFukuiRenderer.hh/1.5/Thu Jun 29 21:28:56 2006//Tgeant4-09-04-ref-00
     34/G4VisFeaturesOfOpenGL.hh/1.6/Wed Oct  3 14:20:23 2007//Tgeant4-09-04-ref-00
     35/G4VisFeaturesOfOpenInventor.hh/1.5/Thu Jun 29 21:29:00 2006//Tgeant4-09-04-ref-00
     36/G4VisFilterManager.hh/1.4/Thu Jun 29 21:29:02 2006//Tgeant4-09-04-ref-00
     37/G4VisListManager.hh/1.8/Thu Jun 29 21:29:04 2006//Tgeant4-09-04-ref-00
     38/G4VisManager.hh/1.76/Fri Nov 26 15:30:48 2010//Tgeant4-09-04-ref-00
     39/G4VisModelManager.hh/1.4/Thu Jun 29 21:29:10 2006//Tgeant4-09-04-ref-00
     40/G4VisStateDependent.hh/1.5/Thu Jun 29 21:29:12 2006//Tgeant4-09-04-ref-00
    4141D
  • trunk/source/visualization/management/include/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00
  • trunk/source/visualization/management/include/G4GraphicsSystemList.hh

    r1337 r1346  
    2626//
    2727// $Id: G4GraphicsSystemList.hh,v 1.9 2006/06/29 21:27:54 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4Scene.hh

    r1337 r1346  
    2626//
    2727// $Id: G4Scene.hh,v 1.19 2009/11/04 12:49:16 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4Scene.icc

    r1337 r1346  
    2626//
    2727// $Id: G4Scene.icc,v 1.15 2009/11/04 12:49:16 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4SceneHandlerList.hh

    r1337 r1346  
    2626//
    2727// $Id: G4SceneHandlerList.hh,v 1.8 2006/06/29 21:28:00 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4SceneList.hh

    r1337 r1346  
    2626//
    2727// $Id: G4SceneList.hh,v 1.10 2006/06/29 21:28:02 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4VGraphicsSystem.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VGraphicsSystem.hh,v 1.12 2010/05/20 07:55:47 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4VGraphicsSystem.icc

    r1337 r1346  
    2626//
    2727// $Id: G4VGraphicsSystem.icc,v 1.8 2010/05/20 07:55:47 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4VSceneHandler.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VSceneHandler.hh,v 1.44 2010/05/30 11:30:49 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4VSceneHandler.icc

    r1337 r1346  
    2626//
    2727// $Id: G4VSceneHandler.icc,v 1.20 2007/01/11 16:38:14 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4VUserVisAction.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VUserVisAction.hh,v 1.8 2006/06/29 21:28:12 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4VViewer.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VViewer.hh,v 1.18 2006/06/29 21:28:14 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4VViewer.icc

    r1337 r1346  
    2626//
    2727// $Id: G4VViewer.icc,v 1.11 2006/06/29 21:28:16 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4VVisCommand.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VVisCommand.hh,v 1.18 2006/06/29 21:28:18 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030// Base class for visualization commands - John Allison  9th August 1998
  • trunk/source/visualization/management/include/G4VVisCommand.icc

    r1337 r1346  
    2626//
    2727// $Id: G4VVisCommand.icc,v 1.5 2006/06/29 21:28:20 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030// Base class for visualization commands - John Allison  9th August 1998
  • trunk/source/visualization/management/include/G4ViewParameters.hh

    r1337 r1346  
    2626//
    2727// $Id: G4ViewParameters.hh,v 1.30 2009/01/21 16:59:22 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4ViewParameters.icc

    r1337 r1346  
    2626//
    2727// $Id: G4ViewParameters.icc,v 1.18 2009/01/21 16:59:22 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4ViewerList.hh

    r1337 r1346  
    2626//
    2727// $Id: G4ViewerList.hh,v 1.8 2006/06/29 21:28:26 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4VisCommandModelCreate.hh

    r1337 r1346  
    2525//
    2626// $Id: G4VisCommandModelCreate.hh,v 1.3 2006/06/29 21:28:28 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl October 2005
  • trunk/source/visualization/management/include/G4VisCommands.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VisCommands.hh,v 1.8 2009/03/09 12:42:00 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030// /vis/ top level commands - John Allison  5th February 2001
  • trunk/source/visualization/management/include/G4VisCommandsCompound.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VisCommandsCompound.hh,v 1.9 2006/06/29 21:28:32 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030// Compound /vis/ commands - John Allison  15th May 2000
  • trunk/source/visualization/management/include/G4VisCommandsGeometry.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VisCommandsGeometry.hh,v 1.3 2006/06/29 21:28:34 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030// /vis/geometry commands - John Allison  31st January 2006
  • trunk/source/visualization/management/include/G4VisCommandsGeometrySet.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VisCommandsGeometrySet.hh,v 1.4 2010/06/15 16:33:55 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030// /vis/geometry commands - John Allison  31st January 2006
  • trunk/source/visualization/management/include/G4VisCommandsListManager.hh

    r1337 r1346  
    2525//
    2626// $Id: G4VisCommandsListManager.hh,v 1.3 2006/06/29 21:28:38 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl October 2005
  • trunk/source/visualization/management/include/G4VisCommandsScene.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VisCommandsScene.hh,v 1.19 2006/11/14 14:59:54 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030// /vis/scene commands - John Allison  9th August 1998
  • trunk/source/visualization/management/include/G4VisCommandsSceneAdd.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VisCommandsSceneAdd.hh,v 1.21 2010/06/03 10:17:44 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030// /vis/scene commands - John Allison  9th August 1998
  • trunk/source/visualization/management/include/G4VisCommandsSceneHandler.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VisCommandsSceneHandler.hh,v 1.8 2006/06/29 21:28:44 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030// /vis/sceneHandler commands - John Allison  10th October 1998
  • trunk/source/visualization/management/include/G4VisCommandsViewer.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VisCommandsViewer.hh,v 1.23 2006/09/13 13:17:29 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030// /vis/viewer commands - John Allison  25th October 1998
  • trunk/source/visualization/management/include/G4VisExecutive.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VisExecutive.hh,v 1.10 2010/05/28 16:48:03 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4VisExecutive.icc

    r1337 r1346  
    2525//
    2626//
    27 // $Id: G4VisExecutive.icc,v 1.26 2010/05/30 11:30:49 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VisExecutive.icc,v 1.27 2010/11/07 11:14:33 allison Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
     
    9393#endif
    9494
    95   G4VisExecutive::G4VisExecutive (const G4String& verbosityString):
    96     G4VisManager(verbosityString)       
    97   {}
     95inline
     96G4VisExecutive::G4VisExecutive (const G4String& verbosityString):
     97  G4VisManager(verbosityString)
     98{}
    9899
    99100// The inline keyword prevents the compiler making an external
  • trunk/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VisFeaturesOfDAWNFILE.hh,v 1.5 2006/06/29 21:28:54 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030#ifndef G4VISFEATURESOFDAWNFILE_HH
  • trunk/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VisFeaturesOfFukuiRenderer.hh,v 1.5 2006/06/29 21:28:56 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VisFeaturesOfOpenGL.hh,v 1.6 2007/10/03 14:20:23 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VisFeaturesOfOpenInventor.hh,v 1.5 2006/06/29 21:29:00 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4VisFilterManager.hh

    r1337 r1346  
    2525//
    2626// $Id: G4VisFilterManager.hh,v 1.4 2006/06/29 21:29:02 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Filter manager. Manages filter models, factories, messengers,
  • trunk/source/visualization/management/include/G4VisListManager.hh

    r1337 r1346  
    2525//
    2626// $Id: G4VisListManager.hh,v 1.8 2006/06/29 21:29:04 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl October 2005
  • trunk/source/visualization/management/include/G4VisManager.hh

    r1337 r1346  
    2525//
    2626//
    27 // $Id: G4VisManager.hh,v 1.75 2010/06/01 16:08:15 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VisManager.hh,v 1.76 2010/11/13 10:54:55 allison Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
     
    450450  G4SceneList           fSceneList;
    451451  G4SceneHandlerList    fAvailableSceneHandlers;
    452   static Verbosity             fVerbosity;
     452  static Verbosity            fVerbosity;
    453453  std::vector<G4UImessenger*> fMessengerList;
    454454  std::vector<G4UIcommand*>   fDirectoryList;
  • trunk/source/visualization/management/include/G4VisManager.icc

    r1337 r1346  
    2626//
    2727// $Id: G4VisManager.icc,v 1.22 2010/06/01 16:08:15 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/include/G4VisModelManager.hh

    r1337 r1346  
    2525//
    2626// $Id: G4VisModelManager.hh,v 1.4 2006/06/29 21:29:10 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Generic model manager. Manages models, associated
  • trunk/source/visualization/management/include/G4VisStateDependent.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VisStateDependent.hh,v 1.5 2006/06/29 21:29:12 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030// A "state dependent" service class for G4VisManager.
  • trunk/source/visualization/management/src/CVS/Entries

    r1340 r1346  
    1 /G4GraphicsSystemList.cc/1.4/Thu Sep 30 06:17:39 2010//
    2 /G4Scene.cc/1.24/Thu Sep 30 06:17:39 2010//
    3 /G4SceneHandlerList.cc/1.4/Thu Sep 30 06:17:39 2010//
    4 /G4SceneList.cc/1.6/Thu Sep 30 06:17:39 2010//
    5 /G4VGraphicsSystem.cc/1.11/Thu Sep 30 06:17:39 2010//
    6 /G4VSceneHandler.cc/1.95/Thu Sep 30 06:17:39 2010//
    7 /G4VViewer.cc/1.26/Thu Sep 30 06:17:39 2010//
    8 /G4VVisCommand.cc/1.18/Thu Sep 30 06:17:39 2010//
    9 /G4ViewerList.cc/1.4/Thu Sep 30 06:17:40 2010//
    10 /G4VisCommands.cc/1.24/Thu Sep 30 06:17:40 2010//
    11 /G4VisCommandsCompound.cc/1.40/Thu Sep 30 06:17:40 2010//
    12 /G4VisCommandsGeometry.cc/1.4/Thu Sep 30 06:17:40 2010//
    13 /G4VisCommandsGeometrySet.cc/1.8/Thu Sep 30 06:17:40 2010//
    14 /G4VisCommandsScene.cc/1.68/Thu Sep 30 06:17:41 2010//
    15 /G4VisCommandsSceneAdd.cc/1.82/Thu Sep 30 06:17:41 2010//
    16 /G4VisCommandsSceneHandler.cc/1.32/Thu Sep 30 06:17:41 2010//
    17 /G4VisCommandsViewer.cc/1.76/Thu Sep 30 06:17:42 2010//
    18 /G4VisFeaturesOfDAWNFILE.cc/1.6/Thu Sep 30 06:17:42 2010//
    19 /G4VisFeaturesOfFukuiRenderer.cc/1.5/Thu Sep 30 06:17:42 2010//
    20 /G4VisFeaturesOfOpenGL.cc/1.6/Thu Sep 30 06:17:42 2010//
    21 /G4VisFeaturesOfOpenInventor.cc/1.5/Thu Sep 30 06:17:42 2010//
    22 /G4VisManager.cc/1.129/Thu Sep 30 06:17:43 2010//
    23 /G4VisStateDependent.cc/1.6/Thu Sep 30 06:17:43 2010//
    24 /G4ViewParameters.cc/1.37/Thu Sep 30 11:54:33 2010//
    25 /G4VisCommandsViewerSet.cc/1.52/Mon Oct 11 09:00:12 2010//
     1/G4GraphicsSystemList.cc/1.4/Thu Jun 29 21:29:14 2006//Tgeant4-09-04-ref-00
     2/G4Scene.cc/1.24/Wed Nov  4 12:49:16 2009//Tgeant4-09-04-ref-00
     3/G4SceneHandlerList.cc/1.4/Thu Jun 29 21:29:18 2006//Tgeant4-09-04-ref-00
     4/G4SceneList.cc/1.6/Thu Jun 29 21:29:20 2006//Tgeant4-09-04-ref-00
     5/G4VGraphicsSystem.cc/1.11/Thu Jun 29 21:29:22 2006//Tgeant4-09-04-ref-00
     6/G4VSceneHandler.cc/1.96/Fri Nov  5 16:00:11 2010//Tgeant4-09-04-ref-00
     7/G4VViewer.cc/1.26/Tue Nov 17 14:37:06 2009//Tgeant4-09-04-ref-00
     8/G4VVisCommand.cc/1.18/Thu Jun 29 21:29:28 2006//Tgeant4-09-04-ref-00
     9/G4ViewParameters.cc/1.38/Fri Nov  5 16:00:11 2010//Tgeant4-09-04-ref-00
     10/G4ViewerList.cc/1.4/Thu Jun 29 21:29:32 2006//Tgeant4-09-04-ref-00
     11/G4VisCommands.cc/1.24/Mon Mar  9 12:42:00 2009//Tgeant4-09-04-ref-00
     12/G4VisCommandsCompound.cc/1.40/Thu May 20 07:54:01 2010//Tgeant4-09-04-ref-00
     13/G4VisCommandsGeometry.cc/1.4/Fri Jan  5 16:29:38 2007//Tgeant4-09-04-ref-00
     14/G4VisCommandsGeometrySet.cc/1.8/Tue Jun 15 16:34:30 2010//Tgeant4-09-04-ref-00
     15/G4VisCommandsScene.cc/1.70/Fri Nov 26 15:31:09 2010//Tgeant4-09-04-ref-00
     16/G4VisCommandsSceneAdd.cc/1.84/Sat Nov  6 18:34:26 2010//Tgeant4-09-04-ref-00
     17/G4VisCommandsSceneHandler.cc/1.32/Thu Jun 29 21:29:46 2006//Tgeant4-09-04-ref-00
     18/G4VisCommandsViewer.cc/1.77/Sun Nov  7 11:14:07 2010//Tgeant4-09-04-ref-00
     19/G4VisCommandsViewerSet.cc/1.53/Fri Nov  5 15:57:20 2010//Tgeant4-09-04-ref-00
     20/G4VisFeaturesOfDAWNFILE.cc/1.6/Thu Jun 29 21:29:52 2006//Tgeant4-09-04-ref-00
     21/G4VisFeaturesOfFukuiRenderer.cc/1.5/Thu Jun 29 21:29:54 2006//Tgeant4-09-04-ref-00
     22/G4VisFeaturesOfOpenGL.cc/1.6/Wed Oct  3 14:21:55 2007//Tgeant4-09-04-ref-00
     23/G4VisFeaturesOfOpenInventor.cc/1.5/Thu Jun 29 21:29:58 2006//Tgeant4-09-04-ref-00
     24/G4VisManager.cc/1.131/Result of merge//Tgeant4-09-04-ref-00
     25/G4VisStateDependent.cc/1.6/Thu Jun 29 21:30:02 2006//Tgeant4-09-04-ref-00
    2626D
  • trunk/source/visualization/management/src/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00
  • trunk/source/visualization/management/src/G4GraphicsSystemList.cc

    r1337 r1346  
    2626//
    2727// $Id: G4GraphicsSystemList.cc,v 1.4 2006/06/29 21:29:14 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030#include "G4GraphicsSystemList.hh"
  • trunk/source/visualization/management/src/G4Scene.cc

    r1337 r1346  
    2626//
    2727// $Id: G4Scene.cc,v 1.24 2009/11/04 12:49:16 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/src/G4SceneHandlerList.cc

    r1337 r1346  
    2626//
    2727// $Id: G4SceneHandlerList.cc,v 1.4 2006/06/29 21:29:18 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030#include "G4SceneHandlerList.hh"
  • trunk/source/visualization/management/src/G4SceneList.cc

    r1337 r1346  
    2626//
    2727// $Id: G4SceneList.cc,v 1.6 2006/06/29 21:29:20 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030#include "G4SceneList.hh"
  • trunk/source/visualization/management/src/G4VGraphicsSystem.cc

    r1337 r1346  
    2626//
    2727// $Id: G4VGraphicsSystem.cc,v 1.11 2006/06/29 21:29:22 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/src/G4VSceneHandler.cc

    r1337 r1346  
    2525//
    2626//
    27 // $Id: G4VSceneHandler.cc,v 1.95 2010/06/01 16:08:15 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VSceneHandler.cc,v 1.96 2010/11/05 16:00:11 allison Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
     
    264264  if (!trajectoriesModel) G4Exception
    265265    ("G4VSceneHandler::AddCompound(const G4VTrajectory&): Not a G4TrajectoriesModel.");
    266   if (trajectoriesModel->IsDrawingModeSet()) {
    267     traj.DrawTrajectory(trajectoriesModel->GetDrawingMode());
    268   } else {
    269     traj.DrawTrajectory();
     266  else {
     267    if (trajectoriesModel->IsDrawingModeSet()) {
     268      traj.DrawTrajectory(trajectoriesModel->GetDrawingMode());
     269    } else {
     270      traj.DrawTrajectory();
     271    }
    270272  }
    271273}
  • trunk/source/visualization/management/src/G4VViewer.cc

    r1337 r1346  
    2626//
    2727// $Id: G4VViewer.cc,v 1.26 2009/11/17 14:37:06 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/src/G4VVisCommand.cc

    r1337 r1346  
    2626//
    2727// $Id: G4VVisCommand.cc,v 1.18 2006/06/29 21:29:28 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030// Base class for visualization commands - John Allison  9th August 1998
  • trunk/source/visualization/management/src/G4ViewParameters.cc

    r1340 r1346  
    2525//
    2626//
    27 // $Id: G4ViewParameters.cc,v 1.37 2010/09/03 15:57:05 gcosmo Exp $
     27// $Id: G4ViewParameters.cc,v 1.38 2010/11/05 16:00:11 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
  • trunk/source/visualization/management/src/G4ViewerList.cc

    r1337 r1346  
    2626//
    2727// $Id: G4ViewerList.cc,v 1.4 2006/06/29 21:29:32 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030#include "G4ViewerList.hh"
  • trunk/source/visualization/management/src/G4VisCommands.cc

    r1337 r1346  
    2626//
    2727// $Id: G4VisCommands.cc,v 1.24 2009/03/09 12:42:00 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030// /vis/ top level commands - John Allison  5th February 2001
  • trunk/source/visualization/management/src/G4VisCommandsCompound.cc

    r1337 r1346  
    2626//
    2727// $Id: G4VisCommandsCompound.cc,v 1.40 2010/05/20 07:54:01 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030// Compound /vis/ commands - John Allison  15th May 2000
  • trunk/source/visualization/management/src/G4VisCommandsGeometry.cc

    r1337 r1346  
    2626//
    2727// $Id: G4VisCommandsGeometry.cc,v 1.4 2007/01/05 16:29:38 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030// /vis/geometry commands - John Allison  31st January 2006
  • trunk/source/visualization/management/src/G4VisCommandsGeometrySet.cc

    r1337 r1346  
    2626//
    2727// $Id: G4VisCommandsGeometrySet.cc,v 1.8 2010/06/15 16:34:30 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030// /vis/geometry commands - John Allison  31st January 2006
  • trunk/source/visualization/management/src/G4VisCommandsScene.cc

    r1337 r1346  
    2525//
    2626//
    27 // $Id: G4VisCommandsScene.cc,v 1.68 2008/04/28 16:12:38 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VisCommandsScene.cc,v 1.70 2010/11/13 10:52:00 allison Exp $
     28// GEANT4 tag $Name: $
    2929
    3030// /vis/scene commands - John Allison  9th August 1998
     
    541541      const G4String& aSceneName = aScene -> GetName ();
    542542      if (sceneName == aSceneName) {
    543         // Clear store and force a rebuild of graphical database...
    544         //aSceneHandler -> ClearStore (); // Not nec??  Done below
    545         //with NeedKernelVisit and DrawView.  JA.
    546543        G4ViewerList& viewerList = aSceneHandler -> SetViewerList ();
    547544        const G4int nViewers = viewerList.size ();
     
    554551            fpVisManager -> SetCurrentSceneHandler(aSceneHandler);
    555552            fpVisManager -> SetCurrentScene(aScene);
    556             // Re-draw, forcing rebuild of graphics database, if any...
     553            // ClearTransientStore.  This clears the transient, e.g.,
     554            // trajectories part of the store/graphical database but
     555            // also re-draws the permanent part (detector) and thus
     556            // has the effect of clearing trajectories from the view.
     557            // This should not be necessary since NeedKernelVisit,
     558            // ClearView and DrawView should have the effect of
     559            // deleting the whole store and re-creating it, then
     560            // clearing and re-drawing.  But ClearView does not seem
     561            // to work for all viewers.  If it's a problem for you,
     562            // uncomment the next line.
     563            //aSceneHandler->ClearTransientStore();
     564            // Now, force rebuild of graphical database, if any, and re-draw.
    557565            aViewer -> NeedKernelVisit();
    558566            aViewer -> SetView ();
  • trunk/source/visualization/management/src/G4VisCommandsSceneAdd.cc

    r1337 r1346  
    2525//
    2626//
    27 // $Id: G4VisCommandsSceneAdd.cc,v 1.82 2010/06/03 10:17:44 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VisCommandsSceneAdd.cc,v 1.84 2010/11/06 18:34:26 allison Exp $
     28// GEANT4 tag $Name: $
    2929// /vis/scene commands - John Allison  9th August 1998
    3030
     
    307307      } else {
    308308        const std::vector<const G4Event*>* events =
    309           currentRun? currentRun->GetEventVector(): 0;
     309          currentRun->GetEventVector();
    310310        if (events) nEvents = events->size();
    311311      }
     
    15901590  model->SetExtent(extent);
    15911591  const G4String& currentSceneName = pScene -> GetName ();
    1592   pScene -> AddRunDurationModel (model, warn);
    1593   if (verbosity >= G4VisManager::confirmations) {
     1592  G4bool successful = pScene -> AddRunDurationModel (model, warn);
     1593  if (successful && verbosity >= G4VisManager::confirmations) {
    15941594    G4cout << "User Vis Action added to scene \""
    15951595           << currentSceneName << "\"";
  • trunk/source/visualization/management/src/G4VisCommandsSceneHandler.cc

    r1337 r1346  
    2626//
    2727// $Id: G4VisCommandsSceneHandler.cc,v 1.32 2006/06/29 21:29:46 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030// /vis/sceneHandler commands - John Allison  10th October 1998
  • trunk/source/visualization/management/src/G4VisCommandsViewer.cc

    r1337 r1346  
    2525//
    2626//
    27 // $Id: G4VisCommandsViewer.cc,v 1.76 2010/05/29 21:20:20 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VisCommandsViewer.cc,v 1.77 2010/11/07 11:14:07 allison Exp $
     28// GEANT4 tag $Name: $
    2929
    3030// /vis/viewer commands - John Allison  25th October 1998
     
    438438  cloneName = cloneName.strip (G4String::both, '"');
    439439
     440  G4bool errorWhileNaming = false;
    440441  if (cloneName == "none") {
    441442    G4int subID = 0;
     
    450451        cloneName.insert(nextSpacePosition, oss.str());
    451452      } else {
    452         cloneName.insert(cloneName.find(' '), oss.str());
     453        G4String::size_type spacePosition = cloneName.find(' ');
     454        if (spacePosition != G4String::npos)
     455          cloneName.insert(spacePosition, oss.str());
     456        else
     457          errorWhileNaming = true;
    453458      }
    454     } while (fpVisManager -> GetViewer (cloneName));
     459    } while (!errorWhileNaming && fpVisManager -> GetViewer (cloneName));
     460  }
     461
     462  if (errorWhileNaming) {
     463    if (verbosity >= G4VisManager::errors) {
     464      G4cout << "ERROR: While naming clone viewer \"" << cloneName
     465             << "\"."
     466             << G4endl;
     467    }
     468    return;
    455469  }
    456470
     
    14071421  }
    14081422
    1409   if (viewer) {
    1410     if (verbosity >= G4VisManager::confirmations) {
    1411       G4cout << "Viewer \"" << viewer -> GetName () << "\"";
    1412       G4cout << " post-processing triggered." << G4endl;
    1413     }
    1414     viewer -> ShowView ();
    1415     // Assume future need to "refresh" transients...
    1416     sceneHandler -> SetMarkForClearingTransientStore(true);
    1417   }
    1418   else {
    1419     if (verbosity >= G4VisManager::errors) {
    1420       G4cout << "ERROR: Viewer \"" << updateName << "\"";
    1421       G4cout << " not found - \"/vis/viewer/list\""
    1422         "\n  to see possibilities." << G4endl;
    1423     }
    1424   }
     1423  if (verbosity >= G4VisManager::confirmations) {
     1424    G4cout << "Viewer \"" << viewer -> GetName () << "\"";
     1425    G4cout << " post-processing triggered." << G4endl;
     1426  }
     1427  viewer -> ShowView ();
     1428  // Assume future need to "refresh" transients...
     1429  sceneHandler -> SetMarkForClearingTransientStore(true);
    14251430}
    14261431
  • trunk/source/visualization/management/src/G4VisCommandsViewerSet.cc

    r1340 r1346  
    2525//
    2626//
    27 // $Id: G4VisCommandsViewerSet.cc,v 1.52 2010/10/08 12:41:52 allison Exp $
     27// $Id: G4VisCommandsViewerSet.cc,v 1.53 2010/11/05 15:57:20 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929
     
    313313  parameter = new G4UIparameter("field-half-angle",'d',omitable = true);
    314314  parameter->SetDefaultValue(30.);
    315   parameter->SetCurrentAsDefault(true);
     315  //parameter->SetCurrentAsDefault(true);
    316316  fpCommandProjection->SetParameter(parameter);
    317317  parameter = new G4UIparameter("unit",'s',omitable = true);
    318318  parameter->SetDefaultValue("deg");
    319   parameter->SetCurrentAsDefault(true);
     319  //parameter->SetCurrentAsDefault(true);
    320320  fpCommandProjection->SetParameter(parameter);
    321321
  • trunk/source/visualization/management/src/G4VisFeaturesOfDAWNFILE.cc

    r1337 r1346  
    2626//
    2727// $Id: G4VisFeaturesOfDAWNFILE.cc,v 1.6 2006/06/29 21:29:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030#include "G4VisFeaturesOfDAWNFILE.hh"
  • trunk/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc

    r1337 r1346  
    2626//
    2727// $Id: G4VisFeaturesOfFukuiRenderer.cc,v 1.5 2006/06/29 21:29:54 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc

    r1337 r1346  
    2626//
    2727// $Id: G4VisFeaturesOfOpenGL.cc,v 1.6 2007/10/03 14:21:55 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc

    r1337 r1346  
    2626//
    2727// $Id: G4VisFeaturesOfOpenInventor.cc,v 1.5 2006/06/29 21:29:58 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
  • trunk/source/visualization/management/src/G4VisManager.cc

    r1337 r1346  
    2424// ********************************************************************
    2525//
    26 // $Id: G4VisManager.cc,v 1.129 2010/06/03 10:16:11 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4VisManager.cc,v 1.131 2010/12/14 15:53:28 gcosmo Exp $
     27// GEANT4 tag $Name: $
    2828//
    2929//
     
    466466                         const G4Transform3D& objectTransform) {
    467467  if (IsValidView ()) {
     468#ifdef G4DEBUG_VIS_MANAGEMENT
     469    printf("G4VisManager::Draw circle\n");
     470#endif
    468471    ClearTransientStoreIfMarked();
    469472    fpSceneHandler -> BeginPrimitives (objectTransform);
     
    476479                         const G4Transform3D& objectTransform) {
    477480  if (IsValidView ()) {
     481#ifdef G4DEBUG_VIS_MANAGEMENT
     482    printf("G4VisManager::Draw nurbs\n");
     483#endif
    478484    ClearTransientStoreIfMarked();
    479485    fpSceneHandler -> BeginPrimitives (objectTransform);
     
    486492                         const G4Transform3D& objectTransform) {
    487493  if (IsValidView ()) {
     494#ifdef G4DEBUG_VIS_MANAGEMENT
     495    printf("G4VisManager::Draw polyhedron\n");
     496#endif
    488497    ClearTransientStoreIfMarked();
    489498    fpSceneHandler -> BeginPrimitives (objectTransform);
     
    496505                         const G4Transform3D& objectTransform) {
    497506  if (IsValidView ()) {
     507#ifdef G4DEBUG_VIS_MANAGEMENT
     508    printf("G4VisManager::Draw line\n");
     509#endif
    498510    ClearTransientStoreIfMarked();
    499511    fpSceneHandler -> BeginPrimitives (objectTransform);
     
    506518                         const G4Transform3D& objectTransform) {
    507519  if (IsValidView ()) {
     520#ifdef G4DEBUG_VIS_MANAGEMENT
     521    printf("G4VisManager::Draw polymarker\n");
     522#endif
    508523    ClearTransientStoreIfMarked();
    509524    fpSceneHandler -> BeginPrimitives (objectTransform);
     
    516531                         const G4Transform3D& objectTransform) {
    517532  if (IsValidView ()) {
     533#ifdef G4DEBUG_VIS_MANAGEMENT
     534    printf("G4VisManager::Draw scale\n");
     535#endif
    518536    ClearTransientStoreIfMarked();
    519537    fpSceneHandler -> BeginPrimitives (objectTransform);
     
    526544                         const G4Transform3D& objectTransform) {
    527545  if (IsValidView ()) {
     546#ifdef G4DEBUG_VIS_MANAGEMENT
     547    printf("G4VisManager::Draw square\n");
     548#endif
    528549    ClearTransientStoreIfMarked();
    529550    fpSceneHandler -> BeginPrimitives (objectTransform);
     
    536557                         const G4Transform3D& objectTransform) {
    537558  if (IsValidView ()) {
     559#ifdef G4DEBUG_VIS_MANAGEMENT
     560    printf("G4VisManager::Draw text ______________________________\n");
     561#endif
    538562    ClearTransientStoreIfMarked();
    539563    fpSceneHandler -> BeginPrimitives (objectTransform);
     
    547571{
    548572  if (IsValidView()) {
     573#ifdef G4DEBUG_VIS_MANAGEMENT
     574    printf("G4VisManager::Draw2d circle\n");
     575#endif
    549576    ClearTransientStoreIfMarked();
    550577    fpSceneHandler -> BeginPrimitives2D(objectTransform);
     
    558585{
    559586  if (IsValidView()) {
     587#ifdef G4DEBUG_VIS_MANAGEMENT
     588    printf("G4VisManager::Draw2d nurbs\n");
     589#endif
    560590    ClearTransientStoreIfMarked();
    561591    fpSceneHandler -> BeginPrimitives2D(objectTransform);
     
    569599{
    570600  if (IsValidView()) {
     601#ifdef G4DEBUG_VIS_MANAGEMENT
     602    printf("G4VisManager::Draw2d polyhedron\n");
     603#endif
    571604    ClearTransientStoreIfMarked();
    572605    fpSceneHandler -> BeginPrimitives2D(objectTransform);
     
    580613{
    581614  if (IsValidView()) {
     615#ifdef G4DEBUG_VIS_MANAGEMENT
     616    printf("G4VisManager::Draw2d line\n");
     617#endif
    582618    ClearTransientStoreIfMarked();
    583619    fpSceneHandler -> BeginPrimitives2D(objectTransform);
     
    591627{
    592628  if (IsValidView()) {
     629#ifdef G4DEBUG_VIS_MANAGEMENT
     630    printf("G4VisManager::Draw2d polymarker\n");
     631#endif
    593632    ClearTransientStoreIfMarked();
    594633    fpSceneHandler -> BeginPrimitives2D(objectTransform);
     
    602641{
    603642  if (IsValidView()) {
     643#ifdef G4DEBUG_VIS_MANAGEMENT
     644    printf("G4VisManager::Draw2d square\n");
     645#endif
    604646    ClearTransientStoreIfMarked();
    605647    fpSceneHandler -> BeginPrimitives2D(objectTransform);
     
    613655{
    614656  if (IsValidView()) {
     657#ifdef G4DEBUG_VIS_MANAGEMENT
     658    printf("G4VisManager::Draw2d text _____________________________\n");
     659#endif
    615660    ClearTransientStoreIfMarked();
    616661    fpSceneHandler -> BeginPrimitives2D(objectTransform);
     
    622667void G4VisManager::Draw (const G4VHit& hit) {
    623668  if (IsValidView ()) {
     669#ifdef G4DEBUG_VIS_MANAGEMENT
     670    printf("G4VisManager::Draw hit\n");
     671#endif
    624672    ClearTransientStoreIfMarked();
    625673    fpSceneHandler -> AddCompound (hit);
     
    629677void G4VisManager::Draw (const G4VDigi& digi) {
    630678  if (IsValidView ()) {
     679#ifdef G4DEBUG_VIS_MANAGEMENT
     680    printf("G4VisManager::Draw digi\n");
     681#endif
    631682    ClearTransientStoreIfMarked();
    632683    fpSceneHandler -> AddCompound (digi);
     
    637688                         G4int i_mode) {
    638689  if (IsValidView ()) {
     690#ifdef G4DEBUG_VIS_MANAGEMENT
     691    printf("G4VisManager::Draw traj\n");
     692#endif
    639693    ClearTransientStoreIfMarked();
    640694    fpSceneHandler -> SetModel (&dummyTrajectoriesModel);
     
    649703  // Find corresponding solid.
    650704  G4VSolid* pSol = logicalVol.GetSolid ();
     705#ifdef G4DEBUG_VIS_MANAGEMENT
     706    printf("G4VisManager::Draw logicalVol\n");
     707#endif
    651708  Draw (*pSol, attribs, objectTransform);
    652709}
     
    656713                         const G4Transform3D& objectTransform) {
    657714  if (IsValidView ()) {
     715#ifdef G4DEBUG_VIS_MANAGEMENT
     716    printf("G4VisManager::Draw2d solid\n");
     717#endif
    658718    ClearTransientStoreIfMarked();
    659719    fpSceneHandler -> PreAddSolid (objectTransform, attribs);
     
    10611121      }
    10621122    }
    1063     IsValidView ();  // Checks.
     1123    if (!IsValidView ()) {
     1124      if (fVerbosity >= warnings) {
     1125        G4cout <<
     1126  "WARNING: Problem setting scene handler - please report circumstances."
     1127               << G4endl;
     1128      }
     1129    }
    10641130  }
    10651131  else {
     
    10841150  fpScene = fpSceneHandler -> GetScene ();
    10851151  fpGraphicsSystem = fpSceneHandler -> GetGraphicsSystem ();
    1086   IsValidView ();  // Checks.
     1152  if (!IsValidView ()) {
     1153    if (fVerbosity >= warnings) {
     1154      G4cout <<
     1155        "WARNING: Problem setting viewer - please report circumstances."
     1156             << G4endl;
     1157    }
     1158  }
    10871159}
    10881160
     
    13451417
    13461418  ClearTransientStoreIfMarked();
     1419#ifdef G4DEBUG_VIS_MANAGEMENT
     1420    printf("G4VisManager::EndOfEvent DrawEvent ---------------------\n");
     1421#endif
    13471422  fpSceneHandler->DrawEvent(currentEvent);
    13481423
     
    15691644  else                           verbosity = Verbosity(intVerbosity);
    15701645  return verbosity;
     1646}
     1647
     1648G4VisManager::Verbosity G4VisManager::GetVerbosity () {
     1649  return fVerbosity;
    15711650}
    15721651
  • trunk/source/visualization/management/src/G4VisStateDependent.cc

    r1337 r1346  
    2626//
    2727// $Id: G4VisStateDependent.cc,v 1.6 2006/06/29 21:30:02 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030#include "G4VisStateDependent.hh"
Note: See TracChangeset for help on using the changeset viewer.