Changeset 1346


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

before tag

Location:
trunk/source/visualization
Files:
275 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/CVS/Entries

    r1340 r1346  
    1111D/management////
    1212D/modeling////
    13 /CMakeLists.txt/1.1/Wed Sep 29 19:11:25 2010//
    14 /GNUmakefile/1.27/Thu Sep 30 11:54:25 2010//
    15 /History/1.484/Fri Nov  5 10:16:45 2010//
     13/CMakeLists.txt/1.1/Wed Sep 29 19:11:25 2010//Tgeant4-09-04-ref-00
     14/History/1.493/Tue Nov 16 01:58:41 2010//Tgeant4-09-04-ref-00

  • trunk/source/visualization/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/FukuiRenderer/CVS/Entries

    r1337 r1346  
    11D/include////
    22D/src////
    3 /CMakeLists.txt/1.1/Wed Sep 29 19:11:33 2010//
    4 /CUSTOMIZE/1.2/Mon Jul 12 14:53:17 2010//
    5 /GNUmakefile/1.6/Thu Sep 30 06:16:17 2010//
    6 /History/1.28/Thu Sep 30 06:16:17 2010//
    7 /README/1.2/Mon Jul 12 14:53:17 2010//
    8 /sources.cmake/1.1/Wed Sep 29 19:11:41 2010//
     3/CMakeLists.txt/1.1/Wed Sep 29 19:11:33 2010//Tgeant4-09-04-ref-00
     4/sources.cmake/1.1/Wed Sep 29 19:11:41 2010//Tgeant4-09-04-ref-00

  • trunk/source/visualization/FukuiRenderer/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/FukuiRenderer/include/CVS/Entries

    r1337 r1346  
    1 /G4DAWNFILE.hh/1.9/Thu Sep 30 06:16:17 2010//
    2 /G4DAWNFILESceneHandler.hh/1.18/Thu Sep 30 06:16:17 2010//
    3 /G4DAWNFILEViewer.hh/1.10/Thu Sep 30 06:16:19 2010//
    4 /G4FRClientServer.hh/1.7/Thu Sep 30 06:16:19 2010//
    5 /G4FRConst.hh/1.7/Thu Sep 30 06:16:19 2010//
    6 /G4FRFeatures.hh/1.6/Thu Sep 30 06:16:19 2010//
    7 /G4FRSceneFunc.icc/1.15/Thu Sep 30 06:16:20 2010//
    8 /G4FRofstream.hh/1.9/Thu Sep 30 06:16:20 2010//
    9 /G4FukuiRenderer.hh/1.8/Thu Sep 30 06:16:20 2010//
    10 /G4FukuiRendererSceneHandler.hh/1.17/Thu Sep 30 06:16:20 2010//
    11 /G4FukuiRendererViewer.hh/1.8/Thu Sep 30 06:16:20 2010//
    121D

  • trunk/source/visualization/FukuiRenderer/include/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/FukuiRenderer/src/CVS/Entries

    r1337 r1346  
    1 /G4DAWNFILE.cc/1.11/Thu Sep 30 06:16:20 2010//
    2 /G4DAWNFILESceneHandler.cc/1.18/Thu Sep 30 06:16:20 2010//
    3 /G4DAWNFILEViewer.cc/1.20/Thu Sep 30 06:16:20 2010//
    4 /G4FRClientServer.cc/1.6/Thu Sep 30 06:16:20 2010//
    5 /G4FukuiRenderer.cc/1.9/Thu Sep 30 06:16:20 2010//
    6 /G4FukuiRendererSceneHandler.cc/1.14/Thu Sep 30 06:16:20 2010//
    7 /G4FukuiRendererViewer.cc/1.11/Thu Sep 30 06:16:21 2010//
    81D

  • trunk/source/visualization/FukuiRenderer/src/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/HepRep/CVS/Entries

    r1340 r1346  
    11D/include////
    22D/src////
    3 /CMakeLists.txt/1.1/Wed Sep 29 19:11:49 2010//
    4 /GNUmakefile/1.24/Thu Sep 30 06:16:21 2010//
    5 /History/1.135/Thu Sep 30 06:16:21 2010//
    6 /README/1.23/Mon Jul 12 14:53:10 2010//
    7 /sources.cmake/1.2/Fri Oct  8 10:03:41 2010//
     3/CMakeLists.txt/1.1/Wed Sep 29 19:11:49 2010//Tgeant4-09-04-ref-00
     4/sources.cmake/1.2/Thu Sep 30 13:50:34 2010//Tgeant4-09-04-ref-00

  • trunk/source/visualization/HepRep/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/HepRep/GNUmakefile

    r834 r1346  
    1717
    1818include $(G4INSTALL)/config/architecture.gmk
    19 include $(G4INSTALL)/config/G4VIS_BUILD.gmk
     19#include $(G4INSTALL)/config/G4VIS_BUILD.gmk
    2020include $(G4INSTALL)/config/interactivity.gmk
    2121

  • trunk/source/visualization/HepRep/include/CVS/Entries

    r1337 r1346  
    11D/HEPREP////
    22D/cheprep////
    3 /G4HepRep.hh/1.18/Thu Sep 30 06:16:21 2010//
    4 /G4HepRepFile.hh/1.8/Thu Sep 30 06:16:27 2010//
    5 /G4HepRepFileSceneHandler.hh/1.32/Thu Sep 30 06:16:27 2010//
    6 /G4HepRepFileViewer.hh/1.9/Thu Sep 30 06:16:27 2010//
    7 /G4HepRepFileXMLWriter.hh/1.2/Thu Sep 30 06:16:27 2010//
    8 /G4HepRepMessenger.hh/1.9/Thu Sep 30 06:16:27 2010//
    9 /G4HepRepSceneHandler.hh/1.45/Thu Sep 30 06:16:27 2010//
    10 /G4HepRepViewer.hh/1.19/Thu Sep 30 06:16:27 2010//
    11 /README/1.5/Mon Jul 12 14:53:09 2010//

  • trunk/source/visualization/HepRep/include/CVS/Entries.Log

    r1331 r1346  
    1 A D/HEPREP////
    2 A D/cheprep////
    31A D/ref////
    42A D/zipios++////

  • trunk/source/visualization/HepRep/include/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/HepRep/include/HEPREP/CVS/Entries

    r1337 r1346  
    1 /HasHepRep.h/1.4/Mon Jul 12 14:53:09 2010//
    2 /HepRep.h/1.11/Mon Jul 12 14:53:09 2010//
    3 /HepRepAction.h/1.7/Mon Jul 12 14:53:09 2010//
    4 /HepRepAttDef.h/1.7/Mon Jul 12 14:53:09 2010//
    5 /HepRepAttValue.h/1.7/Mon Jul 12 14:53:09 2010//
    6 /HepRepAttribute.h/1.8/Mon Jul 12 14:53:09 2010//
    7 /HepRepAttributeListener.h/1.4/Mon Jul 12 14:53:09 2010//
    8 /HepRepConstants.h/1.7/Mon Jul 12 14:53:09 2010//
    9 /HepRepDefinition.h/1.8/Mon Jul 12 14:53:09 2010//
    10 /HepRepFactory.h/1.8/Mon Jul 12 14:53:09 2010//
    11 /HepRepFrameListener.h/1.3/Mon Jul 12 14:53:09 2010//
    12 /HepRepInstance.h/1.9/Mon Jul 12 14:53:09 2010//
    13 /HepRepInstanceTree.h/1.9/Mon Jul 12 14:53:09 2010//
    14 /HepRepIterator.h/1.9/Mon Jul 12 14:53:09 2010//
    15 /HepRepPoint.h/1.9/Mon Jul 12 14:53:09 2010//
    16 /HepRepReader.h/1.4/Mon Jul 12 14:53:09 2010//
    17 /HepRepSelectFilter.h/1.7/Mon Jul 12 14:53:09 2010//
    18 /HepRepTreeID.h/1.8/Mon Jul 12 14:53:09 2010//
    19 /HepRepType.h/1.10/Mon Jul 12 14:53:09 2010//
    20 /HepRepTypeTree.h/1.9/Mon Jul 12 14:53:09 2010//
    21 /HepRepViewer.h/1.3/Mon Jul 12 14:53:09 2010//
    22 /HepRepWriter.h/1.10/Mon Jul 12 14:53:09 2010//
    23 /Types.h/1.1/Mon Jul 12 14:53:09 2010//
    24 /freehep-heprep.version/1.1/Mon Jul 12 14:53:09 2010//
    251D

  • trunk/source/visualization/HepRep/include/HEPREP/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/HepRep/include/cheprep/CVS/Entries

    r1337 r1346  
    1 /AbstractXMLWriter.h/1.3/Mon Jul 12 14:53:09 2010//
    2 /BHepRepWriter.h/1.9/Mon Jul 12 14:53:09 2010//
    3 /DefaultHepRep.h/1.3/Mon Jul 12 14:53:09 2010//
    4 /DefaultHepRepAction.h/1.3/Mon Jul 12 14:53:09 2010//
    5 /DefaultHepRepAttDef.h/1.3/Mon Jul 12 14:53:09 2010//
    6 /DefaultHepRepAttValue.h/1.3/Mon Jul 12 14:53:09 2010//
    7 /DefaultHepRepAttribute.h/1.3/Mon Jul 12 14:53:09 2010//
    8 /DefaultHepRepDefinition.h/1.3/Mon Jul 12 14:53:09 2010//
    9 /DefaultHepRepFactory.h/1.3/Mon Jul 12 14:53:09 2010//
    10 /DefaultHepRepInstance.h/1.3/Mon Jul 12 14:53:09 2010//
    11 /DefaultHepRepInstanceTree.h/1.3/Mon Jul 12 14:53:09 2010//
    12 /DefaultHepRepPoint.h/1.3/Mon Jul 12 14:53:09 2010//
    13 /DefaultHepRepTreeID.h/1.3/Mon Jul 12 14:53:09 2010//
    14 /DefaultHepRepType.h/1.3/Mon Jul 12 14:53:09 2010//
    15 /DefaultHepRepTypeTree.h/1.3/Mon Jul 12 14:53:09 2010//
    16 /DeflateOutputStreamBuffer.h/1.6/Mon Jul 12 14:53:09 2010//
    17 /GZIPOutputStream.h/1.3/Mon Jul 12 14:53:09 2010//
    18 /GZIPOutputStreamBuffer.h/1.4/Mon Jul 12 14:53:09 2010//
    19 /IndentPrintWriter.h/1.3/Mon Jul 12 14:53:09 2010//
    20 /XMLHepRepFactory.h/1.3/Mon Jul 12 14:53:09 2010//
    21 /XMLHepRepWriter.h/1.4/Mon Jul 12 14:53:09 2010//
    22 /XMLWriter.h/1.3/Mon Jul 12 14:53:09 2010//
    23 /ZipEntry.h/1.9/Mon Jul 12 14:53:09 2010//
    24 /ZipOutputStream.h/1.9/Mon Jul 12 14:53:09 2010//
    25 /ZipOutputStreamBuffer.h/1.9/Mon Jul 12 14:53:09 2010//
    26 /config.h/1.4/Mon Jul 12 14:53:09 2010//
    27 /freehep-cheprep.version/1.2/Mon Jul 12 14:53:09 2010//
    281D

  • trunk/source/visualization/HepRep/include/cheprep/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/HepRep/src/CVS/Entries

    r1337 r1346  
    1 /BHepRepWriter.cc/1.9/Thu Sep 30 06:16:30 2010//
    2 /DefaultHepRep.cc/1.9/Thu Sep 30 06:16:30 2010//
    3 /DefaultHepRepAction.cc/1.8/Thu Sep 30 06:16:31 2010//
    4 /DefaultHepRepAttDef.cc/1.8/Thu Sep 30 06:16:31 2010//
    5 /DefaultHepRepAttValue.cc/1.10/Thu Sep 30 06:16:31 2010//
    6 /DefaultHepRepAttribute.cc/1.8/Thu Sep 30 06:16:31 2010//
    7 /DefaultHepRepDefinition.cc/1.8/Thu Sep 30 06:16:31 2010//
    8 /DefaultHepRepFactory.cc/1.6/Thu Sep 30 06:16:31 2010//
    9 /DefaultHepRepInstance.cc/1.7/Thu Sep 30 06:16:31 2010//
    10 /DefaultHepRepInstanceTree.cc/1.11/Thu Sep 30 06:16:31 2010//
    11 /DefaultHepRepPoint.cc/1.5/Thu Sep 30 06:16:31 2010//
    12 /DefaultHepRepTreeID.cc/1.9/Thu Sep 30 06:16:31 2010//
    13 /DefaultHepRepType.cc/1.8/Thu Sep 30 06:16:31 2010//
    14 /DefaultHepRepTypeTree.cc/1.7/Thu Sep 30 06:16:39 2010//
    15 /DeflateOutputStreamBuffer.cc/1.6/Thu Sep 30 06:16:39 2010//
    16 /G4HepRep.cc/1.23/Thu Sep 30 06:16:39 2010//
    17 /G4HepRepFile.cc/1.12/Thu Sep 30 06:16:39 2010//
    18 /G4HepRepFileSceneHandler.cc/1.69/Thu Sep 30 06:16:39 2010//
    19 /G4HepRepFileViewer.cc/1.15/Thu Sep 30 06:16:39 2010//
    20 /G4HepRepFileXMLWriter.cc/1.3/Thu Sep 30 06:16:39 2010//
    21 /G4HepRepMessenger.cc/1.13/Thu Sep 30 06:16:39 2010//
    22 /G4HepRepSceneHandler.cc/1.102/Thu Sep 30 06:16:40 2010//
    23 /G4HepRepViewer.cc/1.27/Thu Sep 30 06:16:40 2010//
    24 /GZIPOutputStream.cc/1.4/Thu Sep 30 06:16:40 2010//
    25 /GZIPOutputStreamBuffer.cc/1.4/Thu Sep 30 06:16:40 2010//
    26 /IndentPrintWriter.cc/1.14/Thu Sep 30 06:16:40 2010//
    27 /README/1.6/Mon Jul 12 14:53:10 2010//
    28 /XMLHepRepFactory.cc/1.5/Thu Sep 30 06:16:40 2010//
    29 /XMLHepRepWriter.cc/1.15/Thu Sep 30 06:16:40 2010//
    30 /XMLWriter.cc/1.12/Thu Sep 30 06:16:40 2010//
    31 /ZipOutputStream.cc/1.9/Thu Sep 30 06:16:40 2010//
    32 /ZipOutputStreamBuffer.cc/1.9/Thu Sep 30 06:16:40 2010//
    331D

  • trunk/source/visualization/HepRep/src/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/History

    r1340 r1346  
    1 $Id: History,v 1.484 2010/10/27 11:20:27 allison Exp $
     1$Id: History,v 1.493 2010/11/16 01:58:41 perl Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2525---------------------------------------
    2626
     2715th November 2010  Joseph Perl (vis-V09-03-13)
     28- Global Vis Tag. Candidate for Geant4 release 9.4
     29- modeling-V09-03-05 - Fix for time-slicing problem.
     30
     3113th November 2010  Joseph Perl ((vis-V09-03-12)
     32- Global Vis Tag. Candidate for Geant4 release 9.4
     33
     3413th November 2010  John Allison
     35- opengl-V09-03-10: Added verbosity control.
     36- visexternal-V09-03-03: Fix for VC++.
     37- visman-V09-03-15: Code tidying.
     38- vistree-V09-03-00: Tagged inclusion of CMake stuff.
     39- All tags include CMake stuff.
     40
     4111th November 2010  Akinori Kimura
     42- DAWN-V09-03-01, gMocren-V09-03-05, VRML-V09-03-01:
     43  o Replaced G4cerr with G4cout and added verbosity control.
     44
     4510th November 2010  John Allison
     46- openinventor-V09-03-02: Protected output with G4VisManager::confirmations.
     47
     488th November 2010  John Allison  (vis-V09-03-11)
     49- opengl-V09-03-09: Tidied display list limit.
     50
     517th November 2010  John Allison  (vis-V09-03-10)
     52- visman-V09-03-14:
     53  o G4VisExecutive.icc: Inlined constructor.
     54  o Fixed Coverity warnings.
     55- visexternal-V09-03-02: Fixed Linux warnings.
     56- vis-HepRep-V09-03-04: Fixed Linux warnings (Joseph).
     57
     585th November 2010, John Allison
     59- modeling-V09-03-04: Fixed Coverity warnings.
     60- visman-V09-03-13: Fixed Coverity warnings.
     61- visexternal-V09-03-01: Update gl2ps to 1.3.5 (Laurent).
     62
    276327th October 2010  John Allison
    2864- vistest-V09-03-01: Replaced MyPhysicsList by QGSP_BERT.
     65- raytracer-V09-03-03/4: Changes to GNUmakefile (Gabriele Cosmo).
    2966
    30678th October 2010  John Allison  (vis-V09-03-09 with co-working tags...)

  • trunk/source/visualization/OpenGL/CVS/Entries

    r1343 r1346  
    11D/include////
    22D/src////
    3 /GNUmakefile/1.13/Thu Sep 30 06:16:41 2010//
    4 /CMakeLists.txt/1.1/Wed Sep 29 19:12:06 2010//
    5 /sources.cmake/1.1/Wed Sep 29 19:12:14 2010//
     3/CMakeLists.txt/1.1/Wed Sep 29 19:12:06 2010//Tgeant4-09-04-ref-00
     4/GNUmakefile/1.13/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     5/History/1.193/Sat Nov 13 10:28:40 2010//Tgeant4-09-04-ref-00
     6/sources.cmake/1.5/Wed Dec  1 17:12:18 2010//Tgeant4-09-04-ref-00

  • trunk/source/visualization/OpenGL/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/OpenGL/GNUmakefile

    r1340 r1346  
    1111
    1212# For debug mode
    13 CPPFLAGS += -DG4DEBUG_VIS_OGL
     13#CPPFLAGS += -DG4DEBUG_VIS_OGL
    1414
    1515GLOBLIBS  = libG4vis_management.lib libG4modeling.lib libG4gl2ps.lib

  • trunk/source/visualization/OpenGL/History

    r1340 r1346  
    1 $Id: History,v 1.187 2010/11/05 06:25:23 allison Exp $
     1$Id: History,v 1.193 2010/11/13 10:28:40 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
     2013th November 2010  John Allison  (opengl-V09-03-10)
     21- Tagged.
     22
     2310th November 2010  John Allison
     24- G4OpenGLStoredSceneHandler.cc: Added commented out debug lines.
     25- G4OpenGLStoredSceneHandler.hh: Corrected misleading comment lines.
     26- G4OpenGLXViewer.cc: Protected output with G4VisManager::GetVerbosity.
     27
     288th November 2010  John Allison  (opengl-V09-03-09)
     29- G4OpenGLStoredSceneHandler:
     30  o Removed fDisplayListBase (not needed; display list ids ARE re-used).
     31  o Improved display list limit message.
     32
     337th November 2010  John Allison
     34- G4OpenGLViewerMessenger.cc: Improved messages.
     35
     366th November 2010  John Allison
     37- G4OpenGLViewerMessenger.cc: displayListLimit>=10000.
     38- G4OpenGLStoredSceneHandler:
     39  o Made all display list management variables static.
     40  o Bug fix: reset fMemoryForDisplayLists flag.
    1941
    20425th November 2010  John Allison

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

    r1343 r1346  
    1 /G4OpenGL.hh/1.9/Tue Nov 17 09:18:31 2009//
    2 /G4OpenGLBitMapStore.hh/1.4/Wed Apr  8 15:15:07 2009//
    3 /G4OpenGLFontBaseStore.hh/1.4/Wed Feb  4 16:48:40 2009//
    4 /G4OpenGLImmediateQt.hh/1.2/Wed Feb  4 16:48:40 2009//
    5 /G4OpenGLImmediateQtViewer.hh/1.7/Wed Mar 10 11:03:46 2010//
    6 /G4OpenGLImmediateSceneHandler.hh/1.15/Wed Feb  4 16:48:40 2009//
    7 /G4OpenGLImmediateViewer.hh/1.10/Wed Feb  4 16:48:40 2009//
    8 /G4OpenGLImmediateWin32.hh/1.8/Wed Feb  4 16:48:40 2009//
    9 /G4OpenGLImmediateWin32Viewer.hh/1.10/Wed Feb  4 16:48:40 2009//
    10 /G4OpenGLImmediateX.hh/1.8/Wed Feb  4 16:48:40 2009//
    11 /G4OpenGLImmediateXViewer.hh/1.10/Wed Feb  4 16:48:40 2009//
    12 /G4OpenGLImmediateXm.hh/1.8/Wed Feb  4 16:48:40 2009//
    13 /G4OpenGLImmediateXmViewer.hh/1.10/Wed Feb  4 16:48:40 2009//
    14 /G4OpenGLQtExportDialog.hh/1.7/Wed Feb  4 16:48:40 2009//
    15 /G4OpenGLQtMovieDialog.hh/1.4/Tue Oct  7 05:36:11 2008//
    16 /G4OpenGLQtViewer.hh/1.25/Fri Oct  8 10:07:31 2010//
    17 /G4OpenGLSceneHandler.hh/1.30/Sun May 30 09:53:05 2010//
    18 /G4OpenGLSceneHandler.icc/1.9/Wed Feb  4 16:48:40 2009//
    19 /G4OpenGLStoredQt.hh/1.2/Wed Feb  4 16:48:40 2009//
    20 /G4OpenGLStoredQtViewer.hh/1.10/Wed Mar 10 11:03:46 2010//
    21 /G4OpenGLStoredSceneHandler.hh/1.30/Sat Nov  6 12:09:41 2010//
    22 /G4OpenGLStoredViewer.hh/1.10/Wed Feb  4 16:48:40 2009//
    23 /G4OpenGLStoredWin32.hh/1.8/Wed Feb  4 16:48:40 2009//
    24 /G4OpenGLStoredWin32Viewer.hh/1.8/Wed Feb  4 16:48:40 2009//
    25 /G4OpenGLStoredX.hh/1.8/Wed Feb  4 16:48:40 2009//
    26 /G4OpenGLStoredXViewer.hh/1.8/Wed Feb  4 16:48:40 2009//
    27 /G4OpenGLStoredXm.hh/1.7/Wed Feb  4 16:48:40 2009//
    28 /G4OpenGLStoredXmViewer.hh/1.8/Wed Feb  4 16:48:40 2009//
    29 /G4OpenGLTransform3D.hh/1.8/Wed Feb  4 16:48:41 2009//
    30 /G4OpenGLViewer.hh/1.33/Tue Oct  5 15:45:19 2010//
    31 /G4OpenGLViewerMessenger.hh/1.8/Fri Nov  5 06:25:23 2010//
    32 /G4OpenGLWin32Viewer.hh/1.15/Wed Feb  4 16:48:41 2009//
    33 /G4OpenGLXViewer.hh/1.32/Tue Apr 28 14:33:04 2009//
    34 /G4OpenGLXmBox.hh/1.8/Wed Feb  4 16:48:41 2009//
    35 /G4OpenGLXmFourArrowButtons.hh/1.7/Wed Feb  4 16:48:41 2009//
    36 /G4OpenGLXmFramedBox.hh/1.8/Wed Feb  4 16:48:41 2009//
    37 /G4OpenGLXmPushButton.hh/1.8/Wed Feb  4 16:48:41 2009//
    38 /G4OpenGLXmRadioButton.hh/1.8/Wed Feb  4 16:48:41 2009//
    39 /G4OpenGLXmResources.hh/1.6/Wed Feb  4 16:48:41 2009//
    40 /G4OpenGLXmSeparator.hh/1.7/Wed Feb  4 16:48:41 2009//
    41 /G4OpenGLXmSliderBar.hh/1.8/Wed Feb  4 16:48:41 2009//
    42 /G4OpenGLXmTextField.hh/1.8/Wed Feb  4 16:48:41 2009//
    43 /G4OpenGLXmTopLevelShell.hh/1.7/Wed Feb  4 16:48:41 2009//
    44 /G4OpenGLXmVWidgetComponent.hh/1.7/Wed Feb  4 16:48:41 2009//
    45 /G4OpenGLXmVWidgetContainer.hh/1.7/Wed Feb  4 16:48:41 2009//
    46 /G4OpenGLXmVWidgetObject.hh/1.7/Wed Feb  4 16:48:41 2009//
    47 /G4OpenGLXmVWidgetShell.hh/1.7/Wed Feb  4 16:48:41 2009//
    48 /G4OpenGLXmViewer.hh/1.11/Wed Feb  4 16:48:41 2009//
    49 /G4OpenGLXmViewerMessenger.hh/1.5/Wed Feb  4 16:48:41 2009//
     1/G4OpenGL.hh/1.9/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     2/G4OpenGLBitMapStore.hh/1.4/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     3/G4OpenGLFontBaseStore.hh/1.4/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     4/G4OpenGLImmediateQt.hh/1.2/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     5/G4OpenGLImmediateQtViewer.hh/1.7/Tue Dec  7 16:11:32 2010//Tgeant4-09-04-ref-00
     6/G4OpenGLImmediateSceneHandler.hh/1.15/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     7/G4OpenGLImmediateViewer.hh/1.10/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     8/G4OpenGLImmediateWin32.hh/1.8/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     9/G4OpenGLImmediateWin32Viewer.hh/1.10/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     10/G4OpenGLImmediateX.hh/1.8/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     11/G4OpenGLImmediateXViewer.hh/1.10/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     12/G4OpenGLImmediateXm.hh/1.8/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     13/G4OpenGLImmediateXmViewer.hh/1.10/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     14/G4OpenGLQtExportDialog.hh/1.7/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     15/G4OpenGLQtMovieDialog.hh/1.4/Tue Oct  7 05:36:11 2008//Tgeant4-09-04-ref-00
     16/G4OpenGLQtViewer.hh/1.25/Thu Nov 25 11:06:38 2010//Tgeant4-09-04-ref-00
     17/G4OpenGLSceneHandler.hh/1.30/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     18/G4OpenGLSceneHandler.icc/1.9/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     19/G4OpenGLStoredQt.hh/1.2/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     20/G4OpenGLStoredQtViewer.hh/1.10/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     21/G4OpenGLStoredSceneHandler.hh/1.32/Fri Nov 26 15:30:48 2010//Tgeant4-09-04-ref-00
     22/G4OpenGLStoredViewer.hh/1.10/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     23/G4OpenGLStoredWin32.hh/1.8/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     24/G4OpenGLStoredWin32Viewer.hh/1.8/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     25/G4OpenGLStoredX.hh/1.8/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     26/G4OpenGLStoredXViewer.hh/1.8/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     27/G4OpenGLStoredXm.hh/1.7/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     28/G4OpenGLStoredXmViewer.hh/1.8/Wed Feb  4 16:48:40 2009//Tgeant4-09-04-ref-00
     29/G4OpenGLTransform3D.hh/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     30/G4OpenGLViewer.hh/1.33/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     31/G4OpenGLViewerMessenger.hh/1.8/Fri Nov  5 06:25:23 2010//Tgeant4-09-04-ref-00
     32/G4OpenGLWin32Viewer.hh/1.15/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     33/G4OpenGLXViewer.hh/1.32/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     34/G4OpenGLXmBox.hh/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     35/G4OpenGLXmFourArrowButtons.hh/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     36/G4OpenGLXmFramedBox.hh/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     37/G4OpenGLXmPushButton.hh/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     38/G4OpenGLXmRadioButton.hh/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     39/G4OpenGLXmResources.hh/1.6/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     40/G4OpenGLXmSeparator.hh/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     41/G4OpenGLXmSliderBar.hh/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     42/G4OpenGLXmTextField.hh/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     43/G4OpenGLXmTopLevelShell.hh/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     44/G4OpenGLXmVWidgetComponent.hh/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     45/G4OpenGLXmVWidgetContainer.hh/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     46/G4OpenGLXmVWidgetObject.hh/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     47/G4OpenGLXmVWidgetShell.hh/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     48/G4OpenGLXmViewer.hh/1.11/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     49/G4OpenGLXmViewerMessenger.hh/1.5/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
    5050D

  • trunk/source/visualization/OpenGL/include/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/OpenGL/include/G4OpenGL.hh

    r1343 r1346  
    4040#endif
    4141
    42 #include <GL/gl.h>
    43 #include <GL/glu.h>
     42
     43#ifdef G4VIS_USE_OPENGLX
     44#  include <GL/gl.h>
     45#  include <GL/glu.h>
     46//# Do NOT include glx Here ! It has to be done, after all <Qxx...> includes
     47//#  include <GL/glx.h>
     48#else
     49#  ifdef __APPLE__ &&  G4VIS_USE_OPENGLQT
     50// Already done in Qt
     51//#    include <OpenGL/gl.h>
     52//#    include <OpenGL/glu.h>
     53#    include <qgl.h>
     54#  else
     55#    include <GL/gl.h>
     56#    include <GL/glu.h>
     57#  endif
     58#endif
    4459
    4560#define G4OPENGL_FLT_BIG 1.e20

  • trunk/source/visualization/OpenGL/include/G4OpenGLBitMapStore.hh

    r1343 r1346  
    4949
    5050#include "G4OpenGL.hh"
    51 #include <GL/gl.h>
    52 #include <GL/glu.h>
    5351
    5452namespace G4OpenGLBitMapStore {

  • trunk/source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh

    r1343 r1346  
    4242#include "G4VSceneHandler.hh"
    4343#include "G4OpenGLBitMapStore.hh"
    44 #include <GL/gl.h>
    45 #include <GL/glu.h>
     44#include "G4OpenGL.hh"
    4645
    4746#include <map>

  • trunk/source/visualization/OpenGL/include/G4OpenGLStoredQtViewer.hh

    r1343 r1346  
    3737#define G4OPENGLSTOREDQTVIEWER_HH
    3838
     39#include <qgl.h>
    3940#include "G4OpenGLStoredViewer.hh"
    4041#include "G4OpenGLQtViewer.hh"
    41 
    42 #include <qgl.h>  // include qglwidget
    4342
    4443class QMouseEvent;

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

    r1343 r1346  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredSceneHandler.hh,v 1.30 2010/11/06 12:09:41 allison Exp $
     27// $Id: G4OpenGLStoredSceneHandler.hh,v 1.32 2010/11/10 17:10:49 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    8383  static G4bool fMemoryForDisplayLists;  // avoid memory overflow
    8484  static G4int  fDisplayListLimit;       // avoid memory overflow
    85   static G4int  fDisplayListBase;        // avoid memory overflow
    8685  G4int fAddPrimitivePreambleNestingDepth;
    8786 
    8887  // PODL = Persistent Object Display List.
    8988  GLint  fTopPODL;                  // List which calls the other PODLs.
     89  // PO = Persistent Object, i.e., run-durantion object, e.g., geometry.
    9090  struct PO {
    9191    PO(G4int id, const G4Transform3D& tr = G4Transform3D());
    … …  
    9696  std::vector<PO> fPOList;
    9797 
    98   // TO = Transparent Object.
     98  // TO = Transient Object, e.g., trajectories.
    9999  struct TO {
    100100    TO(G4int id, const G4Transform3D& tr = G4Transform3D());

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

    r1340 r1346  
    7272  void rotateSceneInViewDirection (G4double dx, G4double dy,G4double delta);
    7373//////////////////////////////Vectored PostScript production functions///
     74  bool drawGl2psText(const char * textString, int size);
    7475  void printEPS();
    7576  // print EPS file. Depending of fVectoredPs, it will print Vectored or not

  • trunk/source/visualization/OpenGL/include/G4OpenGLXViewer.hh

    r1343 r1346  
    4343#include <X11/Intrinsic.h>
    4444
     45#include "G4OpenGL.hh"
    4546#include <GL/glx.h>
    4647
    … …  
    5758  void SetView ();
    5859  void ShowView ();
     60  void drawText(const char * ,int x,int y,int z, int size);
    5961
    6062protected:

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

    r1343 r1346  
    1 /G4OpenGLViewer.cc/1.63/Tue Oct  5 15:45:19 2010//
    2 /G4OpenGLBitMapStore.cc/1.5/Mon Jan 19 16:53:42 2009//
    3 /G4OpenGLFontBaseStore.cc/1.4/Mon Jan 19 16:53:42 2009//
    4 /G4OpenGLImmediateQt.cc/1.6/Wed Feb  4 16:48:41 2009//
    5 /G4OpenGLImmediateQtViewer.cc/1.22/Wed Jun 23 13:29:23 2010//
    6 /G4OpenGLImmediateSceneHandler.cc/1.35/Thu Jun  3 20:35:19 2010//
    7 /G4OpenGLImmediateViewer.cc/1.10/Wed Feb  4 16:48:41 2009//
    8 /G4OpenGLImmediateWin32.cc/1.13/Wed May 20 09:58:10 2009//
    9 /G4OpenGLImmediateWin32Viewer.cc/1.19/Wed May 20 10:19:51 2009//
    10 /G4OpenGLImmediateX.cc/1.15/Wed Feb  4 16:48:41 2009//
    11 /G4OpenGLImmediateXViewer.cc/1.19/Wed Feb  4 16:48:41 2009//
    12 /G4OpenGLImmediateXm.cc/1.15/Wed Feb  4 16:48:41 2009//
    13 /G4OpenGLImmediateXmViewer.cc/1.21/Wed Apr  8 16:55:44 2009//
    14 /G4OpenGLQtExportDialog.cc/1.9/Fri Oct 24 14:17:10 2008//
    15 /G4OpenGLQtMovieDialog.cc/1.8/Fri Oct 24 13:49:19 2008//
    16 /G4OpenGLQtViewer.cc/1.55/Fri Oct  8 10:07:31 2010//
    17 /G4OpenGLSceneHandler.cc/1.59/Sun May 30 09:53:05 2010//
    18 /G4OpenGLStoredQt.cc/1.10/Mon Jan 19 16:26:40 2009//
    19 /G4OpenGLStoredQtViewer.cc/1.32/Mon Nov  8 11:03:16 2010//
    20 /G4OpenGLStoredSceneHandler.cc/1.44/Sat Nov  6 12:09:41 2010//
    21 /G4OpenGLStoredViewer.cc/1.29/Wed Oct  6 10:05:52 2010//
    22 /G4OpenGLStoredWin32.cc/1.15/Mon Jan 19 16:53:42 2009//
    23 /G4OpenGLStoredWin32Viewer.cc/1.22/Wed May 20 13:19:09 2009//
    24 /G4OpenGLStoredX.cc/1.15/Mon Jan 19 16:53:42 2009//
    25 /G4OpenGLStoredXViewer.cc/1.27/Thu Jun  3 08:26:55 2010//
    26 /G4OpenGLStoredXm.cc/1.12/Mon Jan 19 16:53:42 2009//
    27 /G4OpenGLStoredXmViewer.cc/1.26/Fri Apr 30 13:18:32 2010//
    28 /G4OpenGLTransform3D.cc/1.9/Mon Jan 19 16:53:42 2009//
    29 /G4OpenGLViewerMessenger.cc/1.21/Sun Nov  7 10:31:26 2010//
    30 /G4OpenGLWin32Viewer.cc/1.20/Wed May 20 13:19:09 2009//
    31 /G4OpenGLXViewer.cc/1.55/Wed May 13 10:28:00 2009//
    32 /G4OpenGLXmBox.cc/1.8/Wed Feb  4 16:48:41 2009//
    33 /G4OpenGLXmConvenienceRoutines.cc/1.13/Wed Feb  4 16:48:41 2009//
    34 /G4OpenGLXmFourArrowButtons.cc/1.7/Wed Feb  4 16:48:41 2009//
    35 /G4OpenGLXmFramedBox.cc/1.8/Wed Feb  4 16:48:41 2009//
    36 /G4OpenGLXmMainMenubarCallbacks.cc/1.18/Tue Oct 20 12:47:45 2009//
    37 /G4OpenGLXmPanningCallbacks.cc/1.12/Tue Nov  3 10:21:49 2009//
    38 /G4OpenGLXmPushButton.cc/1.8/Wed Feb  4 16:48:41 2009//
    39 /G4OpenGLXmRadioButton.cc/1.8/Wed Feb  4 16:48:41 2009//
    40 /G4OpenGLXmRotationCallbacks.cc/1.17/Mon Jan 19 16:53:42 2009//
    41 /G4OpenGLXmSeparator.cc/1.7/Wed Feb  4 16:48:41 2009//
    42 /G4OpenGLXmSliderBar.cc/1.8/Mon Jan 19 16:53:42 2009//
    43 /G4OpenGLXmStyleCallbacks.cc/1.15/Mon Jan 19 16:53:42 2009//
    44 /G4OpenGLXmTextField.cc/1.9/Wed Feb  4 16:48:41 2009//
    45 /G4OpenGLXmTopLevelShell.cc/1.7/Wed Feb  4 16:48:41 2009//
    46 /G4OpenGLXmVWidgetComponent.cc/1.6/Mon Jan 19 16:53:42 2009//
    47 /G4OpenGLXmVWidgetContainer.cc/1.7/Fri Mar 13 09:50:03 2009//
    48 /G4OpenGLXmVWidgetObject.cc/1.7/Wed Feb  4 16:48:41 2009//
    49 /G4OpenGLXmVWidgetShell.cc/1.6/Mon Jan 19 16:53:42 2009//
    50 /G4OpenGLXmViewer.cc/1.31/Wed May 13 10:28:00 2009//
    51 /G4OpenGLXmViewerMessenger.cc/1.5/Mon Jan 19 16:53:42 2009//
    52 /G4OpenGLXmWindowHandlingCallbacks.cc/1.11/Mon Nov  8 11:03:16 2010//
     1/G4OpenGLBitMapStore.cc/1.5/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
     2/G4OpenGLFontBaseStore.cc/1.4/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
     3/G4OpenGLImmediateQt.cc/1.6/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     4/G4OpenGLImmediateQtViewer.cc/1.22/Wed Jun 23 13:29:23 2010//Tgeant4-09-04-ref-00
     5/G4OpenGLImmediateSceneHandler.cc/1.35/Thu Jun  3 20:35:19 2010//Tgeant4-09-04-ref-00
     6/G4OpenGLImmediateViewer.cc/1.10/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     7/G4OpenGLImmediateWin32.cc/1.13/Wed May 20 09:58:10 2009//Tgeant4-09-04-ref-00
     8/G4OpenGLImmediateWin32Viewer.cc/1.19/Wed May 20 10:19:51 2009//Tgeant4-09-04-ref-00
     9/G4OpenGLImmediateX.cc/1.15/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     10/G4OpenGLImmediateXViewer.cc/1.19/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     11/G4OpenGLImmediateXm.cc/1.15/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     12/G4OpenGLImmediateXmViewer.cc/1.21/Wed Apr  8 16:55:44 2009//Tgeant4-09-04-ref-00
     13/G4OpenGLQtExportDialog.cc/1.9/Fri Oct 24 14:17:10 2008//Tgeant4-09-04-ref-00
     14/G4OpenGLQtMovieDialog.cc/1.8/Fri Oct 24 13:49:19 2008//Tgeant4-09-04-ref-00
     15/G4OpenGLQtViewer.cc/1.55/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     16/G4OpenGLSceneHandler.cc/1.59/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     17/G4OpenGLStoredQt.cc/1.10/Mon Jan 19 16:26:40 2009//Tgeant4-09-04-ref-00
     18/G4OpenGLStoredQtViewer.cc/1.32/Mon Dec  6 16:50:27 2010//Tgeant4-09-04-ref-00
     19/G4OpenGLStoredSceneHandler.cc/1.46/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     20/G4OpenGLStoredViewer.cc/1.29/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     21/G4OpenGLStoredWin32.cc/1.15/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
     22/G4OpenGLStoredWin32Viewer.cc/1.22/Wed May 20 13:19:09 2009//Tgeant4-09-04-ref-00
     23/G4OpenGLStoredX.cc/1.15/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
     24/G4OpenGLStoredXViewer.cc/1.27/Thu Jun  3 08:26:55 2010//Tgeant4-09-04-ref-00
     25/G4OpenGLStoredXm.cc/1.12/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
     26/G4OpenGLStoredXmViewer.cc/1.26/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     27/G4OpenGLTransform3D.cc/1.9/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
     28/G4OpenGLViewer.cc/1.63/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     29/G4OpenGLViewerMessenger.cc/1.21/Sun Nov  7 10:31:26 2010//Tgeant4-09-04-ref-00
     30/G4OpenGLWin32Viewer.cc/1.20/Wed May 20 13:19:09 2009//Tgeant4-09-04-ref-00
     31/G4OpenGLXViewer.cc/1.56/Result of merge//Tgeant4-09-04-ref-00
     32/G4OpenGLXmBox.cc/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     33/G4OpenGLXmConvenienceRoutines.cc/1.13/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     34/G4OpenGLXmFourArrowButtons.cc/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     35/G4OpenGLXmFramedBox.cc/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     36/G4OpenGLXmMainMenubarCallbacks.cc/1.18/Tue Oct 20 12:47:45 2009//Tgeant4-09-04-ref-00
     37/G4OpenGLXmPanningCallbacks.cc/1.12/Tue Nov  3 10:21:49 2009//Tgeant4-09-04-ref-00
     38/G4OpenGLXmPushButton.cc/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     39/G4OpenGLXmRadioButton.cc/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     40/G4OpenGLXmRotationCallbacks.cc/1.17/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
     41/G4OpenGLXmSeparator.cc/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     42/G4OpenGLXmSliderBar.cc/1.8/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
     43/G4OpenGLXmStyleCallbacks.cc/1.15/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
     44/G4OpenGLXmTextField.cc/1.9/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     45/G4OpenGLXmTopLevelShell.cc/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
     46/G4OpenGLXmVWidgetComponent.cc/1.6/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
     47/G4OpenGLXmVWidgetContainer.cc/1.7/Fri Mar 13 09:50:03 2009//Tgeant4-09-04-ref-00
     48/G4OpenGLXmVWidgetObject.cc/1.7/Mon Dec  6 17:36:26 2010//Tgeant4-09-04-ref-00
     49/G4OpenGLXmVWidgetShell.cc/1.6/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
     50/G4OpenGLXmViewer.cc/1.31/Wed May 13 10:28:00 2009//Tgeant4-09-04-ref-00
     51/G4OpenGLXmViewerMessenger.cc/1.5/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
     52/G4OpenGLXmWindowHandlingCallbacks.cc/1.11/Wed May 13 10:28:00 2009//Tgeant4-09-04-ref-00
    5353D

  • trunk/source/visualization/OpenGL/src/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

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

    r1340 r1346  
    195195  if (!fContextMenu)
    196196    createPopupMenu();
     197
     198  //dummy call to init Text display list
     199  drawText("",0,0,0,10);
    197200
    198201}
    … …  
    274277
    275278
     279void G4OpenGLQtViewer::drawText(const char * textString,int x,int y,int z, int size) {
     280  if (!fWindow)
     281    return;
     282  QFont font = QFont();
     283  font.setPointSize(size);
     284
     285  // gl2ps or GL window ?
     286  int fontsize=font.pixelSize();
     287  if(font.pointSize() > fontsize) {
     288    fontsize = font.pointSize();
     289  }
     290#ifdef G4DEBUG_VIS_OGL
     291    printf("G4OpenGLQtViewer::drawText :: renderText.............. \n");
     292#endif
     293  if (! drawGl2psText(textString,fontsize)) {
     294    fWindow->renderText(x,y,z, textString,font);
     295  }
     296}
     297
     298
     299
    276300/**
    277301   Create a popup menu for the widget. This menu is activated by right-mouse click
    … …  
    14741498{
    14751499  glFlush ();
    1476 
    14771500  // L. Garnier 10/2009 : Not necessary and cause problems on mac OS X 10.6
    14781501  //  fWindow->swapBuffers ();
    … …  
    15171540    // try to addapt speed move/rotate looking to drawing speed
    15181541    float correctionFactor = 5;
     1542    float globalTime = 0;
     1543    float globalRun = 0;
    15191544    while (fAutoMove) {
    15201545      if ( lastMoveTime.elapsed () >= (int)(1000/fNbMaxFramesPerSec)) {
    … …  
    15521577          moveScene(-((float)delta.x())/correctionFactor,-((float)delta.y())/correctionFactor,0,true);
    15531578        }
     1579        //#ifdef G4DEBUG_VIS_OGL
     1580        globalTime += (float)lastMoveTime.elapsed ();
     1581        globalRun +=1;
     1582        printf("G4OpenGLQtViewer::CreateMainWindow :: time/per run :%f run:%f %f\n",globalTime/globalRun,globalRun,globalTime);
     1583        //#endif
    15541584        lastMoveTime.start();
    15551585      }

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

    r1343 r1346  
    4646#include "G4OpenGLSceneHandler.hh"
    4747#include "G4OpenGLViewer.hh"
    48 #include "G4OpenGLFontBaseStore.hh"
     48#include "G4OpenGLQtViewer.hh"
     49#include "G4OpenGLXViewer.hh"
    4950#include "G4OpenGLTransform3D.hh"
    5051#include "G4Point3D.hh"
    … …  
    268269  G4String textString = text.GetText();
    269270
    270   G4int font_base = G4OpenGLFontBaseStore::GetFontBase(fpViewer,size);
    271   if (font_base < 0) {
    272     static G4int callCount = 0;
    273     ++callCount;
    274     if (callCount <= 10 || callCount%100 == 0) {
    275       G4cout <<
    276         "G4OpenGLSceneHandler::AddPrimitive (const G4Text&) call count "
    277              << callCount <<
    278         "\n  No fonts available."
    279         "\n  Called with text \""
    280              << text.GetText ()
    281              << "\"\n  at " << position
    282              << ", size " << size
    283              << ", offsets " << text.GetXOffset () << ", " << text.GetYOffset ()
    284              << ", type " << G4int(sizeType)
    285              << ", colour " << c
    286              << G4endl;
    287     }
    288     return;
    289   }
    290271  const char* textCString = textString.c_str();
     272  GLfloat color[4]; /* Ask OpenGL for the current color */
     273  glGetFloatv(GL_CURRENT_COLOR, color);
    291274  glColor3d (c.GetRed (), c.GetGreen (), c.GetBlue ());
    292275  glDisable (GL_DEPTH_TEST);
    … …  
    294277 
    295278  glRasterPos3d(position.x(),position.y(),position.z());
    296   // No action on offset or layout at present.
    297    glPushAttrib(GL_LIST_BIT);
    298    glListBase(font_base);
    299    glCallLists(strlen(textCString), GL_UNSIGNED_BYTE, (GLubyte *)textCString);
    300    glPopAttrib();
     279  //FIXME : We should do a virtual method drawText in all viewers
     280  // Not the same way to draw text in Qt
     281#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
     282  G4OpenGLQtViewer* pQtViewer = dynamic_cast<G4OpenGLQtViewer*>(fpViewer);
     283  if (pQtViewer) {
     284    pQtViewer->drawText(textCString,position.x(),position.y(),position.z(),size);
     285  }
     286#endif
     287
     288  // nor for X
     289#ifdef G4VIS_BUILD_OPENGLX_DRIVER
     290  G4OpenGLXViewer* pXViewer = dynamic_cast<G4OpenGLXViewer*>(fpViewer);
     291  if (pXViewer) {
     292
     293    pXViewer->drawText(textCString,position.x(),position.y(),position.z(),size);
     294  }
     295#endif
     296  glColor3d (color[0], color[1], color[2]);
     297
    301298}
    302299

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

    r1343 r1346  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredSceneHandler.cc,v 1.44 2010/11/06 12:09:41 allison Exp $
     27// $Id: G4OpenGLStoredSceneHandler.cc,v 1.46 2010/11/10 17:11:20 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    105105  if (fMemoryForDisplayLists) {
    106106    fDisplayListId = glGenLists (1);
     107#ifdef G4DEBUG_VIS_OGL
     108    printf("G4OpenGLStoredSceneHandler::AddPrimitivePreamble ->glGenList(1) : %d readyForTranscient:%d\n",fDisplayListId,fReadyForTransients);
     109#endif
    107110    if (glGetError() == GL_OUT_OF_MEMORY ||
    108         fDisplayListId > fDisplayListLimit + fDisplayListBase) {
     111        fDisplayListId > fDisplayListLimit) {
    109112      G4cout <<
    110         "********************* WARNING! ********************"
    111         "\n  Display list limit reached in OpenGL."
    112         "\n  Continuing drawing in IMMEDIATE MODE."
    113         "\n  Current limit: "
    114              << fDisplayListLimit <<
    115         ".  Change with \"/vis/ogl/set/displayListLimit\"."
    116         "\n***************************************************"
     113  "********************* WARNING! ********************"
     114  "\n*  Display list limit reached in OpenGL."
     115  "\n*  Continuing drawing WITHOUT STORING. Scene only partially refreshable."
     116  "\n*  Current limit: " << fDisplayListLimit <<
     117  ".  Change with \"/vis/ogl/set/displayListLimit\"."
     118  "\n***************************************************"
    117119             << G4endl;
    118120      fMemoryForDisplayLists = false;
    … …  
    128130      to.fStartTime = pVA->GetStartTime();
    129131      to.fEndTime = pVA->GetEndTime();
     132#ifdef G4DEBUG_VIS_OGL
     133    printf("G4OpenGLStoredSceneHandler::AddPrimitivePreamble ->fTOList puch_back\n");
     134#endif
    130135      fTOList.push_back(to);
    131136      glDrawBuffer (GL_FRONT);
     137#ifdef G4DEBUG_VIS_OGL
     138    printf("+1\n");
     139#endif
    132140      glPushMatrix();
    133141      G4OpenGLTransform3D oglt (*fpObjectTransformation);
    … …  
    139147      PO po(fDisplayListId, *fpObjectTransformation);
    140148      po.fPickName = fPickName;
     149#ifdef G4DEBUG_VIS_OGL
     150    printf("G4OpenGLStoredSceneHandler::AddPrimitivePreamble ->fPOList puch_back\n");
     151#endif
    141152      fPOList.push_back(po);
    142153      glNewList (fDisplayListId, GL_COMPILE);
    … …  
    145156  } else {
    146157    glDrawBuffer (GL_FRONT);
     158#ifdef G4DEBUG_VIS_OGL
     159    printf("+2\n");
     160#endif
    147161    glPushMatrix();
    148162    G4OpenGLTransform3D oglt (*fpObjectTransformation);
    … …  
    155169    // coordinates...
    156170    glMatrixMode (GL_PROJECTION);
     171#ifdef G4DEBUG_VIS_OGL
     172    printf("+3\n");
     173#endif
    157174    glPushMatrix();
    158175    glLoadIdentity();
    159176    glOrtho (-1., 1., -1., 1., -G4OPENGL_FLT_BIG, G4OPENGL_FLT_BIG);
    160177    glMatrixMode (GL_MODELVIEW);
     178#ifdef G4DEBUG_VIS_OGL
     179    printf("+4\n");
     180#endif
    161181    glPushMatrix();
    162182    glLoadIdentity();
    … …  
    172192    // Pop current 3D world matrices back again...
    173193    glMatrixMode (GL_PROJECTION);
     194#ifdef G4DEBUG_VIS_OGL
     195    printf("-1\n");
     196#endif
    174197    glPopMatrix();
    175198    glMatrixMode (GL_MODELVIEW);
     199#ifdef G4DEBUG_VIS_OGL
     200    printf("-2\n");
     201#endif
    176202    glPopMatrix();
    177203  }
    … …  
    194220  }
    195221  if (fReadyForTransients || !fMemoryForDisplayLists) {
     222#ifdef G4DEBUG_VIS_OGL
     223    printf("-3\n");
     224#endif
    196225    glPopMatrix();
    197226    glFlush ();
    … …  
    203232void G4OpenGLStoredSceneHandler::AddPrimitive (const G4Polyline& polyline)
    204233{
     234#ifdef G4DEBUG_VIS_OGL
     235    printf("G4OpenGLStoredSceneHandler::AddPrimitive polyline\n");
     236    //    if (glIsList(7)) return;
     237#endif
    205238  AddPrimitivePreamble(polyline);
    206239  G4OpenGLSceneHandler::AddPrimitive(polyline);
    … …  
    210243void G4OpenGLStoredSceneHandler::AddPrimitive (const G4Polymarker& polymarker)
    211244{
     245#ifdef G4DEBUG_VIS_OGL
     246    printf("G4OpenGLStoredSceneHandler::AddPrimitive polymarker\n");
     247    if (glIsList(7)) return;
     248#endif
    212249  AddPrimitivePreamble(polymarker);
    213250  G4OpenGLSceneHandler::AddPrimitive(polymarker);
    … …  
    220257  // G4OpenGLSceneHandler::AddPrimitive(const G4Text&), so it still
    221258  // gets into the display list
     259#ifdef G4DEBUG_VIS_OGL
     260    printf("G4OpenGLStoredSceneHandler::AddPrimitive Text\n");
     261#endif
    222262  AddPrimitivePreamble(text);
    223263  G4OpenGLSceneHandler::AddPrimitive(text);
    … …  
    227267void G4OpenGLStoredSceneHandler::AddPrimitive (const G4Circle& circle)
    228268{
     269#ifdef G4DEBUG_VIS_OGL
     270    printf("G4OpenGLStoredSceneHandler::AddPrimitive circle\n");
     271#endif
    229272  AddPrimitivePreamble(circle);
    230273  G4OpenGLSceneHandler::AddPrimitive(circle);
    … …  
    234277void G4OpenGLStoredSceneHandler::AddPrimitive (const G4Square& square)
    235278{
     279#ifdef G4DEBUG_VIS_OGL
     280    printf("G4OpenGLStoredSceneHandler::AddPrimitive square\n");
     281#endif
    236282  AddPrimitivePreamble(square);
    237283  G4OpenGLSceneHandler::AddPrimitive(square);
    … …  
    250296  // G4OpenGLSceneHandler::AddPrimitive(const G4Polyhedron&), so it still
    251297  // gets into the display list
     298#ifdef G4DEBUG_VIS_OGL
     299    printf("G4OpenGLStoredSceneHandler::AddPrimitive polyhedron\n");
     300#endif
    252301  AddPrimitivePreamble(polyhedron);
    253302  G4OpenGLSceneHandler::AddPrimitive(polyhedron);
    … …  
    260309  // G4OpenGLSceneHandler::AddPrimitive(const G4NURBS&), so it still
    261310  // gets into the display list
     311#ifdef G4DEBUG_VIS_OGL
     312    printf("G4OpenGLStoredSceneHandler::AddPrimitive nurbs\n");
     313#endif
    262314  AddPrimitivePreamble(nurbs);
    263315  G4OpenGLSceneHandler::AddPrimitive(nurbs);
    … …  
    301353  // Make a List which calls the other lists.
    302354  fTopPODL = glGenLists (1);
     355#ifdef G4DEBUG_VIS_OGL
     356    printf("G4OpenGLStoredSceneHandler::EndModeling ->glGenList(1) fTopPODL:%d\n",fTopPODL);
     357#endif
    303358  if (glGetError() == GL_OUT_OF_MEMORY) {  // Could pre-allocate?
    304359    G4cout <<
    … …  
    309364    glNewList (fTopPODL, GL_COMPILE_AND_EXECUTE); {
    310365      for (size_t i = 0; i < fPOList.size (); i++) {
     366#ifdef G4DEBUG_VIS_OGL
     367    printf("+5\n");
     368#endif
    311369        glPushMatrix();
    312370        G4OpenGLTransform3D oglt (fPOList[i].fTransform);
    … …  
    315373          glLoadName(fPOList[i].fPickName);
    316374        glCallList (fPOList[i].fDisplayListId);
     375#ifdef G4DEBUG_VIS_OGL
     376    printf("-4\n");
     377#endif
    317378        glPopMatrix();
    318379      }
    … …  
    337398void G4OpenGLStoredSceneHandler::ClearStore () {
    338399
     400  //G4cout << "G4OpenGLStoredSceneHandler::ClearStore" << G4endl;
     401
    339402  G4VSceneHandler::ClearStore ();  // Sets need kernel visit, etc.
    340403
    … …  
    355418  fTOList.clear ();
    356419
    357   fDisplayListBase = fDisplayListId;
    358420  fMemoryForDisplayLists = true;
    359 
    360421}
    361422
    362423void G4OpenGLStoredSceneHandler::ClearTransientStore () {
     424
     425  //G4cout << "G4OpenGLStoredSceneHandler::ClearTransientStore" << G4endl;
    363426
    364427  G4VSceneHandler::ClearTransientStore ();
    … …  
    369432  fTOList.clear ();
    370433
    371   fDisplayListBase = fDisplayListId;
    372434  fMemoryForDisplayLists = true;
    373435
    … …  
    476538G4bool G4OpenGLStoredSceneHandler::fMemoryForDisplayLists = true;
    477539G4int  G4OpenGLStoredSceneHandler::fDisplayListLimit = 50000;
    478 G4int  G4OpenGLStoredSceneHandler::fDisplayListBase = 0;
    479 
    480 #endif
     540
     541#endif

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

    r1340 r1346  
    155155    }
    156156
    157     if (fG4OpenGLStoredSceneHandler.fTopPODL)
     157    if (fG4OpenGLStoredSceneHandler.fTopPODL) {
    158158      glCallList (fG4OpenGLStoredSceneHandler.fTopPODL);
    159 
     159#ifdef G4DEBUG_VIS_OGL
     160      printf("fTopPODL :%d\n",fG4OpenGLStoredSceneHandler.fTopPODL);
     161#endif
     162    }
     163#ifdef G4DEBUG_VIS_OGL
     164    printf("TOList :");
     165#endif
    160166    for (size_t i = 0; i < fG4OpenGLStoredSceneHandler.fTOList.size(); ++i) {
    161167#ifdef G4DEBUG_VIS_OGL
    … …  
    180186           bsf * c.GetBlue() + (1. - bsf) * bg.GetBlue());
    181187        glCallList (to.fDisplayListId);
     188#ifdef G4DEBUG_VIS_OGL
     189        printf("%d ",to.fDisplayListId);
     190#endif
    182191        glPopMatrix();
    183192      }

  • trunk/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc

    r1343 r1346  
    6666  CreateGLXContext (vi_stored);
    6767  CreateMainWindow ();
    68   CreateFontLists ();
     68  //  CreateFontLists ();
    6969
    7070  InitializeGLView ();

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

    r1340 r1346  
    388388  DrawView();
    389389  GLint hits = glRenderMode(GL_RENDER);
     390#ifdef G4DEBUG_VIS_OGL
     391  printf("G4OpenGLViewer::Pick °_°_°_°_°_°_°_°_°_°_°_°_°_°_°_°_°_°_°_°_\n");
     392#endif
    390393  if (hits < 0)
    391394    G4cout << "Too many hits.  Zoom in to reduce overlaps." << G4endl;
    … …  
    619622
    620623
     624/* Draw Gl2Ps text if needed
     625   return true if it is draw
     626 */
     627bool G4OpenGLViewer::drawGl2psText(const char * textString, int size) {
     628
     629  if (!fGL2PSAction) return false;
     630  if (fGL2PSAction->fileWritingEnabled()) {
     631    gl2psText(textString,"Times-Roman",size);
     632    return true;
     633  }
     634  return false;
     635}
     636
     637
    621638bool G4OpenGLViewer::printGl2PS() {
    622639
    … …  
    646663  // http://www.songho.ca/opengl/gl_fbo.html
    647664
     665  NeedKernelVisit ();
    648666  ResizeGLView();
    649667  if (fGL2PSAction->enableFileWriting()) {

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

    r1343 r1346  
    2525//
    2626//
    27 // $Id: G4OpenGLXViewer.cc,v 1.55 2009/05/13 10:28:00 lgarnier Exp $
     27// $Id: G4OpenGLXViewer.cc,v 1.56 2010/11/10 17:57:16 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    3838#include "G4VViewer.hh"
    3939#include "G4OpenGLSceneHandler.hh"
    40 #include <GL/glu.h>
    4140
    4241#include "G4OpenGLFontBaseStore.hh"
    … …  
    5049#include "G4Normal3D.hh"
    5150#include "G4StateManager.hh"
     51#include "G4VisManager.hh"
    5252
    5353#include <X11/Xatom.h>
    … …  
    197197    if (!cmap) {
    198198      fViewId = -1;  // This flags an error.
    199       G4cerr <<
    200    "G4OpenGLViewer::G4OpenGLViewer failed to allocate a standard colormap."
    201              << G4endl;
     199      if (G4VisManager::GetVerbosity() >= G4VisManager::errors)
     200        G4cerr <<
     201  "G4OpenGLViewer::G4OpenGLViewer failed to allocate a standard colormap."
     202               << G4endl;
    202203      return;
    203204    }
    204     G4cout << "Got standard cmap" << G4endl;
     205    if (G4VisManager::GetVerbosity() >= G4VisManager::confirmations)
     206      G4cout << "Got standard cmap" << G4endl;
    205207  } else {
    206208    cmap = XCreateColormap (dpy,
    … …  
    208210                            vi -> visual,
    209211                            AllocNone);
    210     G4cout << "Created own cmap" << G4endl;
     212    if (G4VisManager::GetVerbosity() >= G4VisManager::confirmations)
     213      G4cout << "Created own cmap" << G4endl;
    211214  }
    212215
    213216  if (!cmap) {
    214217    fViewId = -1;  // This flags an error.
    215     G4cerr << "G4OpenGLViewer::G4OpenGLViewer failed to allocate a Colormap."
    216          << G4endl;
     218    if (G4VisManager::GetVerbosity() >= G4VisManager::errors)
     219      G4cout << "G4OpenGLViewer::G4OpenGLViewer failed to allocate a Colormap."
     220             << G4endl;
    217221    return;
    218222  }
    … …  
    250254    size_hints->flags |= PPosition;
    251255  }
    252   G4cout << "Window name: " << fName << G4endl;
     256  if (G4VisManager::GetVerbosity() >= G4VisManager::confirmations)
     257    G4cout << "Window name: " << fName << G4endl;
    253258  strncpy (charViewName, fName, 100);
    254259  char *window_name = charViewName;
    … …  
    337342}
    338343
     344void G4OpenGLXViewer::drawText(const char * textString,int x,int y,int z, int size){
     345 
     346  CreateFontLists ();
     347  // gl2ps or GL window ?
     348  if (! drawGl2psText(textString,size)) {
     349
     350    G4int font_base = G4OpenGLFontBaseStore::GetFontBase(this,size);
     351    if (font_base < 0) {
     352      static G4int callCount = 0;
     353      ++callCount;
     354      if (callCount <= 10 || callCount%100 == 0) {
     355        G4cout <<
     356          "G4OpenGLSceneHandler::AddPrimitive (const G4Text&) call count "
     357               << callCount <<
     358          "\n  No fonts available."
     359          "\n  Called with text \""
     360               << textString
     361               << "\"\n  at "
     362               << "x:"<< x
     363               << "y:"<< y
     364               << "z:"<< z
     365               << ", size " << size
     366          //               << ", offsets " << text.GetXOffset () << ", " << text.GetYOffset ()
     367               << G4endl;
     368      }
     369      return;
     370    }
     371    // No action on offset or layout at present.
     372    glPushAttrib(GL_LIST_BIT);
     373    glListBase(font_base);
     374    glCallLists(strlen(textString), GL_UNSIGNED_BYTE, (GLubyte *)textString);
     375    glPopAttrib();
     376  }
     377}
     378
     379
    339380G4OpenGLXViewer::G4OpenGLXViewer (G4OpenGLSceneHandler& scene):
    340381G4VViewer (scene, -1),

  • trunk/source/visualization/OpenInventor/CVS/Entries

    r1340 r1346  
    11D/include////
    22D/src////
    3 /CMakeLists.txt/1.1/Wed Sep 29 19:12:22 2010//
    4 /GNUmakefile/1.10/Thu Sep 30 06:17:09 2010//
    5 /sources.cmake/1.1/Wed Sep 29 19:12:30 2010//
    6 /History/1.107/Wed Oct  6 15:53:50 2010//
     3/CMakeLists.txt/1.1/Wed Sep 29 19:12:22 2010//Tgeant4-09-04-ref-00
     4/sources.cmake/1.1/Wed Sep 29 19:12:30 2010//Tgeant4-09-04-ref-00

  • trunk/source/visualization/OpenInventor/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/OpenInventor/include/CVS/Entries

    r1337 r1346  
    11D/HEPVis////
    2 /G4OpenInventor.hh/1.9/Thu Sep 30 06:17:09 2010//
    3 /G4OpenInventorSceneHandler.hh/1.33/Thu Sep 30 06:17:09 2010//
    4 /G4OpenInventorTransform3D.hh/1.7/Thu Sep 30 06:17:09 2010//
    5 /G4OpenInventorViewer.hh/1.27/Thu Sep 30 06:17:09 2010//
    6 /G4OpenInventorWin.hh/1.3/Thu Sep 30 06:17:09 2010//
    7 /G4OpenInventorWin32.hh/1.7/Thu Sep 30 06:17:09 2010//
    8 /G4OpenInventorWinViewer.hh/1.10/Thu Sep 30 06:17:09 2010//
    9 /G4OpenInventorX.hh/1.7/Thu Sep 30 06:17:09 2010//
    10 /G4OpenInventorXt.hh/1.3/Thu Sep 30 06:17:09 2010//
    11 /G4OpenInventorXtViewer.hh/1.15/Thu Sep 30 06:17:09 2010//
    12 /Geant4_SoPolyhedron.h/1.6/Mon Jul 12 14:53:12 2010//
    13 /SoG4LineSet.h/1.2/Mon Jul 12 14:53:12 2010//
    14 /SoG4MarkerSet.h/1.2/Mon Jul 12 14:53:12 2010//
    15 /SoG4Polyhedron.h/1.3/Mon Jul 12 14:53:12 2010//

  • trunk/source/visualization/OpenInventor/include/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/OpenInventor/include/HEPVis/CVS/Entries

    r1337 r1346  
    33D/nodekits////
    44D/nodes////
    5 /SbGL.h/1.3/Mon Jul 12 14:53:12 2010//
    6 /SbMath.h/1.4/Mon Jul 12 14:53:12 2010//
    7 /SbPainter.h/1.3/Mon Jul 12 14:53:12 2010//
    8 /SbPainterPS.h/1.3/Mon Jul 12 14:53:12 2010//

  • trunk/source/visualization/OpenInventor/include/HEPVis/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/OpenInventor/include/HEPVis/actions/CVS/Entries

    r1337 r1346  
    1 /SoAlternateRepAction.h/1.3/Mon Jul 12 14:53:12 2010//
    2 /SoCounterAction.h/1.5/Mon Jul 12 14:53:12 2010//
    3 /SoGL2PSAction.h/1.7/Mon Jul 12 14:53:12 2010//
    41D

  • trunk/source/visualization/OpenInventor/include/HEPVis/actions/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/OpenInventor/include/HEPVis/misc/CVS/Entries

    r1337 r1346  
    1 /SoStyleCache.h/1.6/Mon Jul 12 14:53:12 2010//
    21D

  • trunk/source/visualization/OpenInventor/include/HEPVis/misc/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/OpenInventor/include/HEPVis/nodekits/CVS/Entries

    r1337 r1346  
    1 /SoDetectorTreeKit.h/1.5/Mon Jul 12 14:53:12 2010//
    21D

  • trunk/source/visualization/OpenInventor/include/HEPVis/nodekits/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/OpenInventor/include/HEPVis/nodes/CVS/Entries

    r1337 r1346  
    1 /SoBox.h/1.3/Mon Jul 12 14:53:12 2010//
    2 /SoCons.h/1.3/Mon Jul 12 14:53:12 2010//
    3 /SoImageWriter.h/1.3/Mon Jul 12 14:53:12 2010//
    4 /SoMarkerSet.h/1.3/Mon Jul 12 14:53:12 2010//
    5 /SoTrap.h/1.4/Mon Jul 12 14:53:12 2010//
    6 /SoTrd.h/1.3/Mon Jul 12 14:53:12 2010//
    7 /SoTubs.h/1.3/Mon Jul 12 14:53:12 2010//
    81D

  • trunk/source/visualization/OpenInventor/include/HEPVis/nodes/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

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

    r1340 r1346  
    1 /G4OpenInventor.cc/1.20/Thu Sep 30 06:17:10 2010//
    2 /G4OpenInventorSceneHandler.cc/1.55/Thu Sep 30 06:17:10 2010//
    3 /G4OpenInventorTransform3D.cc/1.8/Thu Sep 30 06:17:10 2010//
    4 /G4OpenInventorWin.cc/1.8/Thu Sep 30 06:17:10 2010//
    5 /G4OpenInventorWinViewer.cc/1.26/Thu Sep 30 06:17:10 2010//
    6 /G4OpenInventorXt.cc/1.5/Thu Sep 30 06:17:10 2010//
    7 /G4OpenInventorXtViewer.cc/1.25/Thu Sep 30 06:17:10 2010//
    8 /SbPainter.cc/1.5/Thu Sep 30 06:17:11 2010//
    9 /SbPainterPS.cc/1.5/Thu Sep 30 06:17:11 2010//
    10 /SoAlternateRepAction.cc/1.4/Thu Sep 30 06:17:11 2010//
    11 /SoBox.cc/1.8/Thu Sep 30 06:17:11 2010//
    12 /SoCons.cc/1.8/Thu Sep 30 06:17:11 2010//
    13 /SoCounterAction.cc/1.7/Thu Sep 30 06:17:11 2010//
    14 /SoDetectorTreeKit.cc/1.13/Thu Sep 30 06:17:11 2010//
    15 /SoGL2PSAction.cc/1.9/Thu Sep 30 06:17:11 2010//
    16 /SoImageWriter.cc/1.5/Thu Sep 30 06:17:12 2010//
    17 /SoMarkerSet.cc/1.8/Thu Sep 30 06:17:12 2010//
    18 /SoPolyhedron.cc/1.13/Thu Sep 30 06:17:12 2010//
    19 /SoStyleCache.cc/1.7/Thu Sep 30 06:17:12 2010//
    20 /SoTrap.cc/1.8/Thu Sep 30 06:17:12 2010//
    21 /SoTrd.cc/1.8/Thu Sep 30 06:17:12 2010//
    22 /SoTubs.cc/1.8/Thu Sep 30 06:17:12 2010//
    23 /G4OpenInventorViewer.cc/1.61/Wed Oct  6 15:53:54 2010//
    241D

  • trunk/source/visualization/OpenInventor/src/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/RayTracer/CVS/Entries

    r1337 r1346  
    11D/include////
    22D/src////
    3 /CMakeLists.txt/1.1/Wed Sep 29 19:12:38 2010//
    4 /GNUmakefile/1.11/Thu Sep 30 06:17:13 2010//
    5 /History/1.64/Thu Sep 30 06:17:13 2010//
    6 /README/1.1/Mon Jul 12 14:53:14 2010//
    7 /sources.cmake/1.1/Wed Sep 29 19:12:47 2010//
     3/CMakeLists.txt/1.1/Wed Sep 29 19:12:38 2010//Tgeant4-09-04-ref-00
     4/sources.cmake/1.1/Wed Sep 29 19:12:47 2010//Tgeant4-09-04-ref-00

  • trunk/source/visualization/RayTracer/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/RayTracer/GNUmakefile

    r834 r1346  
    1717include $(G4INSTALL)/config/G4VIS_BUILD.gmk
    1818include $(G4INSTALL)/config/interactivity.gmk
     19
     20# NO need OGL, then reset OGLGLAGS
     21OGLFLAGS = ""
     22OGLLIBS  = ""
     23# NO need QT, then reset QTGLAGS
     24QTFLAGS = ""
     25QTLIBS  = ""
     26GLQTLIBS  = ""
    1927
    2028CPPFLAGS += -DG4VIS_ALLOC_EXPORT

  • trunk/source/visualization/RayTracer/include/CVS/Entries

    r1337 r1346  
    1 /G4RTJpeg.hh/1.6/Thu Sep 30 06:17:13 2010//
    2 /G4RTJpegCoder.hh/1.6/Thu Sep 30 06:17:13 2010//
    3 /G4RTJpegCoderTables.hh/1.6/Thu Sep 30 06:17:13 2010//
    4 /G4RTJpegMaker.hh/1.6/Thu Sep 30 06:17:13 2010//
    5 /G4RTMessenger.hh/1.7/Thu Sep 30 06:17:13 2010//
    6 /G4RTOutBitStream.hh/1.7/Thu Sep 30 06:17:13 2010//
    7 /G4RTSimpleScanner.hh/1.4/Thu Sep 30 06:17:13 2010//
    8 /G4RTSteppingAction.hh/1.5/Thu Sep 30 06:17:13 2010//
    9 /G4RTTrackingAction.hh/1.6/Thu Sep 30 06:17:13 2010//
    10 /G4RTXScanner.hh/1.5/Thu Sep 30 06:17:13 2010//
    11 /G4RayTracer.hh/1.12/Thu Sep 30 06:17:13 2010//
    12 /G4RayTracerFeatures.hh/1.4/Thu Sep 30 06:17:13 2010//
    13 /G4RayTracerSceneHandler.hh/1.13/Thu Sep 30 06:17:13 2010//
    14 /G4RayTracerViewer.hh/1.7/Thu Sep 30 06:17:14 2010//
    15 /G4RayTracerX.hh/1.4/Thu Sep 30 06:17:14 2010//
    16 /G4RayTracerXViewer.hh/1.5/Thu Sep 30 06:17:14 2010//
    17 /G4RayTrajectory.hh/1.16/Thu Sep 30 06:17:14 2010//
    18 /G4RayTrajectoryPoint.hh/1.9/Thu Sep 30 06:17:14 2010//
    19 /G4TheRayTracer.hh/1.3/Thu Sep 30 06:17:14 2010//
    20 /G4VFigureFileMaker.hh/1.5/Thu Sep 30 06:17:14 2010//
    21 /G4VRTScanner.hh/1.6/Thu Sep 30 06:17:14 2010//
    221D

  • trunk/source/visualization/RayTracer/include/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/RayTracer/src/CVS/Entries

    r1337 r1346  
    1 /G4RTJpegCoder.cc/1.6/Thu Sep 30 06:17:15 2010//
    2 /G4RTJpegMaker.cc/1.10/Thu Sep 30 06:17:15 2010//
    3 /G4RTMessenger.cc/1.10/Thu Sep 30 06:17:15 2010//
    4 /G4RTOutBitStream.cc/1.6/Thu Sep 30 06:17:15 2010//
    5 /G4RTSimpleScanner.cc/1.5/Thu Sep 30 06:17:15 2010//
    6 /G4RTSteppingAction.cc/1.7/Thu Sep 30 06:17:15 2010//
    7 /G4RTTrackingAction.cc/1.5/Thu Sep 30 06:17:16 2010//
    8 /G4RTXScanner.cc/1.8/Thu Sep 30 06:17:16 2010//
    9 /G4RayTracer.cc/1.22/Thu Sep 30 06:17:16 2010//
    10 /G4RayTracerSceneHandler.cc/1.10/Thu Sep 30 06:17:16 2010//
    11 /G4RayTracerViewer.cc/1.18/Thu Sep 30 06:17:16 2010//
    12 /G4RayTracerX.cc/1.5/Thu Sep 30 06:17:16 2010//
    13 /G4RayTracerXViewer.cc/1.8/Thu Sep 30 06:17:16 2010//
    14 /G4RayTrajectory.cc/1.15/Thu Sep 30 06:17:17 2010//
    15 /G4RayTrajectoryPoint.cc/1.6/Thu Sep 30 06:17:17 2010//
    16 /G4TheRayTracer.cc/1.3/Thu Sep 30 06:17:17 2010//
    17 /G4VRTScanner.cc/1.1/Thu Sep 30 06:17:17 2010//
    181D

  • trunk/source/visualization/RayTracer/src/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/Tree/CVS/Entries

    r1337 r1346  
    11D/include////
    22D/src////
    3 /CMakeLists.txt/1.1/Wed Sep 29 19:12:55 2010//
    4 /GNUmakefile/1.6/Thu Sep 30 06:17:17 2010//
    5 /History/1.30/Thu Sep 30 06:17:17 2010//
    6 /sources.cmake/1.1/Wed Sep 29 19:13:03 2010//
     3/CMakeLists.txt/1.1/Wed Sep 29 19:12:55 2010//Tgeant4-09-04-ref-00
     4/sources.cmake/1.1/Wed Sep 29 19:13:03 2010//Tgeant4-09-04-ref-00

  • trunk/source/visualization/Tree/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/Tree/include/CVS/Entries

    r1337 r1346  
    1 /G4ASCIITree.hh/1.7/Thu Sep 30 06:17:17 2010//
    2 /G4ASCIITreeMessenger.hh/1.7/Thu Sep 30 06:17:17 2010//
    3 /G4ASCIITreeSceneHandler.hh/1.17/Thu Sep 30 06:17:17 2010//
    4 /G4ASCIITreeViewer.hh/1.5/Thu Sep 30 06:17:17 2010//
    5 /G4VTree.hh/1.5/Thu Sep 30 06:17:17 2010//
    6 /G4VTreeSceneHandler.hh/1.18/Thu Sep 30 06:17:17 2010//
    7 /G4VTreeSceneHandler.icc/1.8/Thu Sep 30 06:17:17 2010//
    8 /G4VTreeViewer.hh/1.5/Thu Sep 30 06:17:17 2010//
    91D

  • trunk/source/visualization/Tree/include/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/Tree/src/CVS/Entries

    r1337 r1346  
    1 /G4ASCIITree.cc/1.12/Thu Sep 30 06:17:17 2010//
    2 /G4ASCIITreeMessenger.cc/1.19/Thu Sep 30 06:17:17 2010//
    3 /G4ASCIITreeSceneHandler.cc/1.34/Thu Sep 30 06:17:18 2010//
    4 /G4ASCIITreeViewer.cc/1.8/Thu Sep 30 06:17:18 2010//
    5 /G4VTree.cc/1.5/Thu Sep 30 06:17:18 2010//
    6 /G4VTreeSceneHandler.cc/1.14/Thu Sep 30 06:17:18 2010//
    7 /G4VTreeViewer.cc/1.7/Thu Sep 30 06:17:18 2010//
    81D

  • trunk/source/visualization/Tree/src/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/VRML/CVS/Entries

    r1337 r1346  
    22D/include////
    33D/src////
    4 /CMakeLists.txt/1.1/Wed Sep 29 19:13:11 2010//
    5 /GNUmakefile/1.8/Thu Sep 30 06:17:18 2010//
    6 /History/1.19/Thu Sep 30 06:17:18 2010//
    7 /sources.cmake/1.1/Wed Sep 29 19:13:19 2010//
     4/CMakeLists.txt/1.1/Wed Sep 29 19:13:11 2010//Tgeant4-09-04-ref-00
     5/sources.cmake/1.2/Wed Dec 22 10:23:43 2010//Tgeant4-09-04-ref-00

  • trunk/source/visualization/VRML/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/VRML/GNUmakefile

    r1140 r1346  
    1717include $(G4INSTALL)/config/architecture.gmk
    1818include $(G4INSTALL)/config/G4VIS_BUILD.gmk
     19
     20# NO need OGL, then reset OGLGLAGS
     21OGLFLAGS = ""
     22OGLLIBS  = ""
     23# NO need QT, then reset QTGLAGS
     24QTFLAGS = ""
     25QTLIBS  = ""
     26GLQTLIBS  = ""
     27
    1928include $(G4INSTALL)/config/interactivity.gmk
    2029

  • trunk/source/visualization/VRML/g4vrmlview/CVS/Entries

    r1337 r1346  
    1 /Makefile/1.1/Mon Jul 12 14:53:09 2010//
    2 /README/1.1/Mon Jul 12 14:53:09 2010//
    3 /g4mini.java/1.4/Mon Jul 12 14:53:09 2010//
    4 /g4vrmlview.java/1.4/Mon Jul 12 14:53:09 2010//
    5 /sample.wrl/1.1/Mon Jul 12 14:53:09 2010//
    61D

  • trunk/source/visualization/VRML/g4vrmlview/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/VRML/include/CVS/Entries

    r1337 r1346  
    1 /FRClient.h/1.6/Mon Jul 12 14:53:09 2010//
    2 /G4FRClient.hh/1.8/Thu Sep 30 06:17:18 2010//
    3 /G4VRML1.hh/1.10/Thu Sep 30 06:17:18 2010//
    4 /G4VRML1File.hh/1.10/Thu Sep 30 06:17:18 2010//
    5 /G4VRML1FileSceneHandler.hh/1.19/Thu Sep 30 06:17:18 2010//
    6 /G4VRML1FileViewer.hh/1.8/Thu Sep 30 06:17:18 2010//
    7 /G4VRML1SceneHandler.hh/1.16/Thu Sep 30 06:17:18 2010//
    8 /G4VRML1Viewer.hh/1.8/Thu Sep 30 06:17:18 2010//
    9 /G4VRML2.hh/1.10/Thu Sep 30 06:17:18 2010//
    10 /G4VRML2File.hh/1.11/Thu Sep 30 06:17:18 2010//
    11 /G4VRML2FileSceneHandler.hh/1.18/Thu Sep 30 06:17:19 2010//
    12 /G4VRML2FileViewer.hh/1.10/Thu Sep 30 06:17:19 2010//
    13 /G4VRML2SceneHandler.hh/1.15/Thu Sep 30 06:17:19 2010//
    14 /G4VRML2Viewer.hh/1.8/Thu Sep 30 06:17:19 2010//
    15 /G4VRMLNetConfig.hh/1.7/Thu Sep 30 06:17:19 2010//
    161D

  • trunk/source/visualization/VRML/include/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/VRML/src/CVS/Entries

    r1337 r1346  
    1 /FRClient.cc/1.7/Thu Sep 30 06:17:19 2010//
    2 /G4FRClient.cc/1.8/Thu Sep 30 06:17:19 2010//
    3 /G4VRML1.cc/1.10/Thu Sep 30 06:17:19 2010//
    4 /G4VRML1File.cc/1.10/Thu Sep 30 06:17:19 2010//
    5 /G4VRML1FileSceneHandler.cc/1.12/Thu Sep 30 06:17:19 2010//
    6 /G4VRML1FileViewer.cc/1.11/Thu Sep 30 06:17:19 2010//
    7 /G4VRML1SceneHandler.cc/1.10/Thu Sep 30 06:17:19 2010//
    8 /G4VRML1SceneHandlerFunc.icc/1.16/Thu Sep 30 06:17:19 2010//
    9 /G4VRML1Viewer.cc/1.8/Thu Sep 30 06:17:19 2010//
    10 /G4VRML2.cc/1.10/Thu Sep 30 06:17:20 2010//
    11 /G4VRML2File.cc/1.10/Thu Sep 30 06:17:20 2010//
    12 /G4VRML2FileSceneHandler.cc/1.14/Thu Sep 30 06:17:20 2010//
    13 /G4VRML2FileViewer.cc/1.13/Thu Sep 30 06:17:20 2010//
    14 /G4VRML2SceneHandler.cc/1.12/Thu Sep 30 06:17:20 2010//
    15 /G4VRML2SceneHandlerFunc.icc/1.20/Thu Sep 30 06:17:20 2010//
    16 /G4VRML2Viewer.cc/1.12/Thu Sep 30 06:17:20 2010//
    171D

  • trunk/source/visualization/VRML/src/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/XXX/CVS/Entries

    r1340 r1346  
    11D/include////
    22D/src////
    3 /CMakeLists.txt/1.1/Wed Sep 29 19:13:27 2010//
    4 /GNUmakefile/1.8/Thu Sep 30 06:17:20 2010//
    5 /sources.cmake/1.1/Wed Sep 29 19:13:35 2010//
    6 /History/1.30/Wed Oct  6 15:58:25 2010//
     3/CMakeLists.txt/1.1/Wed Sep 29 19:13:27 2010//Tgeant4-09-04-ref-00
     4/sources.cmake/1.1/Wed Sep 29 19:13:35 2010//Tgeant4-09-04-ref-00

  • trunk/source/visualization/XXX/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/XXX/GNUmakefile

    r1140 r1346  
    1515
    1616include $(G4INSTALL)/config/architecture.gmk
    17 include $(G4INSTALL)/config/G4VIS_BUILD.gmk
     17#include $(G4INSTALL)/config/G4VIS_BUILD.gmk
    1818include $(G4INSTALL)/config/interactivity.gmk
    1919

  • trunk/source/visualization/XXX/include/CVS/Entries

    r1337 r1346  
    11D/tree////
    2 /G4XXX.hh/1.5/Thu Sep 30 06:17:20 2010//
    3 /G4XXXFile.hh/1.2/Thu Sep 30 06:17:20 2010//
    4 /G4XXXFileSceneHandler.hh/1.4/Thu Sep 30 06:17:20 2010//
    5 /G4XXXFileViewer.hh/1.3/Thu Sep 30 06:17:20 2010//
    6 /G4XXXSG.hh/1.2/Thu Sep 30 06:17:20 2010//
    7 /G4XXXSGSceneHandler.hh/1.4/Thu Sep 30 06:17:20 2010//
    8 /G4XXXSGViewer.hh/1.2/Thu Sep 30 06:17:20 2010//
    9 /G4XXXSceneHandler.hh/1.21/Thu Sep 30 06:17:20 2010//
    10 /G4XXXStored.hh/1.2/Thu Sep 30 06:17:20 2010//
    11 /G4XXXStoredSceneHandler.hh/1.4/Thu Sep 30 06:17:20 2010//
    12 /G4XXXStoredViewer.hh/1.2/Thu Sep 30 06:17:20 2010//
    13 /G4XXXViewer.hh/1.8/Thu Sep 30 06:17:20 2010//

  • trunk/source/visualization/XXX/include/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/XXX/include/tree/CVS/Entries

    r1337 r1346  
    1 /AUTHORS/1.1/Mon Jul 12 14:53:13 2010//
    2 /COPYING/1.1/Mon Jul 12 14:53:13 2010//
    3 /Changelog/1.1/Mon Jul 12 14:53:13 2010//
    4 /bfs_iterator.h/1.1/Mon Jul 12 14:53:13 2010//
    5 /const_bfs_iterator.h/1.1/Mon Jul 12 14:53:13 2010//
    6 /const_iterator.cc/1.1/Thu Sep 30 06:17:20 2010//
    7 /const_iterator.h/1.1/Mon Jul 12 14:53:13 2010//
    8 /const_postorder_iterator.h/1.1/Mon Jul 12 14:53:13 2010//
    9 /const_preorder_iterator.h/1.1/Mon Jul 12 14:53:13 2010//
    10 /const_sibling_iterator.h/1.1/Mon Jul 12 14:53:13 2010//
    11 /iterator.cc/1.1/Thu Sep 30 06:17:20 2010//
    12 /iterator.h/1.1/Mon Jul 12 14:53:13 2010//
    13 /postorder_iterator.h/1.1/Mon Jul 12 14:53:13 2010//
    14 /preorder_iterator.h/1.1/Mon Jul 12 14:53:13 2010//
    15 /sibling_iterator.h/1.1/Mon Jul 12 14:53:13 2010//
    16 /tree.cc/1.1/Thu Sep 30 06:17:20 2010//
    17 /tree.h/1.1/Mon Jul 12 14:53:13 2010//
    18 /tree_iterator.cc/1.1/Thu Sep 30 06:17:20 2010//
    19 /tree_iterator.h/1.1/Mon Jul 12 14:53:13 2010//
    20 /tree_node.h/1.1/Mon Jul 12 14:53:13 2010//
    21 /tree_test.cc/1.1/Thu Sep 30 06:17:20 2010//
    221D

  • trunk/source/visualization/XXX/include/tree/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

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

    r1340 r1346  
    1 /G4XXX.cc/1.6/Thu Sep 30 06:17:20 2010//
    2 /G4XXXFile.cc/1.2/Thu Sep 30 06:17:21 2010//
    3 /G4XXXFileSceneHandler.cc/1.5/Thu Sep 30 06:17:21 2010//
    4 /G4XXXFileViewer.cc/1.3/Thu Sep 30 06:17:21 2010//
    5 /G4XXXSG.cc/1.2/Thu Sep 30 06:17:21 2010//
    6 /G4XXXSGSceneHandler.cc/1.6/Thu Sep 30 06:17:21 2010//
    7 /G4XXXSceneHandler.cc/1.32/Thu Sep 30 06:17:21 2010//
    8 /G4XXXStored.cc/1.2/Thu Sep 30 06:17:21 2010//
    9 /G4XXXStoredSceneHandler.cc/1.9/Thu Sep 30 06:17:21 2010//
    10 /G4XXXViewer.cc/1.9/Thu Sep 30 06:17:28 2010//
    11 /G4XXXSGViewer.cc/1.5/Wed Oct  6 10:14:06 2010//
    12 /G4XXXStoredViewer.cc/1.6/Wed Oct  6 10:14:07 2010//
    131D

  • trunk/source/visualization/XXX/src/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/externals/CVS/Entries

    r1337 r1346  
    11D/gl2ps////
    22D/zlib////
    3 /CMakeLists.txt/1.1/Wed Sep 29 19:13:44 2010//
    4 /GNUmakefile/1.1/Wed Sep 29 19:13:52 2010//
     3/CMakeLists.txt/1.1/Wed Sep 29 19:13:44 2010//Tgeant4-09-04-ref-00
     4/GNUmakefile/1.1/Wed Sep 29 19:13:52 2010//Tgeant4-09-04-ref-00

  • trunk/source/visualization/externals/CVS/Tag

    r1331 r1346  
    1 Tgeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

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

    r1340 r1346  
    11D/include////
    22D/src////
    3 /CMakeLists.txt/1.1/Wed Sep 29 19:14:00 2010//
    4 /GNUmakefile/1.5/Thu Sep 30 06:17:28 2010//
    5 /sources.cmake/1.1/Wed Sep 29 19:14:08 2010//
    6 /History/1.18/Wed Nov  3 16:40:34 2010//
     3/CMakeLists.txt/1.1/Wed Sep 29 19:14:00 2010//Tgeant4-09-04-ref-00
     4/GNUmakefile/1.5/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     5/History/1.21/Fri Nov 26 15:30:48 2010//Tgeant4-09-04-ref-00
     6/sources.cmake/1.5/Wed Dec  1 17:12:56 2010//Tgeant4-09-04-ref-00

  • trunk/source/visualization/externals/gl2ps/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/externals/gl2ps/GNUmakefile

    r1228 r1346  
    1818include $(G4INSTALL)/config/interactivity.gmk
    1919
     20# NO need QT, then reset QTGLAGS
     21QTFLAGS = ""
     22QTLIBS  = ""
     23GLQTLIBS  = ""
     24
    2025ifdef G4LIB_BUILD_ZLIB
    2126  CPPFLAGS += -I$(G4BASE)/visualization/externals/zlib/include

  • trunk/source/visualization/externals/gl2ps/History

    r1340 r1346  
    1 $Id: History,v 1.18 2010/11/03 16:40:34 lgarnier Exp $
     1$Id: History,v 1.21 2010/11/13 10:37:57 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1818     ----------------------------------------------------------
    1919
     20
     2113th November 2010, John Allison  (visexternal-V09-03-03)
     22- Geant4_gl2ps.h: Added #ifdef _WIN32, #define _USE_MATH_DEFINE.
     23
     245th November 2010, John Allison  (visexternal-V09-03-02)
     25- Fixed Linux warnings.
     26
     275th November 2010, John Allison  (visexternal-V09-03-01)
     28- Tagged.
    2029
    21303rd November 2010, Laurent Garnier

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

    r1340 r1346  
    1 /G4OpenGL2PSAction.hh/1.4/Thu Sep 30 06:17:28 2010//
    2 /Geant4_gl2ps.h/1.3/Wed Nov  3 15:19:14 2010//
    3 /gl2ps.h/1.3/Wed Nov  3 16:40:15 2010//
     1/G4OpenGL2PSAction.hh/1.4/Mon Apr 26 16:28:18 2010//Tgeant4-09-04-ref-00
     2/Geant4_gl2ps.h/1.4/Fri Nov 26 15:30:48 2010//Tgeant4-09-04-ref-00
     3/gl2ps.h/1.3/Wed Nov  3 16:40:34 2010//Tgeant4-09-04-ref-00
    44D

  • trunk/source/visualization/externals/gl2ps/include/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/externals/gl2ps/include/G4OpenGL2PSAction.hh

    r1337 r1346  
    2525//
    2626// $Id: G4OpenGL2PSAction.hh,v 1.4 2010/04/26 16:28:18 lgarnier Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: visexternal-V09-03-01 $
    2828//
    2929

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

    r1340 r1346  
    232232#include "gl2ps.h"
    233233
     234#ifdef _WIN32
     235#define _USE_MATH_DEFINES
    234236#endif
     237
     238#endif

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

    r1340 r1346  
    1 /G4OpenGL2PSAction.cc/1.6/Wed Nov  3 16:40:34 2010//
    2 /gl2ps.cc/1.9/Wed Nov  3 15:22:18 2010//
     1/G4OpenGL2PSAction.cc/1.6/Wed Nov  3 16:40:34 2010//Tgeant4-09-04-ref-00
     2/gl2ps.cc/1.13/Wed Dec 22 10:23:43 2010//Tgeant4-09-04-ref-00
    33D

  • trunk/source/visualization/externals/gl2ps/src/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

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

    r1340 r1346  
    2626//
    2727// $Id: G4OpenGL2PSAction.cc,v 1.6 2010/11/03 16:40:34 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: visexternal-V09-03-01 $
    2929//
    3030//

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

    r1340 r1346  
    7070#include "Geant4_gl2ps.h"
    7171
    72 #include <math.h>
     72#include <cmath>
    7373#include <string.h>
    7474#include <sys/types.h>
    7575#include <stdarg.h>
    7676#include <time.h>
    77 #include <float.h>
     77#include <cfloat>
    7878
    7979#define GL2PS_HAVE_ZLIB
    … …  
    9797#define GL2PS_ZOFFSET       5.0e-2F
    9898#define GL2PS_ZOFFSET_LARGE 20.0F
    99 #define GL2PS_ZERO(arg)     (fabs(arg) < 1.e-20)
     99#define GL2PS_ZERO(arg)     (std::fabs(arg) < 1.e-20)
    100100
    101101/* Primitive types */
    … …  
    725725 
    726726  for(i = 1; i < n; i++){
    727     if(fabs(rgba[0][0] - rgba[i][0]) > threshold[0] ||
    728        fabs(rgba[0][1] - rgba[i][1]) > threshold[1] ||
    729        fabs(rgba[0][2] - rgba[i][2]) > threshold[2])
     727    if(std::fabs(rgba[0][0] - rgba[i][0]) > threshold[0] ||
     728       std::fabs(rgba[0][1] - rgba[i][1]) > threshold[1] ||
     729       std::fabs(rgba[0][2] - rgba[i][2]) > threshold[2])
    730730      return GL_FALSE;
    731731  }
    … …  
    33323332}
    33333333
    3334 static void gl2psPrintTeXBeginViewport(GLint viewport[4])
     3334static void gl2psPrintTeXBeginViewport(GLint[4])
    33353335{
    33363336  glRenderMode(GL_FEEDBACK);
    … …  
    50325032}
    50335033
     5034#if defined(GL2PS_HAVE_LIBPNG)
    50345035static void gl2psPrintSVGPixmap(GLfloat x, GLfloat y, GL2PSimage *pixmap)
     5036#else
     5037static void gl2psPrintSVGPixmap(GLfloat, GLfloat, GL2PSimage*)
     5038#endif
    50355039{
    50365040#if defined(GL2PS_HAVE_LIBPNG)

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

    r1340 r1346  
    11D/include////
    22D/src////
    3 /GNUmakefile/1.1/Thu Sep 30 06:17:31 2010//
    4 /History/1.1/Thu Sep 30 06:17:31 2010//
    5 /README/1.1/Mon Jul 12 14:53:17 2010//
    6 /sources.cmake/1.1/Wed Sep 29 19:14:24 2010//
    7 /CMakeLists.txt/1.2/Fri Oct  8 10:03:41 2010//
     3/CMakeLists.txt/1.2/Thu Sep 30 13:56:02 2010//Tgeant4-09-04-ref-00
     4/GNUmakefile/1.1/Thu May 12 19:39:31 2005//Tgeant4-09-04-ref-00
     5/History/1.1/Wed May 25 23:18:52 2005//Tgeant4-09-04-ref-00
     6/README/1.1/Thu May 12 21:04:53 2005//Tgeant4-09-04-ref-00
     7/sources.cmake/1.1/Wed Sep 29 19:14:24 2010//Tgeant4-09-04-ref-00

  • trunk/source/visualization/externals/zlib/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

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

    r1337 r1346  
    1 /crc32.h/1.1/Mon Jul 12 14:53:16 2010//
    2 /deflate.h/1.1/Mon Jul 12 14:53:16 2010//
    3 /trees.h/1.1/Mon Jul 12 14:53:16 2010//
    4 /zconf.h/1.1/Mon Jul 12 14:53:16 2010//
    5 /zlib.h/1.1/Mon Jul 12 14:53:16 2010//
    6 /zutil.h/1.1/Mon Jul 12 14:53:16 2010//
     1/crc32.h/1.1/Thu May 12 21:04:53 2005//Tgeant4-09-04-ref-00
     2/deflate.h/1.1/Thu May 12 21:04:53 2005//Tgeant4-09-04-ref-00
     3/trees.h/1.1/Thu May 12 21:04:53 2005//Tgeant4-09-04-ref-00
     4/zconf.h/1.1/Thu May 12 21:04:53 2005//Tgeant4-09-04-ref-00
     5/zlib.h/1.1/Thu May 12 21:04:53 2005//Tgeant4-09-04-ref-00
     6/zutil.h/1.1/Thu May 12 21:04:53 2005//Tgeant4-09-04-ref-00
    77D

  • trunk/source/visualization/externals/zlib/include/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

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

    r1337 r1346  
    1 /adler32.cc/1.1/Thu Sep 30 06:17:32 2010//
    2 /compress.cc/1.1/Thu Sep 30 06:17:32 2010//
    3 /crc32.cc/1.1/Thu Sep 30 06:17:32 2010//
    4 /deflate.cc/1.1/Thu Sep 30 06:17:32 2010//
    5 /trees.cc/1.1/Thu Sep 30 06:17:33 2010//
    6 /zutil.cc/1.1/Thu Sep 30 06:17:33 2010//
     1/adler32.cc/1.1/Thu May 12 21:04:53 2005//Tgeant4-09-04-ref-00
     2/compress.cc/1.1/Thu May 12 21:04:53 2005//Tgeant4-09-04-ref-00
     3/crc32.cc/1.1/Thu May 12 21:04:53 2005//Tgeant4-09-04-ref-00
     4/deflate.cc/1.1/Thu May 12 21:04:53 2005//Tgeant4-09-04-ref-00
     5/trees.cc/1.1/Thu May 12 21:04:53 2005//Tgeant4-09-04-ref-00
     6/zutil.cc/1.1/Thu May 12 21:04:53 2005//Tgeant4-09-04-ref-00
    77D

  • trunk/source/visualization/externals/zlib/src/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/gMocren/CVS/Entries

    r1337 r1346  
    11D/include////
    22D/src////
    3 /CMakeLists.txt/1.1/Wed Sep 29 19:14:32 2010//
    4 /GNUmakefile/1.2/Thu Sep 30 06:17:33 2010//
    5 /History/1.14/Thu Sep 30 11:54:27 2010//
    6 /README/1.2/Mon Jul 12 14:53:14 2010//
    7 /sources.cmake/1.1/Wed Sep 29 19:14:41 2010//
     3/CMakeLists.txt/1.1/Wed Sep 29 19:14:32 2010//Tgeant4-09-04-ref-00
     4/sources.cmake/1.1/Wed Sep 29 19:14:41 2010//Tgeant4-09-04-ref-00

  • trunk/source/visualization/gMocren/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/gMocren/GNUmakefile

    r1142 r1346  
    1717include $(G4INSTALL)/config/G4VIS_BUILD.gmk
    1818include $(G4INSTALL)/config/interactivity.gmk
     19
     20# NO need OGL, then reset OGLGLAGS
     21OGLFLAGS = ""
     22OGLLIBS  = ""
     23# NO need QT, then reset QTGLAGS
     24QTFLAGS = ""
     25QTLIBS  = ""
     26GLQTLIBS  = ""
    1927
    2028CPPFLAGS += -I$(G4BASE)/visualization/management/include

  • trunk/source/visualization/gMocren/include/CVS/Entries

    r1337 r1346  
    1 /G4GMocrenFile.hh/1.2/Thu Sep 30 06:17:33 2010//
    2 /G4GMocrenFileCTtoDensityMap.hh/1.1/Thu Sep 30 06:17:33 2010//
    3 /G4GMocrenFileSceneHandler.hh/1.6/Thu Sep 30 06:17:33 2010//
    4 /G4GMocrenFileViewer.hh/1.2/Thu Sep 30 06:17:33 2010//
    5 /G4GMocrenIO.hh/1.4/Thu Sep 30 06:17:33 2010//
    6 /G4GMocrenMessenger.hh/1.2/Thu Sep 30 06:17:33 2010//
    7 /G4GMocrenTouchable.hh/1.2/Thu Sep 30 06:17:33 2010//
    81D

  • trunk/source/visualization/gMocren/include/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/gMocren/src/CVS/Entries

    r1337 r1346  
    1 /G4GMocrenFile.cc/1.2/Thu Sep 30 06:17:33 2010//
    2 /G4GMocrenFileCTtoDensityMap.cc/1.2/Thu Sep 30 06:17:34 2010//
    3 /G4GMocrenFileViewer.cc/1.3/Thu Sep 30 06:17:35 2010//
    4 /G4GMocrenIO.cc/1.5/Thu Sep 30 06:17:35 2010//
    5 /G4GMocrenMessenger.cc/1.2/Thu Sep 30 06:17:35 2010//
    6 /G4GMocrenFileSceneHandler.cc/1.17/Thu Sep 30 11:54:33 2010//
    71D

  • trunk/source/visualization/gMocren/src/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • 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"

  • trunk/source/visualization/modeling/CVS/Entries

    r1337 r1346  
    11D/include////
    22D/src////
    3 /CMakeLists.txt/1.1/Wed Sep 29 19:15:11 2010//
    4 /GNUmakefile/1.12/Thu Sep 30 06:17:43 2010//
    5 /History/1.121/Thu Sep 30 06:17:43 2010//
    6 /README/1.1/Mon Jul 12 14:53:16 2010//
    7 /sources.cmake/1.1/Wed Sep 29 19:15:19 2010//
     3/CMakeLists.txt/1.1/Wed Sep 29 19:15:11 2010//Tgeant4-09-04-ref-00
     4/GNUmakefile/1.12/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     5/History/1.123/Fri Nov 26 15:30:48 2010//Tgeant4-09-04-ref-00
     6/README/1.1/Thu Jan  7 16:15:34 1999//Tgeant4-09-04-ref-00
     7/sources.cmake/1.1/Wed Sep 29 19:15:19 2010//Tgeant4-09-04-ref-00

  • trunk/source/visualization/modeling/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/modeling/GNUmakefile

    r1337 r1346  
    99  G4INSTALL = ../../..
    1010endif
     11
     12CPPFLAGS += -DG4DEBUG_VIS_MODELING
    1113
    1214GLOBLIBS  = libG4event.lib

  • trunk/source/visualization/modeling/History

    r1315 r1346  
    1 $Id: History,v 1.121 2010/06/01 21:49:49 allison Exp $
     1$Id: History,v 1.123 2010/11/14 22:14:11 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2020History file for visualization/modeling
    2121---------------------------------------
     22
     2314th November 2010  John Allison  (modeling-V09-03-05)
     24- G4TrajectoryDrawerUtils.cc:Fixed time-slicing problem.
     25
     265th November 2010  John Allison  (modeling-V09-03-04)
     27- G4PhysicalVolumeModel.cc: Fixed Coverity warning.
    2228
    23291st June 2010  John Allison  (modeling-V09-03-03)

  • trunk/source/visualization/modeling/include/CVS/Entries

    r1337 r1346  
    1 /G4AttFilterUtils.hh/1.2/Thu Sep 30 06:17:43 2010//
    2 /G4AttValueFilterT.hh/1.3/Thu Sep 30 06:17:43 2010//
    3 /G4AttributeFilterT.hh/1.6/Thu Sep 30 06:17:43 2010//
    4 /G4AxesModel.hh/1.6/Thu Sep 30 06:17:43 2010//
    5 /G4BoundingSphereScene.hh/1.20/Thu Sep 30 06:17:43 2010//
    6 /G4CallbackModel.hh/1.5/Thu Sep 30 06:17:43 2010//
    7 /G4DigiFilterFactories.hh/1.1/Thu Sep 30 06:17:44 2010//
    8 /G4DigiModel.hh/1.1/Thu Sep 30 06:17:44 2010//
    9 /G4FlavoredParallelWorldModel.hh/1.8/Thu Sep 30 06:17:44 2010//
    10 /G4HitFilterFactories.hh/1.1/Thu Sep 30 06:17:44 2010//
    11 /G4HitsModel.hh/1.10/Thu Sep 30 06:17:44 2010//
    12 /G4LogicalVolumeModel.hh/1.9/Thu Sep 30 06:17:44 2010//
    13 /G4ModelApplyCommandsT.hh/1.6/Thu Sep 30 06:17:44 2010//
    14 /G4ModelColourMap.hh/1.2/Thu Sep 30 06:17:44 2010//
    15 /G4ModelCommandUtils.hh/1.3/Thu Sep 30 06:17:44 2010//
    16 /G4ModelCommandsT.hh/1.13/Thu Sep 30 06:17:44 2010//
    17 /G4ModelCompoundCommandsT.hh/1.1/Thu Sep 30 06:17:44 2010//
    18 /G4ModelingParameters.hh/1.18/Thu Sep 30 06:17:44 2010//
    19 /G4ModelingParameters.icc/1.12/Thu Sep 30 06:17:44 2010//
    20 /G4NullModel.hh/1.7/Thu Sep 30 06:17:44 2010//
    21 /G4PSHitsModel.hh/1.4/Thu Sep 30 06:17:44 2010//
    22 /G4PhysicalVolumeMassScene.hh/1.11/Thu Sep 30 06:17:44 2010//
    23 /G4PhysicalVolumeModel.hh/1.36/Thu Sep 30 06:17:45 2010//
    24 /G4PhysicalVolumeSearchScene.hh/1.20/Thu Sep 30 06:17:45 2010//
    25 /G4PhysicalVolumeSearchScene.icc/1.6/Thu Sep 30 06:17:45 2010//
    26 /G4ScaleModel.hh/1.4/Thu Sep 30 06:17:45 2010//
    27 /G4TextModel.hh/1.7/Thu Sep 30 06:17:45 2010//
    28 /G4TrajectoriesModel.hh/1.11/Thu Sep 30 06:17:45 2010//
    29 /G4TrajectoryChargeFilter.hh/1.3/Thu Sep 30 06:17:45 2010//
    30 /G4TrajectoryDrawByAttribute.hh/1.2/Thu Sep 30 06:17:45 2010//
    31 /G4TrajectoryDrawByCharge.hh/1.8/Thu Sep 30 06:17:45 2010//
    32 /G4TrajectoryDrawByOriginVolume.hh/1.5/Thu Sep 30 06:17:45 2010//
    33 /G4TrajectoryDrawByParticleID.hh/1.8/Thu Sep 30 06:17:45 2010//
    34 /G4TrajectoryDrawerUtils.hh/1.9/Thu Sep 30 06:17:45 2010//
    35 /G4TrajectoryFilterFactories.hh/1.4/Thu Sep 30 06:17:45 2010//
    36 /G4TrajectoryGenericDrawer.hh/1.3/Thu Sep 30 06:17:45 2010//
    37 /G4TrajectoryModelFactories.hh/1.6/Thu Sep 30 06:17:45 2010//
    38 /G4TrajectoryOriginVolumeFilter.hh/1.3/Thu Sep 30 06:17:45 2010//
    39 /G4TrajectoryParticleFilter.hh/1.3/Thu Sep 30 06:17:45 2010//
    40 /G4VAttValueFilter.hh/1.2/Thu Sep 30 06:17:45 2010//
    41 /G4VModel.hh/1.19/Thu Sep 30 06:17:45 2010//
    42 /G4VModel.icc/1.12/Thu Sep 30 06:17:45 2010//
    43 /G4VModelCommand.hh/1.4/Thu Sep 30 06:17:45 2010//
    44 /G4VModelFactory.hh/1.6/Thu Sep 30 06:17:45 2010//
    45 /G4VTrajectoryModel.hh/1.8/Thu Sep 30 06:17:45 2010//
    46 /G4VisTrajContext.hh/1.4/Thu Sep 30 06:17:45 2010//
    47 /G4VisTrajContext.icc/1.4/Thu Sep 30 06:17:46 2010//
     1/G4AttFilterUtils.hh/1.2/Wed Dec 13 15:49:58 2006//Tgeant4-09-04-ref-00
     2/G4AttValueFilterT.hh/1.3/Wed Dec 13 15:50:00 2006//Tgeant4-09-04-ref-00
     3/G4AttributeFilterT.hh/1.6/Wed Dec 13 15:50:02 2006//Tgeant4-09-04-ref-00
     4/G4AxesModel.hh/1.6/Wed Nov  1 10:28:42 2006//Tgeant4-09-04-ref-00
     5/G4BoundingSphereScene.hh/1.20/Sun May 30 11:23:25 2010//Tgeant4-09-04-ref-00
     6/G4CallbackModel.hh/1.5/Thu Jun 29 21:30:10 2006//Tgeant4-09-04-ref-00
     7/G4DigiFilterFactories.hh/1.1/Sun May 30 11:24:30 2010//Tgeant4-09-04-ref-00
     8/G4DigiModel.hh/1.1/Sun May 30 11:24:30 2010//Tgeant4-09-04-ref-00
     9/G4FlavoredParallelWorldModel.hh/1.8/Thu Jun 29 21:30:12 2006//Tgeant4-09-04-ref-00
     10/G4HitFilterFactories.hh/1.1/Tue Sep 12 18:53:03 2006//Tgeant4-09-04-ref-00
     11/G4HitsModel.hh/1.10/Thu Nov  2 11:57:31 2006//Tgeant4-09-04-ref-00
     12/G4LogicalVolumeModel.hh/1.9/Wed Nov  1 10:28:42 2006//Tgeant4-09-04-ref-00
     13/G4ModelApplyCommandsT.hh/1.6/Wed Nov 10 10:16:47 2010//Tgeant4-09-04-ref-00
     14/G4ModelColourMap.hh/1.2/Thu Jun 29 21:30:22 2006//Tgeant4-09-04-ref-00
     15/G4ModelCommandUtils.hh/1.3/Tue Feb 24 12:00:56 2009//Tgeant4-09-04-ref-00
     16/G4ModelCommandsT.hh/1.13/Tue Feb 24 12:00:56 2009//Tgeant4-09-04-ref-00
     17/G4ModelCompoundCommandsT.hh/1.1/Mon Sep 11 21:52:18 2006//Tgeant4-09-04-ref-00
     18/G4ModelingParameters.hh/1.18/Tue May 11 11:13:35 2010//Tgeant4-09-04-ref-00
     19/G4ModelingParameters.icc/1.12/Tue May 11 11:13:35 2010//Tgeant4-09-04-ref-00
     20/G4NullModel.hh/1.7/Thu Jun 29 21:30:30 2006//Tgeant4-09-04-ref-00
     21/G4PSHitsModel.hh/1.4/Wed Nov  4 12:44:39 2009//Tgeant4-09-04-ref-00
     22/G4PhysicalVolumeMassScene.hh/1.11/Sun May 30 11:23:25 2010//Tgeant4-09-04-ref-00
     23/G4PhysicalVolumeModel.hh/1.36/Tue May 11 11:16:51 2010//Tgeant4-09-04-ref-00
     24/G4PhysicalVolumeSearchScene.hh/1.20/Sun May 30 11:23:25 2010//Tgeant4-09-04-ref-00
     25/G4PhysicalVolumeSearchScene.icc/1.6/Thu Jun 29 21:30:38 2006//Tgeant4-09-04-ref-00
     26/G4ScaleModel.hh/1.4/Wed Nov  1 10:28:42 2006//Tgeant4-09-04-ref-00
     27/G4TextModel.hh/1.7/Wed Nov  1 10:28:42 2006//Tgeant4-09-04-ref-00
     28/G4TrajectoriesModel.hh/1.11/Tue May 11 11:21:52 2010//Tgeant4-09-04-ref-00
     29/G4TrajectoryChargeFilter.hh/1.3/Fri Aug 25 19:44:14 2006//Tgeant4-09-04-ref-00
     30/G4TrajectoryDrawByAttribute.hh/1.2/Tue May 11 11:31:31 2010//Tgeant4-09-04-ref-00
     31/G4TrajectoryDrawByCharge.hh/1.8/Tue May 11 11:31:31 2010//Tgeant4-09-04-ref-00
     32/G4TrajectoryDrawByOriginVolume.hh/1.5/Tue May 11 11:31:31 2010//Tgeant4-09-04-ref-00
     33/G4TrajectoryDrawByParticleID.hh/1.8/Tue May 11 11:31:31 2010//Tgeant4-09-04-ref-00
     34/G4TrajectoryDrawerUtils.hh/1.9/Tue May 11 11:58:18 2010//Tgeant4-09-04-ref-00
     35/G4TrajectoryFilterFactories.hh/1.4/Tue Sep 12 18:53:03 2006//Tgeant4-09-04-ref-00
     36/G4TrajectoryGenericDrawer.hh/1.3/Tue May 11 11:31:31 2010//Tgeant4-09-04-ref-00
     37/G4TrajectoryModelFactories.hh/1.6/Tue Sep 12 18:53:03 2006//Tgeant4-09-04-ref-00
     38/G4TrajectoryOriginVolumeFilter.hh/1.3/Fri Aug 25 19:44:14 2006//Tgeant4-09-04-ref-00
     39/G4TrajectoryParticleFilter.hh/1.3/Fri Aug 25 19:44:14 2006//Tgeant4-09-04-ref-00
     40/G4VAttValueFilter.hh/1.2/Wed Dec 13 15:50:04 2006//Tgeant4-09-04-ref-00
     41/G4VModel.hh/1.19/Mon Jul 10 16:09:30 2006//Tgeant4-09-04-ref-00
     42/G4VModel.icc/1.12/Mon Jul 10 16:09:30 2006//Tgeant4-09-04-ref-00
     43/G4VModelCommand.hh/1.4/Mon Sep 11 21:22:02 2006//Tgeant4-09-04-ref-00
     44/G4VModelFactory.hh/1.6/Thu Jun 29 21:32:30 2006//Tgeant4-09-04-ref-00
     45/G4VTrajectoryModel.hh/1.8/Tue May 11 11:31:31 2010//Tgeant4-09-04-ref-00
     46/G4VisTrajContext.hh/1.4/Tue Feb 24 12:00:56 2009//Tgeant4-09-04-ref-00
     47/G4VisTrajContext.icc/1.4/Tue Feb 24 12:00:56 2009//Tgeant4-09-04-ref-00
    4848D

  • trunk/source/visualization/modeling/include/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/modeling/include/G4AttFilterUtils.hh

    r1337 r1346  
    2525//
    2626// $Id: G4AttFilterUtils.hh,v 1.2 2006/12/13 15:49:58 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Visualisation attribute filter utility functions.

  • trunk/source/visualization/modeling/include/G4AttValueFilterT.hh

    r1337 r1346  
    2525//
    2626// $Id: G4AttValueFilterT.hh,v 1.3 2006/12/13 15:50:00 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Templated class for G4AttValue filters.

  • trunk/source/visualization/modeling/include/G4AttributeFilterT.hh

    r1337 r1346  
    2525//
    2626// $Id: G4AttributeFilterT.hh,v 1.6 2006/12/13 15:50:02 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Generic attribute filter.

  • trunk/source/visualization/modeling/include/G4AxesModel.hh

    r1337 r1346  
    2626//
    2727// $Id: G4AxesModel.hh,v 1.6 2006/11/01 10:28:42 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4BoundingSphereScene.hh

    r1337 r1346  
    2626//
    2727// $Id: G4BoundingSphereScene.hh,v 1.20 2010/05/30 11:23:25 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4CallbackModel.hh

    r1337 r1346  
    2626//
    2727// $Id: G4CallbackModel.hh,v 1.5 2006/06/29 21:30:10 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4DigiFilterFactories.hh

    r1337 r1346  
    2525//
    2626/// $Id: G4DigiFilterFactories.hh,v 1.1 2010/05/30 11:24:30 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929//

  • trunk/source/visualization/modeling/include/G4DigiModel.hh

    r1337 r1346  
    2626//
    2727// $Id: G4DigiModel.hh,v 1.1 2010/05/30 11:24:30 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4FlavoredParallelWorldModel.hh

    r1337 r1346  
    2626//
    2727// $Id: G4FlavoredParallelWorldModel.hh,v 1.8 2006/06/29 21:30:12 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030// P. Mora de Freitas et M.Verderi - 19 June 1998.

  • trunk/source/visualization/modeling/include/G4HitFilterFactories.hh

    r1337 r1346  
    2525//
    2626/// $Id: G4HitFilterFactories.hh,v 1.1 2006/09/12 18:53:03 tinslay Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929//

  • trunk/source/visualization/modeling/include/G4HitsModel.hh

    r1337 r1346  
    2626//
    2727// $Id: G4HitsModel.hh,v 1.10 2006/11/02 11:57:31 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4LogicalVolumeModel.hh

    r1337 r1346  
    2626//
    2727// $Id: G4LogicalVolumeModel.hh,v 1.9 2006/11/01 10:28:42 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4ModelApplyCommandsT.hh

    r1337 r1346  
    2525//
    2626// $Id: G4ModelApplyCommandsT.hh,v 1.6 2009/02/25 14:17:11 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Abstract model messenges. Derived classes should implement

  • trunk/source/visualization/modeling/include/G4ModelColourMap.hh

    r1337 r1346  
    2525//
    2626// $Id: G4ModelColourMap.hh,v 1.2 2006/06/29 21:30:22 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Generic variable->G4Colour map, where "variable" is the template

  • trunk/source/visualization/modeling/include/G4ModelCommandUtils.hh

    r1337 r1346  
    2525//
    2626// $Id: G4ModelCommandUtils.hh,v 1.3 2009/02/24 12:00:56 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay September 2006

  • trunk/source/visualization/modeling/include/G4ModelCommandsT.hh

    r1337 r1346  
    2525//
    2626// $Id: G4ModelCommandsT.hh,v 1.13 2009/02/24 12:00:56 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Generic model messenges.

  • trunk/source/visualization/modeling/include/G4ModelCompoundCommandsT.hh

    r1337 r1346  
    2525//
    2626// $Id: G4ModelCompoundCommandsT.hh,v 1.1 2006/09/11 21:52:18 tinslay Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay September 2006

  • trunk/source/visualization/modeling/include/G4ModelingParameters.hh

    r1337 r1346  
    2626//
    2727// $Id: G4ModelingParameters.hh,v 1.18 2010/05/11 11:13:35 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4ModelingParameters.icc

    r1337 r1346  
    2626//
    2727// $Id: G4ModelingParameters.icc,v 1.12 2010/05/11 11:13:35 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4NullModel.hh

    r1337 r1346  
    2626//
    2727// $Id: G4NullModel.hh,v 1.7 2006/06/29 21:30:30 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4PSHitsModel.hh

    r1337 r1346  
    2626//
    2727// $Id: G4PSHitsModel.hh,v 1.4 2009/11/04 12:44:39 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4PhysicalVolumeMassScene.hh

    r1337 r1346  
    2626//
    2727// $Id: G4PhysicalVolumeMassScene.hh,v 1.11 2010/05/30 11:23:25 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4PhysicalVolumeModel.hh

    r1337 r1346  
    2626//
    2727// $Id: G4PhysicalVolumeModel.hh,v 1.36 2010/05/11 11:16:51 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh

    r1337 r1346  
    2626//
    2727// $Id: G4PhysicalVolumeSearchScene.hh,v 1.20 2010/05/30 11:23:25 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc

    r1337 r1346  
    2626//
    2727// $Id: G4PhysicalVolumeSearchScene.icc,v 1.6 2006/06/29 21:30:38 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4ScaleModel.hh

    r1337 r1346  
    2626//
    2727// $Id: G4ScaleModel.hh,v 1.4 2006/11/01 10:28:42 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4TextModel.hh

    r1337 r1346  
    2626//
    2727// $Id: G4TextModel.hh,v 1.7 2006/11/01 10:28:42 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4TrajectoriesModel.hh

    r1337 r1346  
    2626//
    2727// $Id: G4TrajectoriesModel.hh,v 1.11 2010/05/11 11:21:52 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4TrajectoryChargeFilter.hh

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryChargeFilter.hh,v 1.3 2006/08/25 19:44:14 tinslay Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Filter trajectories according to charge. Only registered

  • trunk/source/visualization/modeling/include/G4TrajectoryDrawByAttribute.hh

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryDrawByAttribute.hh,v 1.2 2010/05/11 11:31:31 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay September 2006

  • trunk/source/visualization/modeling/include/G4TrajectoryDrawByCharge.hh

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryDrawByCharge.hh,v 1.8 2010/05/11 11:31:31 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005

  • trunk/source/visualization/modeling/include/G4TrajectoryDrawByOriginVolume.hh

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryDrawByOriginVolume.hh,v 1.5 2010/05/11 11:31:31 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Class Description:

  • trunk/source/visualization/modeling/include/G4TrajectoryDrawByParticleID.hh

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryDrawByParticleID.hh,v 1.8 2010/05/11 11:31:31 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005

  • trunk/source/visualization/modeling/include/G4TrajectoryDrawerUtils.hh

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryDrawerUtils.hh,v 1.9 2010/05/11 11:58:18 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005

  • trunk/source/visualization/modeling/include/G4TrajectoryFilterFactories.hh

    r1337 r1346  
    2525//
    2626/// $Id: G4TrajectoryFilterFactories.hh,v 1.4 2006/09/12 18:53:03 tinslay Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929//

  • trunk/source/visualization/modeling/include/G4TrajectoryGenericDrawer.hh

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryGenericDrawer.hh,v 1.3 2010/05/11 11:31:31 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005

  • trunk/source/visualization/modeling/include/G4TrajectoryModelFactories.hh

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryModelFactories.hh,v 1.6 2006/09/12 18:53:03 tinslay 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/modeling/include/G4TrajectoryOriginVolumeFilter.hh

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryOriginVolumeFilter.hh,v 1.3 2006/08/25 19:44:14 tinslay Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Filter trajectories according to volume name. Only registered

  • trunk/source/visualization/modeling/include/G4TrajectoryParticleFilter.hh

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryParticleFilter.hh,v 1.3 2006/08/25 19:44:14 tinslay Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Filter trajectories according to particle type. Only registered

  • trunk/source/visualization/modeling/include/G4VAttValueFilter.hh

    r1337 r1346  
    2525//
    2626// $Id: G4VAttValueFilter.hh,v 1.2 2006/12/13 15:50:04 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Abstract base class for G4AttValue filters

  • trunk/source/visualization/modeling/include/G4VModel.hh

    r1337 r1346  
    2626//
    2727// $Id: G4VModel.hh,v 1.19 2006/07/10 16:09:30 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4VModel.icc

    r1337 r1346  
    2626//
    2727// $Id: G4VModel.icc,v 1.12 2006/07/10 16:09:30 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/include/G4VModelCommand.hh

    r1337 r1346  
    2525//
    2626// $Id: G4VModelCommand.hh,v 1.4 2006/09/11 21:22:02 tinslay Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005

  • trunk/source/visualization/modeling/include/G4VModelFactory.hh

    r1337 r1346  
    2525//
    2626// $Id: G4VModelFactory.hh,v 1.6 2006/06/29 21:32:30 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/modeling/include/G4VTrajectoryModel.hh

    r1337 r1346  
    2525//
    2626// $Id: G4VTrajectoryModel.hh,v 1.8 2010/05/11 11:31:31 allison 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/modeling/include/G4VisTrajContext.hh

    r1337 r1346  
    2525//
    2626// $Id: G4VisTrajContext.hh,v 1.4 2009/02/24 12:00:56 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay May 2006

  • trunk/source/visualization/modeling/include/G4VisTrajContext.icc

    r1337 r1346  
    2525//
    2626// $Id: G4VisTrajContext.icc,v 1.4 2009/02/24 12:00:56 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay May 2006

  • trunk/source/visualization/modeling/src/CVS/Entries

    r1337 r1346  
    1 /G4AttFilterUtils.cc/1.4/Thu Sep 30 06:17:46 2010//
    2 /G4AxesModel.cc/1.6/Thu Sep 30 06:17:46 2010//
    3 /G4BoundingSphereScene.cc/1.11/Thu Sep 30 06:17:46 2010//
    4 /G4DigiFilterFactories.cc/1.1/Thu Sep 30 06:17:46 2010//
    5 /G4DigiModel.cc/1.1/Thu Sep 30 06:17:46 2010//
    6 /G4FlavoredParallelWorldModel.cc/1.7/Thu Sep 30 06:17:46 2010//
    7 /G4HitFilterFactories.cc/1.2/Thu Sep 30 06:17:46 2010//
    8 /G4HitsModel.cc/1.18/Thu Sep 30 06:17:46 2010//
    9 /G4LogicalVolumeModel.cc/1.14/Thu Sep 30 06:17:46 2010//
    10 /G4ModelingParameters.cc/1.16/Thu Sep 30 06:17:46 2010//
    11 /G4NullModel.cc/1.9/Thu Sep 30 06:17:46 2010//
    12 /G4PSHitsModel.cc/1.4/Thu Sep 30 06:17:46 2010//
    13 /G4PhysicalVolumeMassScene.cc/1.7/Thu Sep 30 06:17:46 2010//
    14 /G4PhysicalVolumeModel.cc/1.67/Thu Sep 30 06:17:46 2010//
    15 /G4PhysicalVolumeSearchScene.cc/1.14/Thu Sep 30 06:17:46 2010//
    16 /G4ScaleModel.cc/1.4/Thu Sep 30 06:17:46 2010//
    17 /G4TextModel.cc/1.7/Thu Sep 30 06:17:47 2010//
    18 /G4TrajectoriesModel.cc/1.25/Thu Sep 30 06:17:47 2010//
    19 /G4TrajectoryChargeFilter.cc/1.4/Thu Sep 30 06:17:47 2010//
    20 /G4TrajectoryDrawByAttribute.cc/1.5/Thu Sep 30 06:17:47 2010//
    21 /G4TrajectoryDrawByCharge.cc/1.10/Thu Sep 30 06:17:47 2010//
    22 /G4TrajectoryDrawByOriginVolume.cc/1.6/Thu Sep 30 06:17:47 2010//
    23 /G4TrajectoryDrawByParticleID.cc/1.11/Thu Sep 30 06:17:47 2010//
    24 /G4TrajectoryDrawerUtils.cc/1.14/Thu Sep 30 06:17:47 2010//
    25 /G4TrajectoryFilterFactories.cc/1.5/Thu Sep 30 06:17:47 2010//
    26 /G4TrajectoryGenericDrawer.cc/1.3/Thu Sep 30 06:17:47 2010//
    27 /G4TrajectoryModelFactories.cc/1.7/Thu Sep 30 06:17:48 2010//
    28 /G4TrajectoryOriginVolumeFilter.cc/1.3/Thu Sep 30 06:17:48 2010//
    29 /G4TrajectoryParticleFilter.cc/1.3/Thu Sep 30 06:17:48 2010//
    30 /G4VModel.cc/1.14/Thu Sep 30 06:17:48 2010//
    31 /G4VTrajectoryModel.cc/1.3/Thu Sep 30 06:17:49 2010//
    32 /G4VisTrajContext.cc/1.6/Thu Sep 30 06:17:49 2010//
     1/G4AttFilterUtils.cc/1.4/Wed Dec 13 15:50:06 2006//Tgeant4-09-04-ref-00
     2/G4AxesModel.cc/1.6/Thu Jun 29 21:32:38 2006//Tgeant4-09-04-ref-00
     3/G4BoundingSphereScene.cc/1.11/Thu Jun 29 21:32:40 2006//Tgeant4-09-04-ref-00
     4/G4DigiFilterFactories.cc/1.1/Sun May 30 11:24:30 2010//Tgeant4-09-04-ref-00
     5/G4DigiModel.cc/1.1/Sun May 30 11:24:30 2010//Tgeant4-09-04-ref-00
     6/G4FlavoredParallelWorldModel.cc/1.7/Thu Jun 29 21:32:42 2006//Tgeant4-09-04-ref-00
     7/G4HitFilterFactories.cc/1.2/Sun May 30 11:24:03 2010//Tgeant4-09-04-ref-00
     8/G4HitsModel.cc/1.18/Tue Nov 14 14:42:08 2006//Tgeant4-09-04-ref-00
     9/G4LogicalVolumeModel.cc/1.14/Wed Nov  1 10:28:42 2006//Tgeant4-09-04-ref-00
     10/G4ModelingParameters.cc/1.16/Tue May 11 11:13:35 2010//Tgeant4-09-04-ref-00
     11/G4NullModel.cc/1.9/Thu Jun 29 21:32:50 2006//Tgeant4-09-04-ref-00
     12/G4PSHitsModel.cc/1.4/Wed Nov  4 12:44:39 2009//Tgeant4-09-04-ref-00
     13/G4PhysicalVolumeMassScene.cc/1.7/Mon Nov  6 09:24:13 2006//Tgeant4-09-04-ref-00
     14/G4PhysicalVolumeModel.cc/1.68/Fri Nov  5 15:19:29 2010//Tgeant4-09-04-ref-00
     15/G4PhysicalVolumeSearchScene.cc/1.14/Sun Jul 27 10:49:24 2008//Tgeant4-09-04-ref-00
     16/G4ScaleModel.cc/1.4/Thu Jun 29 21:32:58 2006//Tgeant4-09-04-ref-00
     17/G4TextModel.cc/1.7/Thu Jun 29 21:33:00 2006//Tgeant4-09-04-ref-00
     18/G4TrajectoriesModel.cc/1.25/Tue May 11 11:21:52 2010//Tgeant4-09-04-ref-00
     19/G4TrajectoryChargeFilter.cc/1.4/Fri Aug 25 19:44:14 2006//Tgeant4-09-04-ref-00
     20/G4TrajectoryDrawByAttribute.cc/1.5/Fri May 28 02:00:59 2010//Tgeant4-09-04-ref-00
     21/G4TrajectoryDrawByCharge.cc/1.10/Fri May 28 02:00:59 2010//Tgeant4-09-04-ref-00
     22/G4TrajectoryDrawByOriginVolume.cc/1.6/Fri May 28 02:00:59 2010//Tgeant4-09-04-ref-00
     23/G4TrajectoryDrawByParticleID.cc/1.11/Tue Jun  1 21:17:41 2010//Tgeant4-09-04-ref-00
     24/G4TrajectoryDrawerUtils.cc/1.15/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     25/G4TrajectoryFilterFactories.cc/1.5/Tue Sep 12 18:53:03 2006//Tgeant4-09-04-ref-00
     26/G4TrajectoryGenericDrawer.cc/1.3/Tue May 11 11:31:31 2010//Tgeant4-09-04-ref-00
     27/G4TrajectoryModelFactories.cc/1.7/Tue Sep 12 18:53:03 2006//Tgeant4-09-04-ref-00
     28/G4TrajectoryOriginVolumeFilter.cc/1.3/Fri Aug 25 19:44:14 2006//Tgeant4-09-04-ref-00
     29/G4TrajectoryParticleFilter.cc/1.3/Fri Aug 25 19:44:14 2006//Tgeant4-09-04-ref-00
     30/G4VModel.cc/1.14/Wed Nov  1 10:33:00 2006//Tgeant4-09-04-ref-00
     31/G4VTrajectoryModel.cc/1.3/Thu Jun 29 21:33:26 2006//Tgeant4-09-04-ref-00
     32/G4VisTrajContext.cc/1.6/Tue Feb 24 12:00:56 2009//Tgeant4-09-04-ref-00
    3333D

  • trunk/source/visualization/modeling/src/CVS/Tag

    r1331 r1346  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/source/visualization/modeling/src/G4AttFilterUtils.cc

    r1337 r1346  
    2525//
    2626// $Id: G4AttFilterUtils.cc,v 1.4 2006/12/13 15:50:06 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Visualisation attribute filter utility functions.

  • trunk/source/visualization/modeling/src/G4AxesModel.cc

    r1337 r1346  
    2626//
    2727// $Id: G4AxesModel.cc,v 1.6 2006/06/29 21:32:38 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/src/G4BoundingSphereScene.cc

    r1337 r1346  
    2626//
    2727// $Id: G4BoundingSphereScene.cc,v 1.11 2006/06/29 21:32:40 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/src/G4DigiFilterFactories.cc

    r1337 r1346  
    2525//
    2626/// $Id: G4DigiFilterFactories.cc,v 1.1 2010/05/30 11:24:30 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929//

  • trunk/source/visualization/modeling/src/G4DigiModel.cc

    r1337 r1346  
    2626//
    2727// $Id: G4DigiModel.cc,v 1.1 2010/05/30 11:24:30 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc

    r1337 r1346  
    2626//
    2727// $Id: G4FlavoredParallelWorldModel.cc,v 1.7 2006/06/29 21:32:42 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030// P. Mora de Freitas et M.Verderi - 19 June 1998.

  • trunk/source/visualization/modeling/src/G4HitFilterFactories.cc

    r1337 r1346  
    2525//
    2626/// $Id: G4HitFilterFactories.cc,v 1.2 2010/05/30 11:24:03 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929//

  • trunk/source/visualization/modeling/src/G4HitsModel.cc

    r1337 r1346  
    2626//
    2727// $Id: G4HitsModel.cc,v 1.18 2006/11/14 14:42:08 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/src/G4LogicalVolumeModel.cc

    r1337 r1346  
    2626//
    2727// $Id: G4LogicalVolumeModel.cc,v 1.14 2006/11/01 10:28:42 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/src/G4ModelingParameters.cc

    r1337 r1346  
    2626//
    2727// $Id: G4ModelingParameters.cc,v 1.16 2010/05/11 11:13:35 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/src/G4NullModel.cc

    r1337 r1346  
    2626//
    2727// $Id: G4NullModel.cc,v 1.9 2006/06/29 21:32:50 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/src/G4PSHitsModel.cc

    r1337 r1346  
    2626//
    2727// $Id: G4PSHitsModel.cc,v 1.4 2009/11/04 12:44:39 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/src/G4PhysicalVolumeMassScene.cc

    r1337 r1346  
    2626//
    2727// $Id: G4PhysicalVolumeMassScene.cc,v 1.7 2006/11/06 09:24:13 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/src/G4PhysicalVolumeModel.cc

    r1337 r1346  
    2525//
    2626//
    27 // $Id: G4PhysicalVolumeModel.cc,v 1.67 2010/05/11 11:16:51 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PhysicalVolumeModel.cc,v 1.68 2010/11/05 15:19:29 allison Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    475475  if (daughtersToBeDrawn) {
    476476    for (G4int iDaughter = 0; iDaughter < nDaughters; iDaughter++) {
    477       G4VPhysicalVolume* pVPV = pLV -> GetDaughter (iDaughter);
     477      // Store daughter pVPV in local variable ready for recursion...
     478      G4VPhysicalVolume* pDaughterVPV = pLV -> GetDaughter (iDaughter);
    478479      // Descend the geometry structure recursively...
    479480      fCurrentDepth++;
    480481      VisitGeometryAndGetVisReps
    481         (pVPV, requestedDepth - 1, theNewAT, sceneHandler);
     482        (pDaughterVPV, requestedDepth - 1, theNewAT, sceneHandler);
    482483      fCurrentDepth--;
    483484    }

  • trunk/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc

    r1337 r1346  
    2626//
    2727// $Id: G4PhysicalVolumeSearchScene.cc,v 1.14 2008/07/27 10:49:24 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/src/G4ScaleModel.cc

    r1337 r1346  
    2626//
    2727// $Id: G4ScaleModel.cc,v 1.4 2006/06/29 21:32:58 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/src/G4TextModel.cc

    r1337 r1346  
    2626//
    2727// $Id: G4TextModel.cc,v 1.7 2006/06/29 21:33:00 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/src/G4TrajectoriesModel.cc

    r1337 r1346  
    2626//
    2727// $Id: G4TrajectoriesModel.cc,v 1.25 2010/05/11 11:21:52 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/src/G4TrajectoryChargeFilter.cc

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryChargeFilter.cc,v 1.4 2006/08/25 19:44:14 tinslay Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Filter trajectories according to charge. Only registered

  • trunk/source/visualization/modeling/src/G4TrajectoryDrawByAttribute.cc

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryDrawByAttribute.cc,v 1.5 2010/05/28 02:00:59 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay August 2006

  • trunk/source/visualization/modeling/src/G4TrajectoryDrawByCharge.cc

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryDrawByCharge.cc,v 1.10 2010/05/28 02:00:59 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005

  • trunk/source/visualization/modeling/src/G4TrajectoryDrawByOriginVolume.cc

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryDrawByOriginVolume.cc,v 1.6 2010/05/28 02:00:59 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay March 2006

  • trunk/source/visualization/modeling/src/G4TrajectoryDrawByParticleID.cc

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryDrawByParticleID.cc,v 1.11 2010/06/01 21:17:41 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005

  • trunk/source/visualization/modeling/src/G4TrajectoryDrawerUtils.cc

    r1337 r1346  
    2424// ********************************************************************
    2525//
    26 // $Id: G4TrajectoryDrawerUtils.cc,v 1.14 2010/05/11 11:58:18 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4TrajectoryDrawerUtils.cc,v 1.15 2010/11/14 22:13:55 allison Exp $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005
    … …  
    4545
    4646
    47   void GetPoints(const G4VTrajectory& traj, G4Polyline& trajectoryLine,
    48                  G4Polymarker& auxiliaryPoints, G4Polymarker& stepPoints)
    49   {
     47  void GetPoints(const G4VTrajectory& traj,
     48                 G4Polyline& trajectoryLine,
     49                 G4Polymarker& auxiliaryPoints,
     50                 G4Polymarker& stepPoints)
     51  {
     52    // Keep positions.  Don't store unless first or different.
     53    std::vector<G4ThreeVector> positions;
     54
    5055    for (G4int i=0; i<traj.GetPointEntries(); i++) {
     56
    5157      G4VTrajectoryPoint* aTrajectoryPoint = traj.GetPoint(i);
    52      
    53       const std::vector<G4ThreeVector>* auxiliaries
    54         = aTrajectoryPoint->GetAuxiliaryPoints();
    55      
    56       if (0 != auxiliaries) {
    57         for (size_t iAux=0; iAux<auxiliaries->size(); ++iAux) {
    58           const G4ThreeVector pos((*auxiliaries)[iAux]);
    59           if (trajectoryLine.size() >0) {
    60             if (pos != trajectoryLine[trajectoryLine.size()-1]) {
    61               trajectoryLine.push_back(pos);
    62               auxiliaryPoints.push_back(pos);
    63             }
    64           } else {
    65             trajectoryLine.push_back(pos);
    66             auxiliaryPoints.push_back(pos);
    67           }
    68         }
    69       }
    70       const G4ThreeVector pos(aTrajectoryPoint->GetPosition());
    71       if (trajectoryLine.size() >0) {
    72         if (pos != trajectoryLine[trajectoryLine.size()-1]) {
    73           trajectoryLine.push_back(pos);
    74           stepPoints.push_back(pos);
    75         }
    76       } else {
    77         trajectoryLine.push_back(pos);
    78         stepPoints.push_back(pos);
    79       }
    80     }
     58      const G4ThreeVector& trajectoryPointPosition =
     59        aTrajectoryPoint->GetPosition();
     60
     61      // Only store if first or if different
     62      if (positions.size() == 0 ||
     63          trajectoryPointPosition != positions[positions.size()-1]) {
     64
     65        const std::vector<G4ThreeVector>* auxiliaries
     66          = aTrajectoryPoint->GetAuxiliaryPoints();
     67        if (0 != auxiliaries) {
     68          for (size_t iAux=0; iAux<auxiliaries->size(); ++iAux) {
     69            const G4ThreeVector& auxPointPosition = (*auxiliaries)[iAux];
     70            if (positions.size() == 0 ||
     71                auxPointPosition != positions[positions.size()-1]) {
     72              // Only store if first or if different
     73              positions.push_back(trajectoryPointPosition);
     74              trajectoryLine.push_back(auxPointPosition);
     75              auxiliaryPoints.push_back(auxPointPosition);
     76            }
     77          }
     78        }
     79
     80        positions.push_back(trajectoryPointPosition);
     81        trajectoryLine.push_back(trajectoryPointPosition);
     82        stepPoints.push_back(trajectoryPointPosition);
     83      }
     84    }   
    8185  }
    8286
    … …  
    157161    // invalid.
    158162
     163    // Memory for last trajectory point position for auxiliary point
     164    // algorithm.  There are no auxiliary points for the first
     165    // trajectory point, so its initial value is immaterial.
    159166    G4ThreeVector lastTrajectoryPointPosition;
     167
     168    // Keep positions.  Don't store unless first or different.
     169    std::vector<G4ThreeVector> positions;
     170
    160171    for (G4int i=0; i<traj.GetPointEntries(); i++) {
     172
    161173      G4VTrajectoryPoint* aTrajectoryPoint = traj.GetPoint(i);
    162 
    163       // Pre- and Post-Point times from the trajectory point...
    164       G4double trajectoryPointPreTime = -std::numeric_limits<double>::max();
    165       G4double trajectoryPointPostTime = std::numeric_limits<double>::max();
    166       std::vector<G4AttValue>* trajectoryPointAttValues =
    167         aTrajectoryPoint->CreateAttValues();
    168       if (!trajectoryPointAttValues) {
    169         G4cout << "G4TrajectoryDrawerUtils::GetTimes: no att values."
    170                << G4endl;
    171         return;
    172       } else {
    173         G4bool foundPreTime = false, foundPostTime = false;
    174         for (std::vector<G4AttValue>::iterator i =
    175                trajectoryPointAttValues->begin();
    176              i != trajectoryPointAttValues->end(); ++i) {
    177           if (i->GetName() == "PreT") {
    178             trajectoryPointPreTime =
    179               G4UIcommand::ConvertToDimensionedDouble(i->GetValue());
    180             foundPreTime = true;
    181           }
    182           if (i->GetName() == "PostT") {
    183             trajectoryPointPostTime =
    184               G4UIcommand::ConvertToDimensionedDouble(i->GetValue());
    185             foundPostTime = true;
    186           }
    187         }
    188         if (!foundPreTime || !foundPostTime) {
    189           static G4bool warnedTimesNotFound = false;
    190           if (!warnedTimesNotFound) {
    191             G4cout <<
    192               "WARNING: G4TrajectoryDrawerUtils::GetTimes: times not found."
    193                    << G4endl;
    194             warnedTimesNotFound = true;
     174      const G4ThreeVector& trajectoryPointPosition =
     175        aTrajectoryPoint->GetPosition();
     176
     177      // Only store if first or if different
     178      if (positions.size() == 0 ||
     179          trajectoryPointPosition != positions[positions.size()-1]) {
     180
     181        // Pre- and Post-Point times from the trajectory point...
     182        G4double trajectoryPointPreTime = -std::numeric_limits<double>::max();
     183        G4double trajectoryPointPostTime = std::numeric_limits<double>::max();
     184        std::vector<G4AttValue>* trajectoryPointAttValues =
     185          aTrajectoryPoint->CreateAttValues();
     186        if (!trajectoryPointAttValues) {
     187          G4cout << "G4TrajectoryDrawerUtils::GetTimes: no att values."
     188                 << G4endl;
     189          return;
     190        } else {
     191          G4bool foundPreTime = false, foundPostTime = false;
     192          for (std::vector<G4AttValue>::iterator i =
     193                 trajectoryPointAttValues->begin();
     194               i != trajectoryPointAttValues->end(); ++i) {
     195            if (i->GetName() == "PreT") {
     196              trajectoryPointPreTime =
     197                G4UIcommand::ConvertToDimensionedDouble(i->GetValue());
     198              foundPreTime = true;
     199            }
     200            if (i->GetName() == "PostT") {
     201              trajectoryPointPostTime =
     202                G4UIcommand::ConvertToDimensionedDouble(i->GetValue());
     203              foundPostTime = true;
     204            }
    195205          }
    196           return;
     206          if (!foundPreTime || !foundPostTime) {
     207            static G4bool warnedTimesNotFound = false;
     208            if (!warnedTimesNotFound) {
     209              G4cout <<
     210                "WARNING: G4TrajectoryDrawerUtils::GetTimes: times not found."
     211                     << G4endl;
     212              warnedTimesNotFound = true;
     213            }
     214            return;
     215          }
    197216        }
    198       }
    199      
    200       const G4ThreeVector& trajectoryPointPosition =
    201         aTrajectoryPoint->GetPosition();
    202 
    203       const std::vector<G4ThreeVector>* auxiliaries
    204         = aTrajectoryPoint->GetAuxiliaryPoints();
    205      
    206       if (0 != auxiliaries) {
    207         for (size_t iAux=0; iAux<auxiliaries->size(); ++iAux) {
    208           // Interpolate time for auxiliary points...
    209           const G4ThreeVector pos((*auxiliaries)[iAux]);
    210           G4double s1 = (pos - lastTrajectoryPointPosition).mag();
    211           G4double s2 = (trajectoryPointPosition - pos).mag();
    212           G4double t = trajectoryPointPreTime +
    213             (trajectoryPointPostTime - trajectoryPointPreTime) *
    214             (s1 / (s1 + s2));
    215           trajectoryLineTimes.push_back(t);
    216           auxiliaryPointTimes.push_back(t);
     217
     218        const std::vector<G4ThreeVector>* auxiliaries
     219          = aTrajectoryPoint->GetAuxiliaryPoints();
     220        if (0 != auxiliaries) {
     221          for (size_t iAux=0; iAux<auxiliaries->size(); ++iAux) {
     222            // Interpolate time for auxiliary points...
     223            const G4ThreeVector& auxPointPosition = (*auxiliaries)[iAux];
     224            G4double s1 = (auxPointPosition - lastTrajectoryPointPosition).mag();
     225            G4double s2 = (trajectoryPointPosition - auxPointPosition).mag();
     226            G4double t = trajectoryPointPreTime +
     227              (trajectoryPointPostTime - trajectoryPointPreTime) *
     228              (s1 / (s1 + s2));
     229            // Only store if first or if different
     230            if (positions.size() == 0 ||
     231                auxPointPosition != positions[positions.size()-1]) {
     232              positions.push_back(trajectoryPointPosition);
     233              trajectoryLineTimes.push_back(t);
     234              auxiliaryPointTimes.push_back(t);
     235            }
     236          }
    217237        }
    218       }
    219 
    220       trajectoryLineTimes.push_back(trajectoryPointPostTime);
    221       stepPointTimes.push_back(trajectoryPointPostTime);
    222 
    223       lastTrajectoryPointPosition = trajectoryPointPosition;
     238
     239        positions.push_back(trajectoryPointPosition);
     240        trajectoryLineTimes.push_back(trajectoryPointPostTime);
     241        stepPointTimes.push_back(trajectoryPointPostTime);
     242
     243        lastTrajectoryPointPosition = trajectoryPointPosition;
     244      }
    224245    }   
    225246  }
    … …  
    270291  {
    271292    // Draw without time slice information
     293#ifdef G4DEBUG_VIS_MODELING
     294    printf("G4TrajetoryDrawerUtils::DrawWithoutTime   vvvvv\n");
     295#endif
    272296
    273297    G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
    … …  
    305329      pVVisManager->Draw(stepPoints);
    306330    }
     331#ifdef G4DEBUG_VIS_MODELING
     332    printf("G4TrajetoryDrawerUtils::DrawWithoutTime   ^^^^^\n");
     333#endif
    307334  }
    308335

  • trunk/source/visualization/modeling/src/G4TrajectoryFilterFactories.cc

    r1337 r1346  
    2525//
    2626/// $Id: G4TrajectoryFilterFactories.cc,v 1.5 2006/09/12 18:53:03 tinslay Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929//

  • trunk/source/visualization/modeling/src/G4TrajectoryGenericDrawer.cc

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryGenericDrawer.cc,v 1.3 2010/05/11 11:31:31 allison Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay May 2006

  • trunk/source/visualization/modeling/src/G4TrajectoryModelFactories.cc

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryModelFactories.cc,v 1.7 2006/09/12 18:53:03 tinslay 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/modeling/src/G4TrajectoryOriginVolumeFilter.cc

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryOriginVolumeFilter.cc,v 1.3 2006/08/25 19:44:14 tinslay Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Filter trajectories according to volume name. Only registered

  • trunk/source/visualization/modeling/src/G4TrajectoryParticleFilter.cc

    r1337 r1346  
    2525//
    2626// $Id: G4TrajectoryParticleFilter.cc,v 1.3 2006/08/25 19:44:14 tinslay Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Filter trajectories according to particle type. Only registered

  • trunk/source/visualization/modeling/src/G4VModel.cc

    r1337 r1346  
    2626//
    2727// $Id: G4VModel.cc,v 1.14 2006/11/01 10:33:00 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/source/visualization/modeling/src/G4VTrajectoryModel.cc

    r1337 r1346  
    2525//
    2626// $Id: G4VTrajectoryModel.cc,v 1.3 2006/06/29 21:33:26 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay May 2006
Note: See TracChangeset for help on using the changeset viewer.