Changeset 1348
- Timestamp:
- Jan 5, 2011, 12:19:12 PM (13 years ago)
- Location:
- trunk/source/visualization
- Files:
-
- 73 edited
-
FukuiRenderer/CVS/Entries (modified) (1 diff)
-
FukuiRenderer/GNUmakefile (modified) (2 diffs)
-
FukuiRenderer/History (modified) (2 diffs)
-
FukuiRenderer/include/CVS/Entries (modified) (1 diff)
-
FukuiRenderer/src/CVS/Entries (modified) (1 diff)
-
OpenGL/CVS/Entries (modified) (1 diff)
-
OpenGL/History (modified) (2 diffs)
-
OpenGL/include/CVS/Entries (modified) (1 diff)
-
OpenGL/include/G4OpenGL.hh (modified) (1 diff)
-
OpenGL/include/G4OpenGLTransform3D.hh (modified) (2 diffs)
-
OpenGL/src/CVS/Entries (modified) (1 diff)
-
OpenGL/src/G4OpenGLSceneHandler.cc (modified) (2 diffs)
-
OpenGL/src/G4OpenGLTransform3D.cc (modified) (3 diffs)
-
OpenGL/src/G4OpenGLViewer.cc (modified) (3 diffs)
-
OpenGL/src/G4OpenGLXViewer.cc (modified) (4 diffs)
-
OpenInventor/CVS/Entries (modified) (1 diff)
-
OpenInventor/History (modified) (2 diffs)
-
OpenInventor/include/CVS/Entries (modified) (1 diff)
-
OpenInventor/include/HEPVis/CVS/Entries (modified) (1 diff)
-
OpenInventor/include/HEPVis/actions/CVS/Entries (modified) (1 diff)
-
OpenInventor/include/HEPVis/misc/CVS/Entries (modified) (1 diff)
-
OpenInventor/include/HEPVis/nodekits/CVS/Entries (modified) (1 diff)
-
OpenInventor/include/HEPVis/nodes/CVS/Entries (modified) (1 diff)
-
OpenInventor/src/CVS/Entries (modified) (1 diff)
-
OpenInventor/src/G4OpenInventorSceneHandler.cc (modified) (2 diffs)
-
OpenInventor/src/SbPainterPS.cc (modified) (1 diff)
-
OpenInventor/src/SoMarkerSet.cc (modified) (3 diffs)
-
OpenInventor/src/SoPolyhedron.cc (modified) (3 diffs)
-
RayTracer/CVS/Entries (modified) (1 diff)
-
RayTracer/GNUmakefile (modified) (1 diff)
-
RayTracer/History (modified) (2 diffs)
-
RayTracer/include/CVS/Entries (modified) (1 diff)
-
RayTracer/src/CVS/Entries (modified) (1 diff)
-
Tree/CVS/Entries (modified) (1 diff)
-
Tree/GNUmakefile (modified) (2 diffs)
-
Tree/History (modified) (2 diffs)
-
Tree/include/CVS/Entries (modified) (1 diff)
-
Tree/src/CVS/Entries (modified) (1 diff)
-
VRML/CVS/Entries (modified) (1 diff)
-
VRML/GNUmakefile (modified) (3 diffs)
-
VRML/History (modified) (2 diffs)
-
VRML/g4vrmlview/CVS/Entries (modified) (1 diff)
-
VRML/include/CVS/Entries (modified) (1 diff)
-
VRML/src/CVS/Entries (modified) (1 diff)
-
externals/CVS/Entries (modified) (1 diff)
-
externals/gl2ps/CVS/Entries (modified) (1 diff)
-
externals/gl2ps/GNUmakefile (modified) (1 diff)
-
externals/gl2ps/History (modified) (2 diffs)
-
externals/gl2ps/include/CVS/Entries (modified) (1 diff)
-
externals/gl2ps/src/CVS/Entries (modified) (1 diff)
-
externals/zlib/CVS/Entries (modified) (1 diff)
-
externals/zlib/include/CVS/Entries (modified) (1 diff)
-
externals/zlib/src/CVS/Entries (modified) (1 diff)
-
gMocren/CVS/Entries (modified) (1 diff)
-
gMocren/GNUmakefile (modified) (2 diffs)
-
gMocren/History (modified) (2 diffs)
-
gMocren/include/CVS/Entries (modified) (1 diff)
-
gMocren/src/CVS/Entries (modified) (1 diff)
-
management/CVS/Entries (modified) (1 diff)
-
management/GNUmakefile (modified) (1 diff)
-
management/History (modified) (2 diffs)
-
management/include/CVS/Entries (modified) (1 diff)
-
management/include/G4VisListManager.hh (modified) (2 diffs)
-
management/src/CVS/Entries (modified) (1 diff)
-
management/src/G4VisCommandsScene.cc (modified) (3 diffs)
-
management/src/G4VisCommandsSceneAdd.cc (modified) (3 diffs)
-
modeling/CVS/Entries (modified) (1 diff)
-
modeling/History (modified) (2 diffs)
-
modeling/include/CVS/Entries (modified) (1 diff)
-
modeling/include/G4AttributeFilterT.hh (modified) (3 diffs)
-
modeling/src/CVS/Entries (modified) (1 diff)
-
modeling/src/G4TrajectoryDrawByAttribute.cc (modified) (3 diffs)
-
modeling/src/G4TrajectoryDrawerUtils.cc (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/visualization/FukuiRenderer/CVS/Entries
r1347 r1348 1 1 D/include//// 2 2 D/src//// 3 /CMakeLists.txt/1.1/Wed Sep 29 19:11:33 2010// Tgeant4-09-04-ref-004 / sources.cmake/1.1/Wed Sep 29 19:11:41 2010//Tgeant4-09-04-ref-005 / CUSTOMIZE/1.2/Mon Sep 2 05:41:38 2002//Tgeant4-09-04-ref-006 / GNUmakefile/1.6/Wed Oct 21 14:59:17 2009//Tgeant4-09-04-ref-007 / History/1.29/Thu Nov 11 01:13:42 2010//Tgeant4-09-04-ref-008 / README/1.2/Thu Nov 4 02:06:43 1999//Tgeant4-09-04-ref-003 /CMakeLists.txt/1.1/Wed Sep 29 19:11:33 2010// 4 /CUSTOMIZE/1.2/Mon Sep 2 05:41:38 2002// 5 /README/1.2/Thu Nov 4 02:06:43 1999// 6 /sources.cmake/1.2/Mon Jan 3 14:34:28 2011// 7 /GNUmakefile/1.7/Mon Jan 3 14:32:22 2011// 8 /History/1.30/Mon Jan 3 14:35:09 2011// -
trunk/source/visualization/FukuiRenderer/GNUmakefile
r1140 r1348 1 # $Id: GNUmakefile,v 1. 6 2009/10/21 14:59:17 allisonExp $1 # $Id: GNUmakefile,v 1.7 2011/01/03 14:32:22 lgarnier Exp $ 2 2 3 3 name := G4FR … … 18 18 include $(G4INSTALL)/config/interactivity.gmk 19 19 20 # NO need OGL, then reset OGLGLAGS 21 OGLFLAGS = "" 22 OGLLIBS = "" 23 # NO need QT, then reset QTGLAGS 24 QTFLAGS = "" 25 QTLIBS = "" 26 GLQTLIBS = "" 27 20 28 CPPFLAGS += -I$(G4BASE)/visualization/management/include 21 29 CPPFLAGS += -I$(G4BASE)/visualization/modeling/include -
trunk/source/visualization/FukuiRenderer/History
r1347 r1348 1 $Id: History,v 1. 29 2010/11/11 01:13:42 akimuraExp $1 $Id: History,v 1.30 2011/01/03 14:35:09 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 20 20 History file for visualization/FukuiRenderer sub-category 21 21 --------------------------------------------------------- 22 23 23, December L. Garnier 24 - GNUmakefile : Remove OpenGL/Qt stuff from Makefile 22 25 23 26 11 November 2010 Akinori Kimura (DAWN-V09-03-01) -
trunk/source/visualization/FukuiRenderer/include/CVS/Entries
r1347 r1348 1 /G4DAWNFILE.hh/1.9/Thu Jun 29 21:16:28 2006// Tgeant4-09-04-ref-002 /G4DAWNFILESceneHandler.hh/1.18/Sun May 30 10:18:32 2010// Tgeant4-09-04-ref-003 /G4DAWNFILEViewer.hh/1.10/Thu Jun 29 21:16:32 2006// Tgeant4-09-04-ref-004 /G4FRClientServer.hh/1.7/Thu Jun 29 21:16:34 2006// Tgeant4-09-04-ref-005 /G4FRConst.hh/1.7/Thu Jun 29 21:16:36 2006// Tgeant4-09-04-ref-006 /G4FRFeatures.hh/1.6/Thu Jun 29 21:16:38 2006// Tgeant4-09-04-ref-007 /G4FRSceneFunc.icc/1.16/Thu Nov 11 01:13:42 2010// Tgeant4-09-04-ref-008 /G4FRofstream.hh/1.9/Thu Jun 29 21:16:42 2006// Tgeant4-09-04-ref-009 /G4FukuiRenderer.hh/1.8/Thu Jun 29 21:16:44 2006// Tgeant4-09-04-ref-0010 /G4FukuiRendererSceneHandler.hh/1.17/Sun May 30 10:18:32 2010// Tgeant4-09-04-ref-0011 /G4FukuiRendererViewer.hh/1.8/Thu Jun 29 21:16:48 2006// Tgeant4-09-04-ref-001 /G4DAWNFILE.hh/1.9/Thu Jun 29 21:16:28 2006// 2 /G4DAWNFILESceneHandler.hh/1.18/Sun May 30 10:18:32 2010// 3 /G4DAWNFILEViewer.hh/1.10/Thu Jun 29 21:16:32 2006// 4 /G4FRClientServer.hh/1.7/Thu Jun 29 21:16:34 2006// 5 /G4FRConst.hh/1.7/Thu Jun 29 21:16:36 2006// 6 /G4FRFeatures.hh/1.6/Thu Jun 29 21:16:38 2006// 7 /G4FRSceneFunc.icc/1.16/Thu Nov 11 01:13:42 2010// 8 /G4FRofstream.hh/1.9/Thu Jun 29 21:16:42 2006// 9 /G4FukuiRenderer.hh/1.8/Thu Jun 29 21:16:44 2006// 10 /G4FukuiRendererSceneHandler.hh/1.17/Sun May 30 10:18:32 2010// 11 /G4FukuiRendererViewer.hh/1.8/Thu Jun 29 21:16:48 2006// 12 12 D -
trunk/source/visualization/FukuiRenderer/src/CVS/Entries
r1347 r1348 1 /G4DAWNFILE.cc/1.11/Thu Jun 29 21:16:50 2006// Tgeant4-09-04-ref-002 /G4DAWNFILESceneHandler.cc/1.19/Thu Nov 11 01:13:42 2010// Tgeant4-09-04-ref-003 /G4DAWNFILEViewer.cc/1.21/Thu Nov 11 01:13:42 2010// Tgeant4-09-04-ref-004 /G4FRClientServer.cc/1.7/Thu Nov 11 01:13:42 2010// Tgeant4-09-04-ref-005 /G4FukuiRenderer.cc/1.10/Thu Nov 11 01:13:42 2010// Tgeant4-09-04-ref-006 /G4FukuiRendererSceneHandler.cc/1.15/Thu Nov 11 01:13:42 2010// Tgeant4-09-04-ref-007 /G4FukuiRendererViewer.cc/1.12/Thu Nov 11 01:13:42 2010// Tgeant4-09-04-ref-001 /G4DAWNFILE.cc/1.11/Thu Jun 29 21:16:50 2006// 2 /G4DAWNFILESceneHandler.cc/1.19/Thu Nov 11 01:13:42 2010// 3 /G4DAWNFILEViewer.cc/1.21/Thu Nov 11 01:13:42 2010// 4 /G4FRClientServer.cc/1.7/Thu Nov 11 01:13:42 2010// 5 /G4FukuiRenderer.cc/1.10/Thu Nov 11 01:13:42 2010// 6 /G4FukuiRendererSceneHandler.cc/1.15/Thu Nov 11 01:13:42 2010// 7 /G4FukuiRendererViewer.cc/1.12/Thu Nov 11 01:13:42 2010// 8 8 D -
trunk/source/visualization/OpenGL/CVS/Entries
r1346 r1348 1 1 D/include//// 2 2 D/src//// 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 3 /CMakeLists.txt/1.1/Wed Sep 29 19:12:06 2010// 4 /GNUmakefile/1.13/dummy timestamp from new-entry// 5 /History/1.195/Mon Jan 3 14:39:51 2011// 6 /sources.cmake/1.5/Wed Dec 1 17:12:18 2010// 7 /Doxyfile/1.4/Fri May 12 13:08:40 2006// -
trunk/source/visualization/OpenGL/History
r1346 r1348 1 $Id: History,v 1.19 3 2010/11/13 10:28:40allison Exp $1 $Id: History,v 1.195 2010/12/27 12:57:43 allison Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 17 17 * Reverse chronological order (last date on top), please * 18 18 ---------------------------------------------------------- 19 20 4th January 2011 Laurent Garnier 21 - Try to fix mix between GL include from X11 and GL include from Qt (APPLE stuff) 22 23 27th December 2010 John Allison (opengl-V09-04-00) 24 - Tagged. 25 26 11th December 2010 John Allison 27 - Fixed some Coverity warnings. 19 28 20 29 13th November 2010 John Allison (opengl-V09-03-10) -
trunk/source/visualization/OpenGL/include/CVS/Entries
r1346 r1348 1 /G4OpenGL.hh/1.9/dummy timestamp from new-entry// Tgeant4-09-04-ref-002 /G4OpenGLBitMapStore.hh/1.4/dummy timestamp from new-entry// Tgeant4-09-04-ref-003 /G4OpenGLFontBaseStore.hh/1.4/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-004 /G4OpenGLImmediateQt.hh/1.2/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-005 /G4OpenGLImmediateQtViewer.hh/1.7/Tue Dec 7 16:11:32 2010// Tgeant4-09-04-ref-006 /G4OpenGLImmediateSceneHandler.hh/1.15/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-007 /G4OpenGLImmediateViewer.hh/1.10/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-008 /G4OpenGLImmediateWin32.hh/1.8/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-009 /G4OpenGLImmediateWin32Viewer.hh/1.10/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-0010 /G4OpenGLImmediateX.hh/1.8/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-0011 /G4OpenGLImmediateXViewer.hh/1.10/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-0012 /G4OpenGLImmediateXm.hh/1.8/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-0013 /G4OpenGLImmediateXmViewer.hh/1.10/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-0014 /G4OpenGLQtExportDialog.hh/1.7/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-0015 /G4OpenGLQtMovieDialog.hh/1.4/Tue Oct 7 05:36:11 2008// Tgeant4-09-04-ref-0016 /G4OpenGLQtViewer.hh/1.25/Thu Nov 25 11:06:38 2010// Tgeant4-09-04-ref-0017 /G4OpenGLSceneHandler.hh/1.30/dummy timestamp from new-entry// Tgeant4-09-04-ref-0018 /G4OpenGLSceneHandler.icc/1.9/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-0019 /G4OpenGLStoredQt.hh/1.2/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-0020 /G4OpenGLStoredQtViewer.hh/1.10/dummy timestamp from new-entry// Tgeant4-09-04-ref-0021 /G4OpenGLStoredSceneHandler.hh/1.32/Fri Nov 26 15:30:48 2010// Tgeant4-09-04-ref-0022 /G4OpenGLStoredViewer.hh/1.10/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-0023 /G4OpenGLStoredWin32.hh/1.8/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-0024 /G4OpenGLStoredWin32Viewer.hh/1.8/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-0025 /G4OpenGLStoredX.hh/1.8/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-0026 /G4OpenGLStoredXViewer.hh/1.8/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-0027 /G4OpenGLStoredXm.hh/1.7/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-0028 /G4OpenGLStoredXmViewer.hh/1.8/Wed Feb 4 16:48:40 2009// Tgeant4-09-04-ref-0029 /G4OpenGLTransform3D.hh/1. 8/Wed Feb 4 16:48:41 2009//Tgeant4-09-04-ref-0030 /G4OpenGLViewer.hh/1.33/dummy timestamp from new-entry// Tgeant4-09-04-ref-0031 /G4OpenGLViewerMessenger.hh/1.8/Fri Nov 5 06:25:23 2010// Tgeant4-09-04-ref-0032 /G4OpenGLWin32Viewer.hh/1.15/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0033 /G4OpenGLXViewer.hh/1.32/dummy timestamp from new-entry// Tgeant4-09-04-ref-0034 /G4OpenGLXmBox.hh/1.8/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0035 /G4OpenGLXmFourArrowButtons.hh/1.7/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0036 /G4OpenGLXmFramedBox.hh/1.8/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0037 /G4OpenGLXmPushButton.hh/1.8/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0038 /G4OpenGLXmRadioButton.hh/1.8/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0039 /G4OpenGLXmResources.hh/1.6/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0040 /G4OpenGLXmSeparator.hh/1.7/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0041 /G4OpenGLXmSliderBar.hh/1.8/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0042 /G4OpenGLXmTextField.hh/1.8/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0043 /G4OpenGLXmTopLevelShell.hh/1.7/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0044 /G4OpenGLXmVWidgetComponent.hh/1.7/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0045 /G4OpenGLXmVWidgetContainer.hh/1.7/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0046 /G4OpenGLXmVWidgetObject.hh/1.7/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0047 /G4OpenGLXmVWidgetShell.hh/1.7/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0048 /G4OpenGLXmViewer.hh/1.11/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0049 /G4OpenGLXmViewerMessenger.hh/1.5/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-001 /G4OpenGL.hh/1.9/dummy timestamp from new-entry// 2 /G4OpenGLBitMapStore.hh/1.4/dummy timestamp from new-entry// 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/Tue Dec 7 16:11:32 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/Thu Nov 25 11:06:38 2010// 17 /G4OpenGLSceneHandler.hh/1.30/dummy timestamp from new-entry// 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/dummy timestamp from new-entry// 21 /G4OpenGLStoredSceneHandler.hh/1.32/Fri Nov 26 15:30:48 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.9/Mon Jan 3 14:39:51 2011// 30 /G4OpenGLViewer.hh/1.33/dummy timestamp from new-entry// 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/dummy timestamp from new-entry// 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// 50 50 D -
trunk/source/visualization/OpenGL/include/G4OpenGL.hh
r1346 r1348 44 44 # include <GL/gl.h> 45 45 # include <GL/glu.h> 46 #endif 47 #ifdef G4VIS_USE_OPENGLXM 48 # include <GL/gl.h> 49 # include <GL/glu.h> 50 #endif 51 #ifdef G4VIS_USE_OPENGLWIN32 52 # include <GL/gl.h> 53 # include <GL/glu.h> 54 #endif 46 55 //# Do NOT include glx Here ! It has to be done, after all <Qxx...> includes 47 56 //# include <GL/glx.h> 48 #else 49 # ifdef __APPLE__ &&G4VIS_USE_OPENGLQT50 // Already done in Qt57 58 #ifdef G4VIS_USE_OPENGLQT 59 // Already done in Darwin-g++.gmk 51 60 //# include <OpenGL/gl.h> 52 61 //# include <OpenGL/glu.h> 53 # include <qgl.h> 54 # else 55 # include <GL/gl.h> 56 # include <GL/glu.h> 57 # endif 62 #include <qgl.h> 58 63 #endif 64 59 65 60 66 #define G4OPENGL_FLT_BIG 1.e20 -
trunk/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh
r1343 r1348 25 25 // 26 26 // 27 // $Id: G4OpenGLTransform3D.hh,v 1. 8 2009/02/04 16:48:41 lgarnierExp $27 // $Id: G4OpenGLTransform3D.hh,v 1.9 2010/12/11 17:04:07 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 39 39 40 40 #include "G4Transform3D.hh" 41 42 41 #include "G4OpenGL.hh" 43 42 44 class G4OpenGLTransform3D : public G4Transform3D{43 class G4OpenGLTransform3D { 45 44 public: 46 45 G4OpenGLTransform3D (const G4Transform3D &t); 47 const GLdouble* GetGLMatrix () ;46 const GLdouble* GetGLMatrix () {return m;} 48 47 private: 49 48 GLdouble m[16]; -
trunk/source/visualization/OpenGL/src/CVS/Entries
r1346 r1348 1 /G4OpenGLBitMapStore.cc/1.5/Mon Jan 19 16:53:42 2009// Tgeant4-09-04-ref-002 /G4OpenGLFontBaseStore.cc/1.4/Mon Jan 19 16:53:42 2009// Tgeant4-09-04-ref-003 /G4OpenGLImmediateQt.cc/1.6/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-004 /G4OpenGLImmediateQtViewer.cc/1.22/Wed Jun 23 13:29:23 2010// Tgeant4-09-04-ref-005 /G4OpenGLImmediateSceneHandler.cc/1.35/Thu Jun 3 20:35:19 2010// Tgeant4-09-04-ref-006 /G4OpenGLImmediateViewer.cc/1.10/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-007 /G4OpenGLImmediateWin32.cc/1.13/Wed May 20 09:58:10 2009// Tgeant4-09-04-ref-008 /G4OpenGLImmediateWin32Viewer.cc/1.19/Wed May 20 10:19:51 2009// Tgeant4-09-04-ref-009 /G4OpenGLImmediateX.cc/1.15/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0010 /G4OpenGLImmediateXViewer.cc/1.19/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0011 /G4OpenGLImmediateXm.cc/1.15/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0012 /G4OpenGLImmediateXmViewer.cc/1.21/Wed Apr 8 16:55:44 2009// Tgeant4-09-04-ref-0013 /G4OpenGLQtExportDialog.cc/1.9/Fri Oct 24 14:17:10 2008// Tgeant4-09-04-ref-0014 /G4OpenGLQtMovieDialog.cc/1.8/Fri Oct 24 13:49:19 2008// Tgeant4-09-04-ref-0015 /G4OpenGLQtViewer.cc/1.55/dummy timestamp from new-entry// Tgeant4-09-04-ref-0016 /G4OpenGLSceneHandler.cc/1. 59/dummy timestamp from new-entry//Tgeant4-09-04-ref-0017 /G4OpenGLStoredQt.cc/1.10/Mon Jan 19 16:26:40 2009// Tgeant4-09-04-ref-0018 /G4OpenGLStoredQtViewer.cc/1.32/Mon Dec 6 16:50:27 2010// Tgeant4-09-04-ref-0019 /G4OpenGLStoredSceneHandler.cc/1.46/dummy timestamp from new-entry// Tgeant4-09-04-ref-0020 /G4OpenGLStoredViewer.cc/1.29/dummy timestamp from new-entry// Tgeant4-09-04-ref-0021 /G4OpenGLStoredWin32.cc/1.15/Mon Jan 19 16:53:42 2009// Tgeant4-09-04-ref-0022 /G4OpenGLStoredWin32Viewer.cc/1.22/Wed May 20 13:19:09 2009// Tgeant4-09-04-ref-0023 /G4OpenGLStoredX.cc/1.15/Mon Jan 19 16:53:42 2009// Tgeant4-09-04-ref-0024 /G4OpenGLStoredXViewer.cc/1.27/Thu Jun 3 08:26:55 2010// Tgeant4-09-04-ref-0025 /G4OpenGLStoredXm.cc/1.12/Mon Jan 19 16:53:42 2009// Tgeant4-09-04-ref-0026 /G4OpenGLStoredXmViewer.cc/1.26/dummy timestamp from new-entry// Tgeant4-09-04-ref-0027 /G4OpenGLTransform3D.cc/1. 9/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-0028 /G4OpenGLViewer.cc/1.6 3/dummy timestamp from new-entry//Tgeant4-09-04-ref-0029 /G4OpenGLViewerMessenger.cc/1.21/Sun Nov 7 10:31:26 2010// Tgeant4-09-04-ref-0030 /G4OpenGLWin32Viewer.cc/1.20/Wed May 20 13:19:09 2009// Tgeant4-09-04-ref-0031 /G4OpenGLXViewer.cc/1.5 6/Result of merge//Tgeant4-09-04-ref-0032 /G4OpenGLXmBox.cc/1.8/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0033 /G4OpenGLXmConvenienceRoutines.cc/1.13/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0034 /G4OpenGLXmFourArrowButtons.cc/1.7/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0035 /G4OpenGLXmFramedBox.cc/1.8/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0036 /G4OpenGLXmMainMenubarCallbacks.cc/1.18/Tue Oct 20 12:47:45 2009// Tgeant4-09-04-ref-0037 /G4OpenGLXmPanningCallbacks.cc/1.12/Tue Nov 3 10:21:49 2009// Tgeant4-09-04-ref-0038 /G4OpenGLXmPushButton.cc/1.8/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0039 /G4OpenGLXmRadioButton.cc/1.8/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0040 /G4OpenGLXmRotationCallbacks.cc/1.17/Mon Jan 19 16:53:42 2009// Tgeant4-09-04-ref-0041 /G4OpenGLXmSeparator.cc/1.7/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0042 /G4OpenGLXmSliderBar.cc/1.8/Mon Jan 19 16:53:42 2009// Tgeant4-09-04-ref-0043 /G4OpenGLXmStyleCallbacks.cc/1.15/Mon Jan 19 16:53:42 2009// Tgeant4-09-04-ref-0044 /G4OpenGLXmTextField.cc/1.9/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0045 /G4OpenGLXmTopLevelShell.cc/1.7/Wed Feb 4 16:48:41 2009// Tgeant4-09-04-ref-0046 /G4OpenGLXmVWidgetComponent.cc/1.6/Mon Jan 19 16:53:42 2009// Tgeant4-09-04-ref-0047 /G4OpenGLXmVWidgetContainer.cc/1.7/Fri Mar 13 09:50:03 2009// Tgeant4-09-04-ref-0048 /G4OpenGLXmVWidgetObject.cc/1.7/Mon Dec 6 17:36:26 2010// Tgeant4-09-04-ref-0049 /G4OpenGLXmVWidgetShell.cc/1.6/Mon Jan 19 16:53:42 2009// Tgeant4-09-04-ref-0050 /G4OpenGLXmViewer.cc/1.31/Wed May 13 10:28:00 2009// Tgeant4-09-04-ref-0051 /G4OpenGLXmViewerMessenger.cc/1.5/Mon Jan 19 16:53:42 2009// Tgeant4-09-04-ref-0052 /G4OpenGLXmWindowHandlingCallbacks.cc/1.11/Wed May 13 10:28:00 2009// Tgeant4-09-04-ref-001 /G4OpenGLBitMapStore.cc/1.5/Mon Jan 19 16:53:42 2009// 2 /G4OpenGLFontBaseStore.cc/1.4/Mon Jan 19 16:53:42 2009// 3 /G4OpenGLImmediateQt.cc/1.6/Wed Feb 4 16:48:41 2009// 4 /G4OpenGLImmediateQtViewer.cc/1.22/Wed Jun 23 13:29:23 2010// 5 /G4OpenGLImmediateSceneHandler.cc/1.35/Thu Jun 3 20:35:19 2010// 6 /G4OpenGLImmediateViewer.cc/1.10/Wed Feb 4 16:48:41 2009// 7 /G4OpenGLImmediateWin32.cc/1.13/Wed May 20 09:58:10 2009// 8 /G4OpenGLImmediateWin32Viewer.cc/1.19/Wed May 20 10:19:51 2009// 9 /G4OpenGLImmediateX.cc/1.15/Wed Feb 4 16:48:41 2009// 10 /G4OpenGLImmediateXViewer.cc/1.19/Wed Feb 4 16:48:41 2009// 11 /G4OpenGLImmediateXm.cc/1.15/Wed Feb 4 16:48:41 2009// 12 /G4OpenGLImmediateXmViewer.cc/1.21/Wed Apr 8 16:55:44 2009// 13 /G4OpenGLQtExportDialog.cc/1.9/Fri Oct 24 14:17:10 2008// 14 /G4OpenGLQtMovieDialog.cc/1.8/Fri Oct 24 13:49:19 2008// 15 /G4OpenGLQtViewer.cc/1.55/dummy timestamp from new-entry// 16 /G4OpenGLSceneHandler.cc/1.60/Result of merge// 17 /G4OpenGLStoredQt.cc/1.10/Mon Jan 19 16:26:40 2009// 18 /G4OpenGLStoredQtViewer.cc/1.32/Mon Dec 6 16:50:27 2010// 19 /G4OpenGLStoredSceneHandler.cc/1.46/dummy timestamp from new-entry// 20 /G4OpenGLStoredViewer.cc/1.29/dummy timestamp from new-entry// 21 /G4OpenGLStoredWin32.cc/1.15/Mon Jan 19 16:53:42 2009// 22 /G4OpenGLStoredWin32Viewer.cc/1.22/Wed May 20 13:19:09 2009// 23 /G4OpenGLStoredX.cc/1.15/Mon Jan 19 16:53:42 2009// 24 /G4OpenGLStoredXViewer.cc/1.27/Thu Jun 3 08:26:55 2010// 25 /G4OpenGLStoredXm.cc/1.12/Mon Jan 19 16:53:42 2009// 26 /G4OpenGLStoredXmViewer.cc/1.26/dummy timestamp from new-entry// 27 /G4OpenGLTransform3D.cc/1.10/Mon Jan 3 14:39:51 2011// 28 /G4OpenGLViewer.cc/1.64/Result of merge// 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.57/Result of merge// 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/Mon Dec 6 17:36:26 2010// 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/Wed May 13 10:28:00 2009// 53 53 D -
trunk/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc
r1346 r1348 25 25 // 26 26 // 27 // $Id: G4OpenGLSceneHandler.cc,v 1. 59 2010/05/30 09:53:05allison Exp $27 // $Id: G4OpenGLSceneHandler.cc,v 1.60 2010/12/11 17:04:07 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 488 488 G4ViewParameters::DrawingStyle drawing_style = GetDrawingStyle (pVA); 489 489 490 //Get colour, etc... 491 G4bool transparency_enabled = true; 490 // Get colour, etc... 491 // Need access to data in G4OpenGLViewer. static_cast doesn't work 492 // with a virtual base class, so use dynamic_cast. No need to test 493 // the outcome since viewer is guaranteed to be a G4OpenGLViewer. 492 494 G4OpenGLViewer* pViewer = dynamic_cast<G4OpenGLViewer*>(fpViewer); 493 if (pViewer)transparency_enabled = pViewer->transparency_enabled;495 const G4bool& transparency_enabled = pViewer->transparency_enabled; 494 496 const G4Colour& c = pVA->GetColour(); 495 497 GLfloat materialColour [4]; -
trunk/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc
r1343 r1348 25 25 // 26 26 // 27 // $Id: G4OpenGLTransform3D.cc,v 1. 9 2009/01/19 16:53:42 lgarnierExp $27 // $Id: G4OpenGLTransform3D.cc,v 1.10 2010/12/11 17:04:07 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 37 37 #include "G4OpenGLTransform3D.hh" 38 38 39 G4OpenGLTransform3D::G4OpenGLTransform3D (const G4Transform3D &t): 40 G4Transform3D (t) {} 41 42 const GLdouble* G4OpenGLTransform3D::GetGLMatrix () 39 G4OpenGLTransform3D::G4OpenGLTransform3D (const G4Transform3D &t) 43 40 { 44 41 GLdouble *p = m; … … 47 44 for (size_t k=0; k<3; k++) 48 45 { 49 *p++ = operator()(k,i);46 *p++ = t(k,i); 50 47 } 51 48 *p++ = 0.; 52 49 } 53 50 m[15] = 1.; 54 return m;55 51 } 56 52 -
trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc
r1346 r1348 25 25 // 26 26 // 27 // $Id: G4OpenGLViewer.cc,v 1.6 3 2010/10/05 15:45:19 lgarnierExp $27 // $Id: G4OpenGLViewer.cc,v 1.64 2010/12/11 17:04:07 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 86 86 fPrintFilename ("G4OpenGL"), 87 87 fPrintFilenameIndex(0), 88 fWinSize_x(0), 89 fWinSize_y(0), 88 90 fPointSize (0), 89 91 fSizeHasChanged(0) … … 103 105 } 104 106 105 G4OpenGLViewer::~G4OpenGLViewer () {} 107 G4OpenGLViewer::~G4OpenGLViewer () 108 { 109 delete fGL2PSAction; 110 } 106 111 107 112 void G4OpenGLViewer::InitializeGLView () -
trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc
r1346 r1348 25 25 // 26 26 // 27 // $Id: G4OpenGLXViewer.cc,v 1.5 6 2010/11/10 17:57:16allison Exp $27 // $Id: G4OpenGLXViewer.cc,v 1.57 2010/12/11 17:04:07 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 77 77 78 78 #define NewString(str) \ 79 ((str) != NULL ? (strcpy((char*)malloc((unsigned)strlen(str) + 1), str)) : (char*)NULL)79 ((str) != 0 ? (strncpy((char*)malloc((unsigned)strlen(str) + 1), str, (unsigned)strlen(str) + 1)) : (char*)0) 80 80 81 81 #define USE_DEFAULT_COLORMAP 1 … … 256 256 if (G4VisManager::GetVerbosity() >= G4VisManager::confirmations) 257 257 G4cout << "Window name: " << fName << G4endl; 258 strncpy (charViewName, fName, 100);258 strncpy (charViewName, fName, 99); charViewName[99] = '\0'; 259 259 char *window_name = charViewName; 260 260 char *icon_name = charViewName; … … 386 386 cmap (0) 387 387 { 388 // To satisfy Coverity 389 xwa.visual = 0; 390 iconName.value = 0; 391 xwa.screen = 0; 392 windowName.value = 0; 393 388 394 GetXConnection (); 389 395 if (fViewId < 0) return; -
trunk/source/visualization/OpenInventor/CVS/Entries
r1347 r1348 1 1 D/include//// 2 2 D/src//// 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 5 /History/1.108/Wed Nov 10 17:53:22 2010//Tgeant4-09-04-ref-00 3 /CMakeLists.txt/1.1/Wed Sep 29 19:12:22 2010// 4 /History/1.110/Mon Jan 3 14:40:22 2011// 5 /sources.cmake/1.1/Wed Sep 29 19:12:30 2010// 6 /GNUmakefile/1.10/Tue Nov 17 11:33:18 2009// -
trunk/source/visualization/OpenInventor/History
r1347 r1348 1 $Id: History,v 1.1 08 2010/11/10 17:53:22allison Exp $1 $Id: History,v 1.110 2010/12/27 13:02:19 allison Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 20 20 History file for visualization/OpenInventor 21 21 ------------------------------------------- 22 23 27th December 2010 John Allison (openinventor-V09-04-00) 24 - Tagged. 25 26 11th December 2010 John Allison 27 - Fixed some Coverity warnings. 22 28 23 29 10th November 2010 John Allison (openinventor-V09-03-02) -
trunk/source/visualization/OpenInventor/include/CVS/Entries
r1347 r1348 1 1 D/HEPVis//// 2 /G4OpenInventor.hh/1.9/Thu Jun 29 21:20:22 2006// Tgeant4-09-04-ref-003 /G4OpenInventorSceneHandler.hh/1.33/Tue Mar 27 15:24:15 2007// Tgeant4-09-04-ref-004 /G4OpenInventorTransform3D.hh/1.7/Thu Jun 29 21:20:26 2006// Tgeant4-09-04-ref-005 /G4OpenInventorViewer.hh/1.27/Thu Jun 29 21:20:28 2006// Tgeant4-09-04-ref-006 /G4OpenInventorWin.hh/1.3/Thu Jun 29 21:20:30 2006// Tgeant4-09-04-ref-007 /G4OpenInventorWin32.hh/1.7/Thu Jun 29 21:20:32 2006// Tgeant4-09-04-ref-008 /G4OpenInventorWinViewer.hh/1.10/Fri Sep 18 12:48:43 2009// Tgeant4-09-04-ref-009 /G4OpenInventorX.hh/1.7/Thu Jun 29 21:20:36 2006// Tgeant4-09-04-ref-0010 /G4OpenInventorXt.hh/1.3/Thu Jun 29 21:20:38 2006// Tgeant4-09-04-ref-0011 /G4OpenInventorXtViewer.hh/1.15/Fri Sep 18 12:48:43 2009// Tgeant4-09-04-ref-0012 /Geant4_SoPolyhedron.h/1.6/Thu Jun 29 21:20:42 2006// Tgeant4-09-04-ref-0013 /SoG4LineSet.h/1.2/Wed Dec 13 15:49:51 2006// Tgeant4-09-04-ref-0014 /SoG4MarkerSet.h/1.2/Wed Dec 13 15:49:53 2006// Tgeant4-09-04-ref-0015 /SoG4Polyhedron.h/1.3/Mon Sep 17 16:08:00 2007// Tgeant4-09-04-ref-002 /G4OpenInventor.hh/1.9/Thu Jun 29 21:20:22 2006// 3 /G4OpenInventorSceneHandler.hh/1.33/Tue Mar 27 15:24:15 2007// 4 /G4OpenInventorTransform3D.hh/1.7/Thu Jun 29 21:20:26 2006// 5 /G4OpenInventorViewer.hh/1.27/Thu Jun 29 21:20:28 2006// 6 /G4OpenInventorWin.hh/1.3/Thu Jun 29 21:20:30 2006// 7 /G4OpenInventorWin32.hh/1.7/Thu Jun 29 21:20:32 2006// 8 /G4OpenInventorWinViewer.hh/1.10/Fri Sep 18 12:48:43 2009// 9 /G4OpenInventorX.hh/1.7/Thu Jun 29 21:20:36 2006// 10 /G4OpenInventorXt.hh/1.3/Thu Jun 29 21:20:38 2006// 11 /G4OpenInventorXtViewer.hh/1.15/Fri Sep 18 12:48:43 2009// 12 /Geant4_SoPolyhedron.h/1.6/Thu Jun 29 21:20:42 2006// 13 /SoG4LineSet.h/1.2/Wed Dec 13 15:49:51 2006// 14 /SoG4MarkerSet.h/1.2/Wed Dec 13 15:49:53 2006// 15 /SoG4Polyhedron.h/1.3/Mon Sep 17 16:08:00 2007// -
trunk/source/visualization/OpenInventor/include/HEPVis/CVS/Entries
r1347 r1348 3 3 D/nodekits//// 4 4 D/nodes//// 5 /SbGL.h/1.3/Thu Jun 29 21:20:44 2006// Tgeant4-09-04-ref-006 /SbMath.h/1.4/Thu Jun 29 21:20:46 2006// Tgeant4-09-04-ref-007 /SbPainter.h/1.3/Thu Jun 29 21:20:48 2006// Tgeant4-09-04-ref-008 /SbPainterPS.h/1.3/Thu Jun 29 21:20:50 2006// Tgeant4-09-04-ref-005 /SbGL.h/1.3/Thu Jun 29 21:20:44 2006// 6 /SbMath.h/1.4/Thu Jun 29 21:20:46 2006// 7 /SbPainter.h/1.3/Thu Jun 29 21:20:48 2006// 8 /SbPainterPS.h/1.3/Thu Jun 29 21:20:50 2006// -
trunk/source/visualization/OpenInventor/include/HEPVis/actions/CVS/Entries
r1347 r1348 1 /SoAlternateRepAction.h/1.3/Thu Jun 29 21:20:52 2006// Tgeant4-09-04-ref-002 /SoCounterAction.h/1.5/Thu Jun 29 21:20:54 2006// Tgeant4-09-04-ref-003 /SoGL2PSAction.h/1.7/Wed Feb 18 10:04:25 2009// Tgeant4-09-04-ref-001 /SoAlternateRepAction.h/1.3/Thu Jun 29 21:20:52 2006// 2 /SoCounterAction.h/1.5/Thu Jun 29 21:20:54 2006// 3 /SoGL2PSAction.h/1.7/Wed Feb 18 10:04:25 2009// 4 4 D -
trunk/source/visualization/OpenInventor/include/HEPVis/misc/CVS/Entries
r1347 r1348 1 /SoStyleCache.h/1.6/Thu Jun 29 21:21:14 2006// Tgeant4-09-04-ref-001 /SoStyleCache.h/1.6/Thu Jun 29 21:21:14 2006// 2 2 D -
trunk/source/visualization/OpenInventor/include/HEPVis/nodekits/CVS/Entries
r1347 r1348 1 /SoDetectorTreeKit.h/1.5/Thu Jun 29 21:21:16 2006// Tgeant4-09-04-ref-001 /SoDetectorTreeKit.h/1.5/Thu Jun 29 21:21:16 2006// 2 2 D -
trunk/source/visualization/OpenInventor/include/HEPVis/nodes/CVS/Entries
r1347 r1348 1 /SoBox.h/1.3/Thu Jun 29 21:21:18 2006// Tgeant4-09-04-ref-002 /SoCons.h/1.3/Thu Jun 29 21:21:20 2006// Tgeant4-09-04-ref-003 /SoImageWriter.h/1.3/Thu Jun 29 21:21:38 2006// Tgeant4-09-04-ref-004 /SoMarkerSet.h/1.3/Thu Jun 29 21:22:03 2006// Tgeant4-09-04-ref-005 /SoTrap.h/1.4/Thu Jun 29 21:22:06 2006// Tgeant4-09-04-ref-006 /SoTrd.h/1.3/Thu Jun 29 21:22:08 2006// Tgeant4-09-04-ref-007 /SoTubs.h/1.3/Thu Jun 29 21:22:10 2006// Tgeant4-09-04-ref-001 /SoBox.h/1.3/Thu Jun 29 21:21:18 2006// 2 /SoCons.h/1.3/Thu Jun 29 21:21:20 2006// 3 /SoImageWriter.h/1.3/Thu Jun 29 21:21:38 2006// 4 /SoMarkerSet.h/1.3/Thu Jun 29 21:22:03 2006// 5 /SoTrap.h/1.4/Thu Jun 29 21:22:06 2006// 6 /SoTrd.h/1.3/Thu Jun 29 21:22:08 2006// 7 /SoTubs.h/1.3/Thu Jun 29 21:22:10 2006// 8 8 D -
trunk/source/visualization/OpenInventor/src/CVS/Entries
r1347 r1348 1 /G4OpenInventor.cc/1.20/Thu Jun 29 21:22:12 2006// Tgeant4-09-04-ref-002 /G4OpenInventor SceneHandler.cc/1.55/Wed Feb 18 14:21:38 2009//Tgeant4-09-04-ref-003 /G4OpenInventor Transform3D.cc/1.8/Thu Jun 29 21:22:16 2006//Tgeant4-09-04-ref-004 /G4OpenInventor Viewer.cc/1.61/Wed Oct 6 10:09:57 2010//Tgeant4-09-04-ref-005 /G4OpenInventorWin .cc/1.8/Wed May 26 14:30:46 2010//Tgeant4-09-04-ref-006 /G4OpenInventor WinViewer.cc/1.27/Wed Nov 10 17:53:22 2010//Tgeant4-09-04-ref-007 /G4OpenInventorXt .cc/1.5/Wed May 26 14:30:46 2010//Tgeant4-09-04-ref-008 / G4OpenInventorXtViewer.cc/1.26/Wed Nov 10 17:53:22 2010//Tgeant4-09-04-ref-009 /SbPainter .cc/1.5/Thu Jun 29 21:22:30 2006//Tgeant4-09-04-ref-0010 /S bPainterPS.cc/1.5/Thu Jun 29 21:22:32 2006//Tgeant4-09-04-ref-0011 /So AlternateRepAction.cc/1.4/Thu Jun 29 21:22:34 2006//Tgeant4-09-04-ref-0012 /So Box.cc/1.8/Thu Jun 29 21:22:36 2006//Tgeant4-09-04-ref-0013 /SoCo ns.cc/1.8/Thu Jun 29 21:22:38 2006//Tgeant4-09-04-ref-0014 /So CounterAction.cc/1.7/Thu Jun 29 21:22:49 2006//Tgeant4-09-04-ref-0015 /So DetectorTreeKit.cc/1.13/Thu Jun 29 21:22:51 2006//Tgeant4-09-04-ref-0016 /So GL2PSAction.cc/1.9/Wed Feb 18 10:04:25 2009//Tgeant4-09-04-ref-0017 /So ImageWriter.cc/1.5/Thu Jun 29 21:22:55 2006//Tgeant4-09-04-ref-0018 /So MarkerSet.cc/1.8/Thu Jun 29 21:22:57 2006//Tgeant4-09-04-ref-0019 /So Polyhedron.cc/1.13/Tue Oct 23 14:54:06 2007//Tgeant4-09-04-ref-0020 /So StyleCache.cc/1.7/Thu Jun 29 21:23:01 2006//Tgeant4-09-04-ref-0021 /SoTr ap.cc/1.8/Thu Jun 29 21:23:03 2006//Tgeant4-09-04-ref-0022 /SoT rd.cc/1.8/Thu Jun 29 21:23:05 2006//Tgeant4-09-04-ref-0023 / SoTubs.cc/1.8/Thu Jun 29 21:23:07 2006//Tgeant4-09-04-ref-001 /G4OpenInventor.cc/1.20/Thu Jun 29 21:22:12 2006// 2 /G4OpenInventorTransform3D.cc/1.8/Thu Jun 29 21:22:16 2006// 3 /G4OpenInventorViewer.cc/1.61/Wed Oct 6 10:09:57 2010// 4 /G4OpenInventorWin.cc/1.8/Wed May 26 14:30:46 2010// 5 /G4OpenInventorWinViewer.cc/1.27/Wed Nov 10 17:53:22 2010// 6 /G4OpenInventorXt.cc/1.5/Wed May 26 14:30:46 2010// 7 /G4OpenInventorXtViewer.cc/1.26/Wed Nov 10 17:53:22 2010// 8 /SbPainter.cc/1.5/Thu Jun 29 21:22:30 2006// 9 /SbPainterPS.cc/1.6/Mon Jan 3 14:40:22 2011// 10 /SoAlternateRepAction.cc/1.4/Thu Jun 29 21:22:34 2006// 11 /SoBox.cc/1.8/Thu Jun 29 21:22:36 2006// 12 /SoCons.cc/1.8/Thu Jun 29 21:22:38 2006// 13 /SoCounterAction.cc/1.7/Thu Jun 29 21:22:49 2006// 14 /SoDetectorTreeKit.cc/1.13/Thu Jun 29 21:22:51 2006// 15 /SoGL2PSAction.cc/1.9/Wed Feb 18 10:04:25 2009// 16 /SoImageWriter.cc/1.5/Thu Jun 29 21:22:55 2006// 17 /SoMarkerSet.cc/1.9/Mon Jan 3 14:40:22 2011// 18 /SoPolyhedron.cc/1.14/Mon Jan 3 14:40:22 2011// 19 /SoStyleCache.cc/1.7/Thu Jun 29 21:23:01 2006// 20 /SoTrap.cc/1.8/Thu Jun 29 21:23:03 2006// 21 /SoTrd.cc/1.8/Thu Jun 29 21:23:05 2006// 22 /SoTubs.cc/1.8/Thu Jun 29 21:23:07 2006// 23 /G4OpenInventorSceneHandler.cc/1.56/Mon Jan 3 14:40:37 2011// 24 24 D -
trunk/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc
r1347 r1348 25 25 // 26 26 // 27 // $Id: G4OpenInventorSceneHandler.cc,v 1.5 5 2009/02/18 14:21:38 lgarnierExp $28 // GEANT4 tag $Name: geant4-09-04-ref-00$27 // $Id: G4OpenInventorSceneHandler.cc,v 1.56 2010/12/11 17:07:48 allison Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // … … 113 113 ,fReducedWireFrame(true) 114 114 ,fStyleCache(0) 115 ,fPreviewAndFull( false)115 ,fPreviewAndFull(true) 116 116 { 117 117 fStyleCache = new SoStyleCache; -
trunk/source/visualization/OpenInventor/src/SbPainterPS.cc
r529 r1348 65 65 ,fBufferCount(0) 66 66 ,fBufferString(NULL) 67 ,fBufferPointer(0) 67 68 ////////////////////////////////////////////////////////////////////////////// 68 69 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!// -
trunk/source/visualization/OpenInventor/src/SoMarkerSet.cc
r1196 r1348 719 719 GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]); 720 720 glBitmap(w,h,xorig,yorig,0.,0.,bitmap); 721 delete bitmap;721 delete [] bitmap; 722 722 } else if((aStyle>=18)&&(aStyle<36)) { 723 723 w = h = 7; … … 725 725 GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]); 726 726 glBitmap(w,h,xorig,yorig,0.,0.,bitmap); 727 delete bitmap;727 delete [] bitmap; 728 728 } else if((aStyle>=36)&&(aStyle<54)) { 729 729 w = h = 9; … … 731 731 GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]); 732 732 glBitmap(w,h,xorig,yorig,0.,0.,bitmap); 733 delete bitmap;733 delete [] bitmap; 734 734 } else { 735 735 return; -
trunk/source/visualization/OpenInventor/src/SoPolyhedron.cc
r609 r1348 343 343 separator->addChild(indexedFaceSet); 344 344 345 SbBool empty = TRUE;346 347 345 int nvert = fPolyhedron->GetNoVertices(); 348 346 int nface = fPolyhedron->GetNoFacets(); … … 374 372 coords[ipoint] = icoord + ipoint; 375 373 ipoint++; 376 empty = FALSE;377 378 374 } while (notLastEdge); 379 375 … … 397 393 delete [] points; 398 394 399 if(empty==TRUE) { 400 separator->unref(); 401 } else { 402 alternateRep.setValue(separator); 403 } 395 alternateRep.setValue(separator); 404 396 405 397 } else { -
trunk/source/visualization/RayTracer/CVS/Entries
r1347 r1348 1 1 D/include//// 2 2 D/src//// 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 5 /History/1.66/Wed Oct 27 08:00:36 2010//Tgeant4-09-04-ref-00 6 /README/1.1/Sat Jan 29 02:53:57 2000//Tgeant4-09-04-ref-00 3 /CMakeLists.txt/1.1/Wed Sep 29 19:12:38 2010// 4 /README/1.1/Sat Jan 29 02:53:57 2000// 5 /sources.cmake/1.1/Wed Sep 29 19:12:47 2010// 6 /GNUmakefile/1.14/Mon Jan 3 14:53:34 2011// 7 /History/1.67/Mon Jan 3 14:53:34 2011// -
trunk/source/visualization/RayTracer/GNUmakefile
r1346 r1348 1 # $Id: GNUmakefile,v 1.1 1 2005/11/18 23:07:04 allisonExp $1 # $Id: GNUmakefile,v 1.14 2011/01/03 14:53:34 lgarnier Exp $ 2 2 3 3 name := G4RayTracer -
trunk/source/visualization/RayTracer/History
r1347 r1348 1 $Id: History,v 1.6 6 2010/10/27 08:00:36 gcosmoExp $1 $Id: History,v 1.67 2011/01/03 14:53:34 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 24 24 History file for Ray Tracer category 25 25 --------------------------------------- 26 27 23, December L. Garnier 28 - GNUmakefile : Remove OpenGL/Qt stuff from Makefile 26 29 27 30 27th October 2010 Gabriele Cosmo (raytracer-V09-03-04) -
trunk/source/visualization/RayTracer/include/CVS/Entries
r1347 r1348 1 /G4RTJpeg.hh/1.6/Thu Jun 29 21:23:13 2006// Tgeant4-09-04-ref-002 /G4RTJpegCoder.hh/1.6/Thu Jun 29 21:23:15 2006// Tgeant4-09-04-ref-003 /G4RTJpegCoderTables.hh/1.6/Thu Jun 29 21:23:17 2006// Tgeant4-09-04-ref-004 /G4RTJpegMaker.hh/1.6/Thu Jun 29 21:23:19 2006// Tgeant4-09-04-ref-005 /G4RTMessenger.hh/1.7/Thu Jun 29 21:23:21 2006// Tgeant4-09-04-ref-006 /G4RTOutBitStream.hh/1.7/Thu Jun 29 21:23:23 2006// Tgeant4-09-04-ref-007 /G4RTSimpleScanner.hh/1.4/Mon Jun 14 14:33:34 2010// Tgeant4-09-04-ref-008 /G4RTSteppingAction.hh/1.5/Thu Jun 29 21:23:27 2006// Tgeant4-09-04-ref-009 /G4RTTrackingAction.hh/1.6/Thu Jun 29 21:23:29 2006// Tgeant4-09-04-ref-0010 /G4RTXScanner.hh/1.5/Mon Jun 14 14:33:34 2010// Tgeant4-09-04-ref-0011 /G4RayTracer.hh/1.12/Thu Jun 14 15:25:20 2007// Tgeant4-09-04-ref-0012 /G4RayTracerFeatures.hh/1.4/Thu Jun 29 21:23:35 2006// Tgeant4-09-04-ref-0013 /G4RayTracerSceneHandler.hh/1.13/Sun May 30 10:21:25 2010// Tgeant4-09-04-ref-0014 /G4RayTracerViewer.hh/1.7/Thu Jun 29 21:23:39 2006// Tgeant4-09-04-ref-0015 /G4RayTracerX.hh/1.4/Thu Jun 29 21:23:41 2006// Tgeant4-09-04-ref-0016 /G4RayTracerXViewer.hh/1.5/Wed Sep 16 16:56:52 2009// Tgeant4-09-04-ref-0017 /G4RayTrajectory.hh/1.16/Sat May 29 21:09:40 2010// Tgeant4-09-04-ref-0018 /G4RayTrajectoryPoint.hh/1.9/Thu Jun 29 21:23:47 2006// Tgeant4-09-04-ref-0019 /G4TheRayTracer.hh/1.3/Thu Jun 29 21:23:49 2006// Tgeant4-09-04-ref-0020 /G4VFigureFileMaker.hh/1.5/Thu Jun 29 21:23:51 2006// Tgeant4-09-04-ref-0021 /G4VRTScanner.hh/1.6/Mon Jun 14 14:33:34 2010// Tgeant4-09-04-ref-001 /G4RTJpeg.hh/1.6/Thu Jun 29 21:23:13 2006// 2 /G4RTJpegCoder.hh/1.6/Thu Jun 29 21:23:15 2006// 3 /G4RTJpegCoderTables.hh/1.6/Thu Jun 29 21:23:17 2006// 4 /G4RTJpegMaker.hh/1.6/Thu Jun 29 21:23:19 2006// 5 /G4RTMessenger.hh/1.7/Thu Jun 29 21:23:21 2006// 6 /G4RTOutBitStream.hh/1.7/Thu Jun 29 21:23:23 2006// 7 /G4RTSimpleScanner.hh/1.4/Mon Jun 14 14:33:34 2010// 8 /G4RTSteppingAction.hh/1.5/Thu Jun 29 21:23:27 2006// 9 /G4RTTrackingAction.hh/1.6/Thu Jun 29 21:23:29 2006// 10 /G4RTXScanner.hh/1.5/Mon Jun 14 14:33:34 2010// 11 /G4RayTracer.hh/1.12/Thu Jun 14 15:25:20 2007// 12 /G4RayTracerFeatures.hh/1.4/Thu Jun 29 21:23:35 2006// 13 /G4RayTracerSceneHandler.hh/1.13/Sun May 30 10:21:25 2010// 14 /G4RayTracerViewer.hh/1.7/Thu Jun 29 21:23:39 2006// 15 /G4RayTracerX.hh/1.4/Thu Jun 29 21:23:41 2006// 16 /G4RayTracerXViewer.hh/1.5/Wed Sep 16 16:56:52 2009// 17 /G4RayTrajectory.hh/1.16/Sat May 29 21:09:40 2010// 18 /G4RayTrajectoryPoint.hh/1.9/Thu Jun 29 21:23:47 2006// 19 /G4TheRayTracer.hh/1.3/Thu Jun 29 21:23:49 2006// 20 /G4VFigureFileMaker.hh/1.5/Thu Jun 29 21:23:51 2006// 21 /G4VRTScanner.hh/1.6/Mon Jun 14 14:33:34 2010// 22 22 D -
trunk/source/visualization/RayTracer/src/CVS/Entries
r1347 r1348 1 /G4RTJpegCoder.cc/1.6/Thu Jun 29 21:23:55 2006// Tgeant4-09-04-ref-002 /G4RTJpegMaker.cc/1.10/Thu Jun 29 21:23:57 2006// Tgeant4-09-04-ref-003 /G4RTMessenger.cc/1.10/Fri Nov 17 21:34:12 2006// Tgeant4-09-04-ref-004 /G4RTOutBitStream.cc/1.6/Fri Apr 4 13:52:48 2008// Tgeant4-09-04-ref-005 /G4RTSimpleScanner.cc/1.5/Mon Jun 14 14:33:34 2010// Tgeant4-09-04-ref-006 /G4RTSteppingAction.cc/1.7/Thu Jun 29 21:24:05 2006// Tgeant4-09-04-ref-007 /G4RTTrackingAction.cc/1.5/Thu Jun 29 21:24:07 2006// Tgeant4-09-04-ref-008 /G4RTXScanner.cc/1.8/Mon Jun 14 14:33:34 2010// Tgeant4-09-04-ref-009 /G4RayTracer.cc/1.22/Thu Jun 14 15:25:20 2007// Tgeant4-09-04-ref-0010 /G4RayTracerSceneHandler.cc/1.10/Tue Nov 14 14:46:37 2006// Tgeant4-09-04-ref-0011 /G4RayTracerViewer.cc/1.18/Wed Aug 19 08:39:19 2009// Tgeant4-09-04-ref-0012 /G4RayTracerX.cc/1.5/Thu Jun 29 21:24:17 2006// Tgeant4-09-04-ref-0013 /G4RayTracerXViewer.cc/1.8/Wed Sep 16 16:56:52 2009// Tgeant4-09-04-ref-0014 /G4RayTrajectory.cc/1.15/Thu Jun 29 21:24:21 2006// Tgeant4-09-04-ref-0015 /G4RayTrajectoryPoint.cc/1.6/Thu Jun 29 21:24:23 2006// Tgeant4-09-04-ref-0016 /G4TheRayTracer.cc/1.3/Thu Jun 29 21:24:25 2006// Tgeant4-09-04-ref-0017 /G4VRTScanner.cc/1.1/Mon Jun 14 14:33:34 2010// Tgeant4-09-04-ref-001 /G4RTJpegCoder.cc/1.6/Thu Jun 29 21:23:55 2006// 2 /G4RTJpegMaker.cc/1.10/Thu Jun 29 21:23:57 2006// 3 /G4RTMessenger.cc/1.10/Fri Nov 17 21:34:12 2006// 4 /G4RTOutBitStream.cc/1.6/Fri Apr 4 13:52:48 2008// 5 /G4RTSimpleScanner.cc/1.5/Mon Jun 14 14:33:34 2010// 6 /G4RTSteppingAction.cc/1.7/Thu Jun 29 21:24:05 2006// 7 /G4RTTrackingAction.cc/1.5/Thu Jun 29 21:24:07 2006// 8 /G4RTXScanner.cc/1.8/Mon Jun 14 14:33:34 2010// 9 /G4RayTracer.cc/1.22/Thu Jun 14 15:25:20 2007// 10 /G4RayTracerSceneHandler.cc/1.10/Tue Nov 14 14:46:37 2006// 11 /G4RayTracerViewer.cc/1.18/Wed Aug 19 08:39:19 2009// 12 /G4RayTracerX.cc/1.5/Thu Jun 29 21:24:17 2006// 13 /G4RayTracerXViewer.cc/1.8/Wed Sep 16 16:56:52 2009// 14 /G4RayTrajectory.cc/1.15/Thu Jun 29 21:24:21 2006// 15 /G4RayTrajectoryPoint.cc/1.6/Thu Jun 29 21:24:23 2006// 16 /G4TheRayTracer.cc/1.3/Thu Jun 29 21:24:25 2006// 17 /G4VRTScanner.cc/1.1/Mon Jun 14 14:33:34 2010// 18 18 D -
trunk/source/visualization/Tree/CVS/Entries
r1347 r1348 1 1 D/include//// 2 2 D/src//// 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 5 /History/1.31/Sat Nov 13 11:26:01 2010//Tgeant4-09-04-ref-00 3 /CMakeLists.txt/1.1/Wed Sep 29 19:12:55 2010// 4 /sources.cmake/1.1/Wed Sep 29 19:13:03 2010// 5 /GNUmakefile/1.7/Mon Jan 3 14:55:59 2011// 6 /History/1.32/Mon Jan 3 14:55:59 2011// -
trunk/source/visualization/Tree/GNUmakefile
r834 r1348 1 # $Id: GNUmakefile,v 1. 6 2006/11/05 20:45:45 allisonExp $1 # $Id: GNUmakefile,v 1.7 2011/01/03 14:55:59 lgarnier Exp $ 2 2 3 3 name := G4Tree … … 17 17 include $(G4INSTALL)/config/G4VIS_BUILD.gmk 18 18 include $(G4INSTALL)/config/interactivity.gmk 19 20 # NO need OGL, then reset OGLGLAGS 21 OGLFLAGS = "" 22 OGLLIBS = "" 23 # NO need QT, then reset QTGLAGS 24 QTFLAGS = "" 25 QTLIBS = "" 26 GLQTLIBS = "" 19 27 20 28 CPPFLAGS += -I$(G4BASE)/visualization/management/include -
trunk/source/visualization/Tree/History
r1347 r1348 1 $Id: History,v 1.3 1 2010/11/13 11:26:01 allisonExp $1 $Id: History,v 1.32 2011/01/03 14:55:59 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 24 24 History file for visualization/Tree sub-category 25 25 ------------------------------------------------ 26 27 23, December L. Garnier 28 - GNUmakefile : Remove OpenGL/Qt stuff from Makefile 26 29 27 30 13th November 2010 John Allison (vistree-V09-03-00) -
trunk/source/visualization/Tree/include/CVS/Entries
r1347 r1348 1 /G4ASCIITree.hh/1.7/Thu Jun 29 21:24:27 2006// Tgeant4-09-04-ref-002 /G4ASCIITreeMessenger.hh/1.7/Thu Jun 29 21:24:29 2006// Tgeant4-09-04-ref-003 /G4ASCIITreeSceneHandler.hh/1.17/Mon Dec 11 21:14:45 2006// Tgeant4-09-04-ref-004 /G4ASCIITreeViewer.hh/1.5/Thu Jun 29 21:24:33 2006// Tgeant4-09-04-ref-005 /G4VTree.hh/1.5/Thu Jun 29 21:24:45 2006// Tgeant4-09-04-ref-006 /G4VTreeSceneHandler.hh/1.18/Thu Jun 29 21:24:47 2006// Tgeant4-09-04-ref-007 /G4VTreeSceneHandler.icc/1.8/Thu Jun 29 21:24:49 2006// Tgeant4-09-04-ref-008 /G4VTreeViewer.hh/1.5/Thu Jun 29 21:24:51 2006// Tgeant4-09-04-ref-001 /G4ASCIITree.hh/1.7/Thu Jun 29 21:24:27 2006// 2 /G4ASCIITreeMessenger.hh/1.7/Thu Jun 29 21:24:29 2006// 3 /G4ASCIITreeSceneHandler.hh/1.17/Mon Dec 11 21:14:45 2006// 4 /G4ASCIITreeViewer.hh/1.5/Thu Jun 29 21:24:33 2006// 5 /G4VTree.hh/1.5/Thu Jun 29 21:24:45 2006// 6 /G4VTreeSceneHandler.hh/1.18/Thu Jun 29 21:24:47 2006// 7 /G4VTreeSceneHandler.icc/1.8/Thu Jun 29 21:24:49 2006// 8 /G4VTreeViewer.hh/1.5/Thu Jun 29 21:24:51 2006// 9 9 D -
trunk/source/visualization/Tree/src/CVS/Entries
r1347 r1348 1 /G4ASCIITree.cc/1.12/Fri Jan 5 16:59:43 2007// Tgeant4-09-04-ref-002 /G4ASCIITreeMessenger.cc/1.19/Fri Jan 5 16:59:43 2007// Tgeant4-09-04-ref-003 /G4ASCIITreeSceneHandler.cc/1.34/Fri Jan 5 17:00:27 2007// Tgeant4-09-04-ref-004 /G4ASCIITreeViewer.cc/1.8/Thu Jun 29 21:24:59 2006// Tgeant4-09-04-ref-005 /G4VTree.cc/1.5/Thu Jun 29 21:25:09 2006// Tgeant4-09-04-ref-006 /G4VTreeSceneHandler.cc/1.14/Thu Jun 29 21:25:11 2006// Tgeant4-09-04-ref-007 /G4VTreeViewer.cc/1.7/Thu Jun 29 21:25:13 2006// Tgeant4-09-04-ref-001 /G4ASCIITree.cc/1.12/Fri Jan 5 16:59:43 2007// 2 /G4ASCIITreeMessenger.cc/1.19/Fri Jan 5 16:59:43 2007// 3 /G4ASCIITreeSceneHandler.cc/1.34/Fri Jan 5 17:00:27 2007// 4 /G4ASCIITreeViewer.cc/1.8/Thu Jun 29 21:24:59 2006// 5 /G4VTree.cc/1.5/Thu Jun 29 21:25:09 2006// 6 /G4VTreeSceneHandler.cc/1.14/Thu Jun 29 21:25:11 2006// 7 /G4VTreeViewer.cc/1.7/Thu Jun 29 21:25:13 2006// 8 8 D -
trunk/source/visualization/VRML/CVS/Entries
r1347 r1348 2 2 D/include//// 3 3 D/src//// 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 6 /History/1.21/Thu Nov 11 00:48:34 2010//Tgeant4-09-04-ref-00 4 /GNUmakefile/1.9/Thu Dec 23 14:18:05 2010// 5 /CMakeLists.txt/1.1/Wed Sep 29 19:13:11 2010// 6 /History/1.23/Mon Jan 3 14:58:39 2011// 7 /sources.cmake/1.2/Wed Dec 22 10:23:43 2010// -
trunk/source/visualization/VRML/GNUmakefile
r1346 r1348 1 # $Id: GNUmakefile,v 1. 8 2009/10/21 15:27:21 allisonExp $1 # $Id: GNUmakefile,v 1.9 2010/12/23 14:18:05 lgarnier Exp $ 2 2 3 3 # lib name … … 17 17 include $(G4INSTALL)/config/architecture.gmk 18 18 include $(G4INSTALL)/config/G4VIS_BUILD.gmk 19 include $(G4INSTALL)/config/interactivity.gmk 19 20 20 21 # NO need OGL, then reset OGLGLAGS … … 25 26 QTLIBS = "" 26 27 GLQTLIBS = "" 27 28 include $(G4INSTALL)/config/interactivity.gmk29 28 30 29 CPPFLAGS += -I$(G4BASE)/visualization/management/include -
trunk/source/visualization/VRML/History
r1347 r1348 1 $Id: History,v 1.2 1 2010/11/11 00:48:34 akimuraExp $1 $Id: History,v 1.23 2010/12/27 13:23:00 allison Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 20 20 History file for visualization/VRML sub-category 21 21 ------------------------------------------------ 22 23 27th December 2010 John Allison (VRML-V09-04-00) 24 - Tagged. 25 26 23, December L. Garnier 27 - GNUmakefile : Remove Qt stuff from Makefile 22 28 23 29 11 November 2010 Akinori Kimura (VRML-V09-03-01) -
trunk/source/visualization/VRML/g4vrmlview/CVS/Entries
r1347 r1348 1 /Makefile/1.1/Thu Jan 7 16:15:08 1999// Tgeant4-09-04-ref-002 /README/1.1/Thu Nov 4 07:24:37 1999// Tgeant4-09-04-ref-003 /g4mini.java/1.4/Thu Jun 29 21:25:15 2006// Tgeant4-09-04-ref-004 /g4vrmlview.java/1.4/Thu Jun 29 21:25:17 2006// Tgeant4-09-04-ref-005 /sample.wrl/1.1/Thu Jan 7 16:15:09 1999// Tgeant4-09-04-ref-001 /Makefile/1.1/Thu Jan 7 16:15:08 1999// 2 /README/1.1/Thu Nov 4 07:24:37 1999// 3 /g4mini.java/1.4/Thu Jun 29 21:25:15 2006// 4 /g4vrmlview.java/1.4/Thu Jun 29 21:25:17 2006// 5 /sample.wrl/1.1/Thu Jan 7 16:15:09 1999// 6 6 D -
trunk/source/visualization/VRML/include/CVS/Entries
r1347 r1348 1 /FRClient.h/1.6/Thu Jun 29 21:25:19 2006// Tgeant4-09-04-ref-002 /G4FRClient.hh/1.8/Thu Jun 29 21:25:21 2006// Tgeant4-09-04-ref-003 /G4VRML1.hh/1.10/Thu Jun 29 21:25:23 2006// Tgeant4-09-04-ref-004 /G4VRML1File.hh/1.10/Thu Jun 29 21:25:25 2006// Tgeant4-09-04-ref-005 /G4VRML1FileSceneHandler.hh/1.19/Sun May 30 10:14:39 2010// Tgeant4-09-04-ref-006 /G4VRML1FileViewer.hh/1.8/Thu Jun 29 21:25:29 2006// Tgeant4-09-04-ref-007 /G4VRML1SceneHandler.hh/1.16/Sun May 30 10:08:32 2010// Tgeant4-09-04-ref-008 /G4VRML1Viewer.hh/1.8/Thu Jun 29 21:25:33 2006// Tgeant4-09-04-ref-009 /G4VRML2.hh/1.10/Thu Jun 29 21:25:35 2006// Tgeant4-09-04-ref-0010 /G4VRML2File.hh/1.11/Thu Jun 29 21:25:37 2006// Tgeant4-09-04-ref-0011 /G4VRML2FileSceneHandler.hh/1.18/Sun May 30 10:14:39 2010// Tgeant4-09-04-ref-0012 /G4VRML2FileViewer.hh/1.10/Thu Jun 29 21:25:41 2006// Tgeant4-09-04-ref-0013 /G4VRML2SceneHandler.hh/1.15/Sun May 30 10:08:32 2010// Tgeant4-09-04-ref-0014 /G4VRML2Viewer.hh/1.8/Thu Jun 29 21:25:45 2006// Tgeant4-09-04-ref-0015 /G4VRMLNetConfig.hh/1.7/Thu Jun 29 21:25:47 2006// Tgeant4-09-04-ref-001 /FRClient.h/1.6/Thu Jun 29 21:25:19 2006// 2 /G4FRClient.hh/1.8/Thu Jun 29 21:25:21 2006// 3 /G4VRML1.hh/1.10/Thu Jun 29 21:25:23 2006// 4 /G4VRML1File.hh/1.10/Thu Jun 29 21:25:25 2006// 5 /G4VRML1FileSceneHandler.hh/1.19/Sun May 30 10:14:39 2010// 6 /G4VRML1FileViewer.hh/1.8/Thu Jun 29 21:25:29 2006// 7 /G4VRML1SceneHandler.hh/1.16/Sun May 30 10:08:32 2010// 8 /G4VRML1Viewer.hh/1.8/Thu Jun 29 21:25:33 2006// 9 /G4VRML2.hh/1.10/Thu Jun 29 21:25:35 2006// 10 /G4VRML2File.hh/1.11/Thu Jun 29 21:25:37 2006// 11 /G4VRML2FileSceneHandler.hh/1.18/Sun May 30 10:14:39 2010// 12 /G4VRML2FileViewer.hh/1.10/Thu Jun 29 21:25:41 2006// 13 /G4VRML2SceneHandler.hh/1.15/Sun May 30 10:08:32 2010// 14 /G4VRML2Viewer.hh/1.8/Thu Jun 29 21:25:45 2006// 15 /G4VRMLNetConfig.hh/1.7/Thu Jun 29 21:25:47 2006// 16 16 D -
trunk/source/visualization/VRML/src/CVS/Entries
r1347 r1348 1 /FRClient.cc/1.8/Thu Nov 11 00:14:50 2010// Tgeant4-09-04-ref-002 /G4FRClient.cc/1.8/Thu Jun 29 21:25:51 2006// Tgeant4-09-04-ref-003 /G4VRML1.cc/1.10/Thu Jun 29 21:25:53 2006// Tgeant4-09-04-ref-004 /G4VRML1File.cc/1.10/Thu Jun 29 21:25:55 2006// Tgeant4-09-04-ref-005 /G4VRML1FileSceneHandler.cc/1.13/Thu Nov 11 00:14:50 2010// Tgeant4-09-04-ref-006 /G4VRML1FileViewer.cc/1.12/Thu Nov 11 00:14:50 2010// Tgeant4-09-04-ref-007 /G4VRML1SceneHandler.cc/1.11/Thu Nov 11 00:14:50 2010// Tgeant4-09-04-ref-008 /G4VRML1SceneHandlerFunc.icc/1.17/Thu Nov 11 00:14:50 2010// Tgeant4-09-04-ref-009 /G4VRML1Viewer.cc/1.9/Thu Nov 11 00:14:50 2010// Tgeant4-09-04-ref-0010 /G4VRML2.cc/1.10/Thu Jun 29 21:26:07 2006// Tgeant4-09-04-ref-0011 /G4VRML2File.cc/1.10/Thu Jun 29 21:26:09 2006// Tgeant4-09-04-ref-0012 /G4VRML2FileSceneHandler.cc/1.15/Thu Nov 11 00:14:50 2010// Tgeant4-09-04-ref-0013 /G4VRML2FileViewer.cc/1.14/Thu Nov 11 00:14:50 2010// Tgeant4-09-04-ref-0014 /G4VRML2SceneHandler.cc/1.13/Thu Nov 11 00:14:50 2010// Tgeant4-09-04-ref-0015 /G4VRML2SceneHandlerFunc.icc/1.21/Thu Nov 11 00:14:50 2010// Tgeant4-09-04-ref-0016 /G4VRML2Viewer.cc/1.13/Thu Nov 11 00:14:50 2010// Tgeant4-09-04-ref-001 /FRClient.cc/1.8/Thu Nov 11 00:14:50 2010// 2 /G4FRClient.cc/1.8/Thu Jun 29 21:25:51 2006// 3 /G4VRML1.cc/1.10/Thu Jun 29 21:25:53 2006// 4 /G4VRML1File.cc/1.10/Thu Jun 29 21:25:55 2006// 5 /G4VRML1FileSceneHandler.cc/1.13/Thu Nov 11 00:14:50 2010// 6 /G4VRML1FileViewer.cc/1.12/Thu Nov 11 00:14:50 2010// 7 /G4VRML1SceneHandler.cc/1.11/Thu Nov 11 00:14:50 2010// 8 /G4VRML1SceneHandlerFunc.icc/1.17/Thu Nov 11 00:14:50 2010// 9 /G4VRML1Viewer.cc/1.9/Thu Nov 11 00:14:50 2010// 10 /G4VRML2.cc/1.10/Thu Jun 29 21:26:07 2006// 11 /G4VRML2File.cc/1.10/Thu Jun 29 21:26:09 2006// 12 /G4VRML2FileSceneHandler.cc/1.15/Thu Nov 11 00:14:50 2010// 13 /G4VRML2FileViewer.cc/1.14/Thu Nov 11 00:14:50 2010// 14 /G4VRML2SceneHandler.cc/1.13/Thu Nov 11 00:14:50 2010// 15 /G4VRML2SceneHandlerFunc.icc/1.21/Thu Nov 11 00:14:50 2010// 16 /G4VRML2Viewer.cc/1.13/Thu Nov 11 00:14:50 2010// 17 17 D -
trunk/source/visualization/externals/CVS/Entries
r1346 r1348 1 1 D/gl2ps//// 2 2 D/zlib//// 3 /CMakeLists.txt/1.1/Wed Sep 29 19:13:44 2010// Tgeant4-09-04-ref-004 /GNUmakefile/1.1/Wed Sep 29 19:13:52 2010// Tgeant4-09-04-ref-003 /CMakeLists.txt/1.1/Wed Sep 29 19:13:44 2010// 4 /GNUmakefile/1.1/Wed Sep 29 19:13:52 2010// -
trunk/source/visualization/externals/gl2ps/CVS/Entries
r1346 r1348 1 1 D/include//// 2 2 D/src//// 3 / CMakeLists.txt/1.1/Wed Sep 29 19:14:00 2010//Tgeant4-09-04-ref-004 / GNUmakefile/1.5/dummy timestamp from new-entry//Tgeant4-09-04-ref-005 /History/1.2 1/Fri Nov 26 15:30:48 2010//Tgeant4-09-04-ref-006 /sources.cmake/1.5/Wed Dec 1 17:12:56 2010// Tgeant4-09-04-ref-003 /GNUmakefile/1.6/Thu Dec 23 14:18:05 2010// 4 /CMakeLists.txt/1.1/Wed Sep 29 19:14:00 2010// 5 /History/1.23/Mon Jan 3 14:32:53 2011// 6 /sources.cmake/1.5/Wed Dec 1 17:12:56 2010// -
trunk/source/visualization/externals/gl2ps/GNUmakefile
r1346 r1348 1 # $Id: GNUmakefile,v 1. 5 2009/11/18 17:15:11 gcosmoExp $1 # $Id: GNUmakefile,v 1.6 2010/12/23 14:18:05 lgarnier Exp $ 2 2 # ------------------------------------------------------------- 3 3 # GNUmakefile for gl2ps. Laurent Garnier, 6/2/09. -
trunk/source/visualization/externals/gl2ps/History
r1346 r1348 1 $Id: History,v 1.2 1 2010/11/13 10:37:57allison Exp $1 $Id: History,v 1.23 2010/12/27 13:27:04 allison Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 18 18 ---------------------------------------------------------- 19 19 20 27th December 2010 John Allison (visexternal-V09-04-00) 21 - Tagged. 22 23 23, December L. Garnier 24 - GNUmakefile : Remove Qt stuff from Makefile 20 25 21 26 13th November 2010, John Allison (visexternal-V09-03-03) -
trunk/source/visualization/externals/gl2ps/include/CVS/Entries
r1346 r1348 1 /G4OpenGL2PSAction.hh/1.4/Mon Apr 26 16:28:18 2010// Tgeant4-09-04-ref-002 /Geant4_gl2ps.h/1.4/Fri Nov 26 15:30:48 2010// Tgeant4-09-04-ref-003 /gl2ps.h/1.3/Wed Nov 3 16:40:34 2010// Tgeant4-09-04-ref-001 /G4OpenGL2PSAction.hh/1.4/Mon Apr 26 16:28:18 2010// 2 /Geant4_gl2ps.h/1.4/Fri Nov 26 15:30:48 2010// 3 /gl2ps.h/1.3/Wed Nov 3 16:40:34 2010// 4 4 D -
trunk/source/visualization/externals/gl2ps/src/CVS/Entries
r1346 r1348 1 /G4OpenGL2PSAction.cc/1.6/Wed Nov 3 16:40:34 2010// Tgeant4-09-04-ref-002 /gl2ps.cc/1.13/Wed Dec 22 10:23:43 2010// Tgeant4-09-04-ref-001 /G4OpenGL2PSAction.cc/1.6/Wed Nov 3 16:40:34 2010// 2 /gl2ps.cc/1.13/Wed Dec 22 10:23:43 2010// 3 3 D -
trunk/source/visualization/externals/zlib/CVS/Entries
r1346 r1348 1 1 D/include//// 2 2 D/src//// 3 /CMakeLists.txt/1.2/Thu Sep 30 13:56:02 2010// Tgeant4-09-04-ref-004 /GNUmakefile/1.1/Thu May 12 19:39:31 2005// Tgeant4-09-04-ref-005 /History/1.1/Wed May 25 23:18:52 2005// Tgeant4-09-04-ref-006 /README/1.1/Thu May 12 21:04:53 2005// Tgeant4-09-04-ref-007 /sources.cmake/1.1/Wed Sep 29 19:14:24 2010// Tgeant4-09-04-ref-003 /CMakeLists.txt/1.2/Thu Sep 30 13:56:02 2010// 4 /GNUmakefile/1.1/Thu May 12 19:39:31 2005// 5 /History/1.1/Wed May 25 23:18:52 2005// 6 /README/1.1/Thu May 12 21:04:53 2005// 7 /sources.cmake/1.1/Wed Sep 29 19:14:24 2010// -
trunk/source/visualization/externals/zlib/include/CVS/Entries
r1346 r1348 1 /crc32.h/1.1/Thu May 12 21:04:53 2005// Tgeant4-09-04-ref-002 /deflate.h/1.1/Thu May 12 21:04:53 2005// Tgeant4-09-04-ref-003 /trees.h/1.1/Thu May 12 21:04:53 2005// Tgeant4-09-04-ref-004 /zconf.h/1.1/Thu May 12 21:04:53 2005// Tgeant4-09-04-ref-005 /zlib.h/1.1/Thu May 12 21:04:53 2005// Tgeant4-09-04-ref-006 /zutil.h/1.1/Thu May 12 21:04:53 2005// Tgeant4-09-04-ref-001 /crc32.h/1.1/Thu May 12 21:04:53 2005// 2 /deflate.h/1.1/Thu May 12 21:04:53 2005// 3 /trees.h/1.1/Thu May 12 21:04:53 2005// 4 /zconf.h/1.1/Thu May 12 21:04:53 2005// 5 /zlib.h/1.1/Thu May 12 21:04:53 2005// 6 /zutil.h/1.1/Thu May 12 21:04:53 2005// 7 7 D -
trunk/source/visualization/externals/zlib/src/CVS/Entries
r1346 r1348 1 /adler32.cc/1.1/Thu May 12 21:04:53 2005// Tgeant4-09-04-ref-002 /compress.cc/1.1/Thu May 12 21:04:53 2005// Tgeant4-09-04-ref-003 /crc32.cc/1.1/Thu May 12 21:04:53 2005// Tgeant4-09-04-ref-004 /deflate.cc/1.1/Thu May 12 21:04:53 2005// Tgeant4-09-04-ref-005 /trees.cc/1.1/Thu May 12 21:04:53 2005// Tgeant4-09-04-ref-006 /zutil.cc/1.1/Thu May 12 21:04:53 2005// Tgeant4-09-04-ref-001 /adler32.cc/1.1/Thu May 12 21:04:53 2005// 2 /compress.cc/1.1/Thu May 12 21:04:53 2005// 3 /crc32.cc/1.1/Thu May 12 21:04:53 2005// 4 /deflate.cc/1.1/Thu May 12 21:04:53 2005// 5 /trees.cc/1.1/Thu May 12 21:04:53 2005// 6 /zutil.cc/1.1/Thu May 12 21:04:53 2005// 7 7 D -
trunk/source/visualization/gMocren/CVS/Entries
r1347 r1348 1 1 D/include//// 2 2 D/src//// 3 /CMakeLists.txt/1.1/Wed Sep 29 19:14:32 2010// Tgeant4-09-04-ref-004 / sources.cmake/1.1/Wed Sep 29 19:14:41 2010//Tgeant4-09-04-ref-005 / GNUmakefile/1.2/Mon Oct 12 10:24:23 2009//Tgeant4-09-04-ref-006 / History/1.16/Thu Nov 11 00:49:25 2010//Tgeant4-09-04-ref-007 / README/1.2/Mon Oct 12 19:51:37 2009//Tgeant4-09-04-ref-003 /CMakeLists.txt/1.1/Wed Sep 29 19:14:32 2010// 4 /README/1.2/Mon Oct 12 19:51:37 2009// 5 /sources.cmake/1.1/Wed Sep 29 19:14:41 2010// 6 /GNUmakefile/1.3/Mon Jan 3 14:34:46 2011// 7 /History/1.17/Mon Jan 3 14:34:46 2011// -
trunk/source/visualization/gMocren/GNUmakefile
r1347 r1348 1 # $Id: GNUmakefile,v 1. 2 2009/10/12 10:24:23 akimuraExp $1 # $Id: GNUmakefile,v 1.3 2011/01/03 14:34:46 lgarnier Exp $ 2 2 3 3 name := G4GMocren … … 17 17 include $(G4INSTALL)/config/G4VIS_BUILD.gmk 18 18 include $(G4INSTALL)/config/interactivity.gmk 19 20 # NO need OGL, then reset OGLGLAGS 21 OGLFLAGS = "" 22 OGLLIBS = "" 23 # NO need QT, then reset QTGLAGS 24 QTFLAGS = "" 25 QTLIBS = "" 26 GLQTLIBS = "" 19 27 20 28 CPPFLAGS += -I$(G4BASE)/visualization/management/include -
trunk/source/visualization/gMocren/History
r1347 r1348 1 $Id: History,v 1.1 6 2010/11/11 00:49:25 akimuraExp $1 $Id: History,v 1.17 2011/01/03 14:34:46 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 20 20 History file for visualization/gMocren sub-category 21 21 --------------------------------------------------- 22 23 23, December L. Garnier 24 - GNUmakefile : Remove OpenGL/Qt stuff from Makefile 22 25 23 26 11 November 2010 Akinori Kimura (gMocren-V09-03-05) -
trunk/source/visualization/gMocren/include/CVS/Entries
r1347 r1348 1 /G4GMocrenFile.hh/1.2/Mon Oct 12 10:04:35 2009// Tgeant4-09-04-ref-002 /G4GMocrenFileCTtoDensityMap.hh/1.1/Mon Oct 12 10:04:35 2009// Tgeant4-09-04-ref-003 /G4GMocrenFileSceneHandler.hh/1.6/Sun May 30 10:04:16 2010// Tgeant4-09-04-ref-004 /G4GMocrenFileViewer.hh/1.2/Mon Oct 12 10:04:35 2009// Tgeant4-09-04-ref-005 /G4GMocrenIO.hh/1.4/Fri Jun 25 09:46:17 2010// Tgeant4-09-04-ref-006 /G4GMocrenMessenger.hh/1.2/Mon Oct 12 10:04:35 2009// Tgeant4-09-04-ref-007 /G4GMocrenTouchable.hh/1.2/Mon Oct 12 10:04:35 2009// Tgeant4-09-04-ref-001 /G4GMocrenFile.hh/1.2/Mon Oct 12 10:04:35 2009// 2 /G4GMocrenFileCTtoDensityMap.hh/1.1/Mon Oct 12 10:04:35 2009// 3 /G4GMocrenFileSceneHandler.hh/1.6/Sun May 30 10:04:16 2010// 4 /G4GMocrenFileViewer.hh/1.2/Mon Oct 12 10:04:35 2009// 5 /G4GMocrenIO.hh/1.4/Fri Jun 25 09:46:17 2010// 6 /G4GMocrenMessenger.hh/1.2/Mon Oct 12 10:04:35 2009// 7 /G4GMocrenTouchable.hh/1.2/Mon Oct 12 10:04:35 2009// 8 8 D -
trunk/source/visualization/gMocren/src/CVS/Entries
r1347 r1348 1 /G4GMocrenFile.cc/1.2/Mon Oct 12 10:04:35 2009// Tgeant4-09-04-ref-002 /G4GMocrenFileCTtoDensityMap.cc/1.2/Wed Dec 16 17:51:27 2009// Tgeant4-09-04-ref-003 /G4GMocrenFileSceneHandler.cc/1.18/Wed Nov 10 23:53:23 2010// Tgeant4-09-04-ref-004 /G4GMocrenFileViewer.cc/1.4/Wed Nov 10 23:53:23 2010// Tgeant4-09-04-ref-005 /G4GMocrenIO.cc/1.6/Wed Nov 10 23:53:23 2010// Tgeant4-09-04-ref-006 /G4GMocrenMessenger.cc/1.2/Mon Oct 12 10:04:35 2009// Tgeant4-09-04-ref-001 /G4GMocrenFile.cc/1.2/Mon Oct 12 10:04:35 2009// 2 /G4GMocrenFileCTtoDensityMap.cc/1.2/Wed Dec 16 17:51:27 2009// 3 /G4GMocrenFileSceneHandler.cc/1.18/Wed Nov 10 23:53:23 2010// 4 /G4GMocrenFileViewer.cc/1.4/Wed Nov 10 23:53:23 2010// 5 /G4GMocrenIO.cc/1.6/Wed Nov 10 23:53:23 2010// 6 /G4GMocrenMessenger.cc/1.2/Mon Oct 12 10:04:35 2009// 7 7 D -
trunk/source/visualization/management/CVS/Entries
r1347 r1348 1 1 D/include//// 2 2 D/src//// 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 6 /Doxyfile/1.2/Fri May 12 13:10:34 2006//Tgeant4-09-04-ref-00 3 /CMakeLists.txt/1.1/Wed Sep 29 19:14:49 2010// 4 /Doxyfile/1.2/Fri May 12 13:10:34 2006// 5 /History/1.163/Mon Jan 3 14:38:18 2011// 6 /sources.cmake/1.1/Wed Sep 29 19:15:02 2010// 7 /GNUmakefile/1.17/Mon Mar 8 16:34:17 2010// -
trunk/source/visualization/management/GNUmakefile
r1346 r1348 10 10 11 11 # For debug mode 12 CPPFLAGS += -DG4DEBUG_VIS_MANAGEMENT12 # CPPFLAGS += -DG4DEBUG_VIS_MANAGEMENT 13 13 14 14 GLOBLIBS = libG4modeling.lib -
trunk/source/visualization/management/History
r1346 r1348 1 $Id: History,v 1.16 0.2.1 2010/12/14 15:55:56 gcosmoExp $1 $Id: History,v 1.163 2010/12/27 12:41:19 allison Exp $ 2 2 3 3 ------------------------------------------------------------------- … … 27 27 ------------------------------------------------------ 28 28 29 27th December 2010 John Allison (visman-V09-04-00) 30 - Tagged. This tag DOES include changes below of December 11th. 31 29 32 14th December 2010 Gabriele Cosmo (visman-V09-03-16) 30 33 - G4VisManager: moved GetVerbosity() static method to non-inline to allow for 31 34 Windows DLL exporting. 35 - Tag does NOT include changes below of December 11th. 36 37 11th December 2010 John Allison 38 - G4VisCommandsSceneAdd.cc: /vis/scene/add/trajectories: 39 o If >= warnings, print available attributes in all cases. 40 - G4VisCommandsScene.cc: /vis/scene/notifyHandlers: 41 o Flag kernel visit in all cases. 42 - G4VisListManager.hh: 43 o In case of model with existing name, instead of G4Exception, simply 44 replace. 32 45 33 46 13th November 2010 John Allison (visman-V09-03-15) -
trunk/source/visualization/management/include/CVS/Entries
r1347 r1348 1 /G4GraphicsSystemList.hh/1.9/Thu Jun 29 21:27:54 2006// Tgeant4-09-04-ref-002 /G4Scene.hh/1.19/Wed Nov 4 12:49:16 2009// Tgeant4-09-04-ref-003 /G4Scene.icc/1.15/Wed Nov 4 12:49:16 2009// Tgeant4-09-04-ref-004 /G4SceneHandlerList.hh/1.8/Thu Jun 29 21:28:00 2006// Tgeant4-09-04-ref-005 /G4SceneList.hh/1.10/Thu Jun 29 21:28:02 2006// Tgeant4-09-04-ref-006 /G4VGraphicsSystem.hh/1.12/Thu May 20 07:55:47 2010// Tgeant4-09-04-ref-007 /G4VGraphicsSystem.icc/1.8/Thu May 20 07:55:47 2010// Tgeant4-09-04-ref-008 /G4VSceneHandler.hh/1.44/Sun May 30 11:30:49 2010// Tgeant4-09-04-ref-009 /G4VSceneHandler.icc/1.20/Thu Jan 11 16:38:14 2007// Tgeant4-09-04-ref-0010 /G4VUserVisAction.hh/1.8/Thu Jun 29 21:28:12 2006// Tgeant4-09-04-ref-0011 /G4VViewer.hh/1.18/Thu Jun 29 21:28:14 2006// Tgeant4-09-04-ref-0012 /G4VViewer.icc/1.11/Thu Jun 29 21:28:16 2006// Tgeant4-09-04-ref-0013 /G4VVisCommand.hh/1.18/Thu Jun 29 21:28:18 2006// Tgeant4-09-04-ref-0014 /G4VVisCommand.icc/1.5/Thu Jun 29 21:28:20 2006// Tgeant4-09-04-ref-0015 /G4ViewParameters.hh/1.30/Wed Jan 21 16:59:22 2009// Tgeant4-09-04-ref-0016 /G4ViewParameters.icc/1.18/Wed Jan 21 16:59:22 2009// Tgeant4-09-04-ref-0017 /G4ViewerList.hh/1.8/Thu Jun 29 21:28:26 2006// Tgeant4-09-04-ref-0018 /G4VisCommandModelCreate.hh/1.3/Thu Jun 29 21:28:28 2006// Tgeant4-09-04-ref-0019 /G4VisCommands.hh/1.8/Mon Mar 9 12:42:00 2009// Tgeant4-09-04-ref-0020 /G4VisCommandsCompound.hh/1.9/Thu Jun 29 21:28:32 2006// Tgeant4-09-04-ref-0021 /G4VisCommandsGeometry.hh/1.3/Thu Jun 29 21:28:34 2006// Tgeant4-09-04-ref-0022 /G4VisCommandsGeometrySet.hh/1.4/Tue Jun 15 16:33:55 2010// Tgeant4-09-04-ref-0023 /G4VisCommandsListManager.hh/1.3/Thu Jun 29 21:28:38 2006// Tgeant4-09-04-ref-0024 /G4VisCommandsScene.hh/1.19/Tue Nov 14 14:59:54 2006// Tgeant4-09-04-ref-0025 /G4VisCommandsSceneAdd.hh/1.21/Thu Jun 3 10:17:44 2010// Tgeant4-09-04-ref-0026 /G4VisCommandsSceneHandler.hh/1.8/Thu Jun 29 21:28:44 2006// Tgeant4-09-04-ref-0027 /G4VisCommandsViewer.hh/1.23/Wed Sep 13 13:17:29 2006// Tgeant4-09-04-ref-0028 /G4VisCommandsViewerSet.hh/1.24/Wed Oct 6 10:15:38 2010// Tgeant4-09-04-ref-0029 /G4VisExecutive.hh/1.10/Fri May 28 16:48:03 2010// Tgeant4-09-04-ref-0030 /G4VisExecutive.icc/1.27/Sun Nov 7 11:14:33 2010// Tgeant4-09-04-ref-0031 /G4VisFeaturesOfDAWNFILE.hh/1.5/Thu Jun 29 21:28:54 2006// Tgeant4-09-04-ref-0032 /G4VisFeaturesOfFukuiRenderer.hh/1.5/Thu Jun 29 21:28:56 2006// Tgeant4-09-04-ref-0033 /G4VisFeaturesOfOpenGL.hh/1.6/Wed Oct 3 14:20:23 2007// Tgeant4-09-04-ref-0034 /G4VisFeaturesOfOpenInventor.hh/1.5/Thu Jun 29 21:29:00 2006// Tgeant4-09-04-ref-0035 /G4VisFilterManager.hh/1.4/Thu Jun 29 21:29:02 2006// Tgeant4-09-04-ref-0036 /G4VisListManager.hh/1. 8/Thu Jun 29 21:29:04 2006//Tgeant4-09-04-ref-0037 /G4VisManager.hh/1.76/Fri Nov 26 15:30:48 2010// Tgeant4-09-04-ref-0038 /G4VisM odelManager.hh/1.4/Thu Jun 29 21:29:10 2006//Tgeant4-09-04-ref-0039 /G4Vis StateDependent.hh/1.5/Thu Jun 29 21:29:12 2006//Tgeant4-09-04-ref-0040 /G4Vis Manager.icc/1.23/Wed Dec 22 14:32:23 2010//Tgeant4-09-04-ref-001 /G4GraphicsSystemList.hh/1.9/Thu Jun 29 21:27:54 2006// 2 /G4Scene.hh/1.19/Wed Nov 4 12:49:16 2009// 3 /G4Scene.icc/1.15/Wed Nov 4 12:49:16 2009// 4 /G4SceneHandlerList.hh/1.8/Thu Jun 29 21:28:00 2006// 5 /G4SceneList.hh/1.10/Thu Jun 29 21:28:02 2006// 6 /G4VGraphicsSystem.hh/1.12/Thu May 20 07:55:47 2010// 7 /G4VGraphicsSystem.icc/1.8/Thu May 20 07:55:47 2010// 8 /G4VSceneHandler.hh/1.44/Sun May 30 11:30:49 2010// 9 /G4VSceneHandler.icc/1.20/Thu Jan 11 16:38:14 2007// 10 /G4VUserVisAction.hh/1.8/Thu Jun 29 21:28:12 2006// 11 /G4VViewer.hh/1.18/Thu Jun 29 21:28:14 2006// 12 /G4VViewer.icc/1.11/Thu Jun 29 21:28:16 2006// 13 /G4VVisCommand.hh/1.18/Thu Jun 29 21:28:18 2006// 14 /G4VVisCommand.icc/1.5/Thu Jun 29 21:28:20 2006// 15 /G4ViewParameters.hh/1.30/Wed Jan 21 16:59:22 2009// 16 /G4ViewParameters.icc/1.18/Wed Jan 21 16:59:22 2009// 17 /G4ViewerList.hh/1.8/Thu Jun 29 21:28:26 2006// 18 /G4VisCommandModelCreate.hh/1.3/Thu Jun 29 21:28:28 2006// 19 /G4VisCommands.hh/1.8/Mon Mar 9 12:42:00 2009// 20 /G4VisCommandsCompound.hh/1.9/Thu Jun 29 21:28:32 2006// 21 /G4VisCommandsGeometry.hh/1.3/Thu Jun 29 21:28:34 2006// 22 /G4VisCommandsGeometrySet.hh/1.4/Tue Jun 15 16:33:55 2010// 23 /G4VisCommandsListManager.hh/1.3/Thu Jun 29 21:28:38 2006// 24 /G4VisCommandsScene.hh/1.19/Tue Nov 14 14:59:54 2006// 25 /G4VisCommandsSceneAdd.hh/1.21/Thu Jun 3 10:17:44 2010// 26 /G4VisCommandsSceneHandler.hh/1.8/Thu Jun 29 21:28:44 2006// 27 /G4VisCommandsViewer.hh/1.23/Wed Sep 13 13:17:29 2006// 28 /G4VisCommandsViewerSet.hh/1.24/Wed Oct 6 10:15:38 2010// 29 /G4VisExecutive.hh/1.10/Fri May 28 16:48:03 2010// 30 /G4VisExecutive.icc/1.27/Sun Nov 7 11:14:33 2010// 31 /G4VisFeaturesOfDAWNFILE.hh/1.5/Thu Jun 29 21:28:54 2006// 32 /G4VisFeaturesOfFukuiRenderer.hh/1.5/Thu Jun 29 21:28:56 2006// 33 /G4VisFeaturesOfOpenGL.hh/1.6/Wed Oct 3 14:20:23 2007// 34 /G4VisFeaturesOfOpenInventor.hh/1.5/Thu Jun 29 21:29:00 2006// 35 /G4VisFilterManager.hh/1.4/Thu Jun 29 21:29:02 2006// 36 /G4VisListManager.hh/1.9/Mon Jan 3 14:38:18 2011// 37 /G4VisManager.hh/1.76/Fri Nov 26 15:30:48 2010// 38 /G4VisManager.icc/1.23/Wed Dec 22 14:32:23 2010// 39 /G4VisModelManager.hh/1.4/Thu Jun 29 21:29:10 2006// 40 /G4VisStateDependent.hh/1.5/Thu Jun 29 21:29:12 2006// 41 41 D -
trunk/source/visualization/management/include/G4VisListManager.hh
r1346 r1348 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4VisListManager.hh,v 1. 8 2006/06/29 21:29:04 gunterExp $26 // $Id: G4VisListManager.hh,v 1.9 2010/12/11 17:01:25 allison Exp $ 27 27 // GEANT4 tag $Name: $ 28 28 // … … 94 94 assert (0 != ptr); 95 95 96 typename std::map<G4String, T*>::const_iterator iter = fMap.find(ptr->Name()); 97 98 if (iter == fMap.end()) { 99 fMap[ptr->Name()] = ptr; 100 fpCurrent = ptr; 101 } 102 else { 103 std::ostringstream o; 104 o << "Key "<<ptr->Name()<<" already registered"; 105 G4Exception 106 ("G4VisListManager<T>::Register(T* ptr) ", 107 "KeyExists", FatalErrorInArgument, o.str().c_str()); 108 } 96 // Add to map. Replace if name the same. 97 fMap[ptr->Name()] = ptr; 98 fpCurrent = ptr; 109 99 } 110 100 -
trunk/source/visualization/management/src/CVS/Entries
r1347 r1348 1 /G4GraphicsSystemList.cc/1.4/Thu Jun 29 21:29:14 2006// Tgeant4-09-04-ref-002 /G4Scene.cc/1.24/Wed Nov 4 12:49:16 2009// Tgeant4-09-04-ref-003 /G4SceneHandlerList.cc/1.4/Thu Jun 29 21:29:18 2006// Tgeant4-09-04-ref-004 /G4SceneList.cc/1.6/Thu Jun 29 21:29:20 2006// Tgeant4-09-04-ref-005 /G4VGraphicsSystem.cc/1.11/Thu Jun 29 21:29:22 2006// Tgeant4-09-04-ref-006 /G4VSceneHandler.cc/1.96/Fri Nov 5 16:00:11 2010// Tgeant4-09-04-ref-007 /G4VViewer.cc/1.26/Tue Nov 17 14:37:06 2009// Tgeant4-09-04-ref-008 /G4VVisCommand.cc/1.18/Thu Jun 29 21:29:28 2006// Tgeant4-09-04-ref-009 /G4ViewParameters.cc/1.38/Fri Nov 5 16:00:11 2010// Tgeant4-09-04-ref-0010 /G4ViewerList.cc/1.4/Thu Jun 29 21:29:32 2006// Tgeant4-09-04-ref-0011 /G4VisCommands.cc/1.24/Mon Mar 9 12:42:00 2009// Tgeant4-09-04-ref-0012 /G4VisCommandsCompound.cc/1.40/Thu May 20 07:54:01 2010// Tgeant4-09-04-ref-0013 /G4VisCommandsGeometry.cc/1.4/Fri Jan 5 16:29:38 2007// Tgeant4-09-04-ref-0014 /G4VisCommandsGeometrySet.cc/1.8/Tue Jun 15 16:34:30 2010// Tgeant4-09-04-ref-0015 /G4VisCommandsScene.cc/1.7 0/Fri Nov 26 15:31:09 2010//Tgeant4-09-04-ref-0016 /G4VisCommandsSceneAdd.cc/1.8 4/Sat Nov 6 18:34:26 2010//Tgeant4-09-04-ref-0017 /G4VisCommandsSceneHandler.cc/1.32/Thu Jun 29 21:29:46 2006// Tgeant4-09-04-ref-0018 /G4VisCommandsViewer.cc/1.77/Sun Nov 7 11:14:07 2010// Tgeant4-09-04-ref-0019 /G4VisCommandsViewerSet.cc/1.53/Fri Nov 5 15:57:20 2010// Tgeant4-09-04-ref-0020 /G4VisFeaturesOfDAWNFILE.cc/1.6/Thu Jun 29 21:29:52 2006// Tgeant4-09-04-ref-0021 /G4VisFeaturesOfFukuiRenderer.cc/1.5/Thu Jun 29 21:29:54 2006// Tgeant4-09-04-ref-0022 /G4VisFeaturesOfOpenGL.cc/1.6/Wed Oct 3 14:21:55 2007// Tgeant4-09-04-ref-0023 /G4VisFeaturesOfOpenInventor.cc/1.5/Thu Jun 29 21:29:58 2006// Tgeant4-09-04-ref-0024 /G4Vis StateDependent.cc/1.6/Thu Jun 29 21:30:02 2006//Tgeant4-09-04-ref-0025 /G4Vis Manager.cc/1.131/Wed Dec 22 14:26:53 2010//Tgeant4-09-04-ref-001 /G4GraphicsSystemList.cc/1.4/Thu Jun 29 21:29:14 2006// 2 /G4Scene.cc/1.24/Wed Nov 4 12:49:16 2009// 3 /G4SceneHandlerList.cc/1.4/Thu Jun 29 21:29:18 2006// 4 /G4SceneList.cc/1.6/Thu Jun 29 21:29:20 2006// 5 /G4VGraphicsSystem.cc/1.11/Thu Jun 29 21:29:22 2006// 6 /G4VSceneHandler.cc/1.96/Fri Nov 5 16:00:11 2010// 7 /G4VViewer.cc/1.26/Tue Nov 17 14:37:06 2009// 8 /G4VVisCommand.cc/1.18/Thu Jun 29 21:29:28 2006// 9 /G4ViewParameters.cc/1.38/Fri Nov 5 16:00:11 2010// 10 /G4ViewerList.cc/1.4/Thu Jun 29 21:29:32 2006// 11 /G4VisCommands.cc/1.24/Mon Mar 9 12:42:00 2009// 12 /G4VisCommandsCompound.cc/1.40/Thu May 20 07:54:01 2010// 13 /G4VisCommandsGeometry.cc/1.4/Fri Jan 5 16:29:38 2007// 14 /G4VisCommandsGeometrySet.cc/1.8/Tue Jun 15 16:34:30 2010// 15 /G4VisCommandsScene.cc/1.71/Mon Jan 3 14:38:18 2011// 16 /G4VisCommandsSceneAdd.cc/1.85/Mon Jan 3 14:38:18 2011// 17 /G4VisCommandsSceneHandler.cc/1.32/Thu Jun 29 21:29:46 2006// 18 /G4VisCommandsViewer.cc/1.77/Sun Nov 7 11:14:07 2010// 19 /G4VisCommandsViewerSet.cc/1.53/Fri Nov 5 15:57:20 2010// 20 /G4VisFeaturesOfDAWNFILE.cc/1.6/Thu Jun 29 21:29:52 2006// 21 /G4VisFeaturesOfFukuiRenderer.cc/1.5/Thu Jun 29 21:29:54 2006// 22 /G4VisFeaturesOfOpenGL.cc/1.6/Wed Oct 3 14:21:55 2007// 23 /G4VisFeaturesOfOpenInventor.cc/1.5/Thu Jun 29 21:29:58 2006// 24 /G4VisManager.cc/1.131/Wed Dec 22 14:26:53 2010// 25 /G4VisStateDependent.cc/1.6/Thu Jun 29 21:30:02 2006// 26 26 D -
trunk/source/visualization/management/src/G4VisCommandsScene.cc
r1346 r1348 25 25 // 26 26 // 27 // $Id: G4VisCommandsScene.cc,v 1.7 0 2010/11/13 10:52:00 allison Exp $27 // $Id: G4VisCommandsScene.cc,v 1.71 2010/12/11 16:53:20 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 … … 545 545 for (G4int iV = 0; iV < nViewers; iV++) { 546 546 G4VViewer* aViewer = viewerList [iV]; 547 // Force rebuild of graphical database, if any. 548 aViewer -> NeedKernelVisit(); 547 549 if (aViewer->GetViewParameters().IsAutoRefresh()) { 548 550 aSceneHandler -> SetCurrentViewer (aViewer); … … 562 564 // uncomment the next line. 563 565 //aSceneHandler->ClearTransientStore(); 564 // Now, force rebuild of graphical database, if any, and re-draw.565 aViewer -> NeedKernelVisit();566 566 aViewer -> SetView (); 567 567 aViewer -> ClearView (); -
trunk/source/visualization/management/src/G4VisCommandsSceneAdd.cc
r1346 r1348 25 25 // 26 26 // 27 // $Id: G4VisCommandsSceneAdd.cc,v 1.8 4 2010/11/06 18:34:26allison Exp $27 // $Id: G4VisCommandsSceneAdd.cc,v 1.85 2010/12/11 16:50:10 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // /vis/scene commands - John Allison 9th August 1998 … … 66 66 #include "G4TransportationManager.hh" 67 67 #include "G4PropagatorInField.hh" 68 #include "G4Trajectory.hh" 69 #include "G4TrajectoryPoint.hh" 68 70 #include "G4RichTrajectory.hh" 69 71 #include "G4RichTrajectoryPoint.hh" 72 #include "G4SmoothTrajectory.hh" 73 #include "G4SmoothTrajectoryPoint.hh" 70 74 #include "G4AttDef.hh" 71 75 #include "G4ios.hh" … … 1459 1463 UImanager->SetVerboseLevel(keepVerbose); 1460 1464 1461 if (rich) { 1462 if (verbosity >= G4VisManager::warnings) { 1463 G4cout << 1464 "Attributes available for modeling and filtering with" 1465 "\n\"/vis/modeling/trajectories/create/drawByAttribute\" and" 1466 "\n\"/vis/filtering/trajectories/create/attributeFilter\" commands:\n" 1467 << G4RichTrajectory().GetAttDefs() 1465 if (verbosity >= G4VisManager::warnings) { 1466 G4cout << 1467 "Attributes available for modeling and filtering with" 1468 "\n\"/vis/modeling/trajectories/create/drawByAttribute\" and" 1469 "\n\"/vis/filtering/trajectories/create/attributeFilter\" commands:" 1470 << G4endl; 1471 if (rich) { 1472 G4cout << G4RichTrajectory().GetAttDefs() 1468 1473 << G4RichTrajectoryPoint().GetAttDefs(); 1474 } else if (smooth) { 1475 G4cout << G4SmoothTrajectory().GetAttDefs() 1476 << G4SmoothTrajectoryPoint().GetAttDefs(); 1477 } else { 1478 G4cout << G4Trajectory().GetAttDefs() 1479 << G4TrajectoryPoint().GetAttDefs(); 1469 1480 } 1470 1481 } -
trunk/source/visualization/modeling/CVS/Entries
r1346 r1348 1 1 D/include//// 2 2 D/src//// 3 /CMakeLists.txt/1.1/Wed Sep 29 19:15:11 2010// Tgeant4-09-04-ref-004 /GNUmakefile/1.12/dummy timestamp from new-entry// Tgeant4-09-04-ref-005 /History/1.12 3/Fri Nov 26 15:30:48 2010//Tgeant4-09-04-ref-006 /README/1.1/Thu Jan 7 16:15:34 1999// Tgeant4-09-04-ref-007 /sources.cmake/1.1/Wed Sep 29 19:15:19 2010// Tgeant4-09-04-ref-003 /CMakeLists.txt/1.1/Wed Sep 29 19:15:11 2010// 4 /GNUmakefile/1.12/dummy timestamp from new-entry// 5 /History/1.126/Mon Jan 3 14:39:14 2011// 6 /README/1.1/Thu Jan 7 16:15:34 1999// 7 /sources.cmake/1.1/Wed Sep 29 19:15:19 2010// -
trunk/source/visualization/modeling/History
r1346 r1348 1 $Id: History,v 1.12 3 2010/11/14 22:14:11allison Exp $1 $Id: History,v 1.126 2010/12/27 12:29:28 allison Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 20 20 History file for visualization/modeling 21 21 --------------------------------------- 22 23 27th December 2010 John Allison (modeling-V09-04-00) 24 - Tagged. 25 26 11th December 2010 John Allison 27 - G4AttributeFilterT.hh, G4TrajectoryDrawByAttribute.cc: 28 o Changed some exceptions from FatalError to JustWarnings. 29 - G4TrajectoryDrawerUtils.cc: 30 o Rework TimesValidity. 22 31 23 32 14th November 2010 John Allison (modeling-V09-03-05) -
trunk/source/visualization/modeling/include/CVS/Entries
r1346 r1348 1 /G4AttFilterUtils.hh/1.2/Wed Dec 13 15:49:58 2006// Tgeant4-09-04-ref-002 /G4AttValueFilterT.hh/1.3/Wed Dec 13 15:50:00 2006// Tgeant4-09-04-ref-003 /G4AttributeFilterT.hh/1. 6/Wed Dec 13 15:50:02 2006//Tgeant4-09-04-ref-004 /G4AxesModel.hh/1.6/Wed Nov 1 10:28:42 2006// Tgeant4-09-04-ref-005 /G4BoundingSphereScene.hh/1.20/Sun May 30 11:23:25 2010// Tgeant4-09-04-ref-006 /G4CallbackModel.hh/1.5/Thu Jun 29 21:30:10 2006// Tgeant4-09-04-ref-007 /G4DigiFilterFactories.hh/1.1/Sun May 30 11:24:30 2010// Tgeant4-09-04-ref-008 /G4DigiModel.hh/1.1/Sun May 30 11:24:30 2010// Tgeant4-09-04-ref-009 /G4FlavoredParallelWorldModel.hh/1.8/Thu Jun 29 21:30:12 2006// Tgeant4-09-04-ref-0010 /G4HitFilterFactories.hh/1.1/Tue Sep 12 18:53:03 2006// Tgeant4-09-04-ref-0011 /G4HitsModel.hh/1.10/Thu Nov 2 11:57:31 2006// Tgeant4-09-04-ref-0012 /G4LogicalVolumeModel.hh/1.9/Wed Nov 1 10:28:42 2006// Tgeant4-09-04-ref-0013 /G4ModelApplyCommandsT.hh/1.6/Wed Nov 10 10:16:47 2010// Tgeant4-09-04-ref-0014 /G4ModelColourMap.hh/1.2/Thu Jun 29 21:30:22 2006// Tgeant4-09-04-ref-0015 /G4ModelCommandUtils.hh/1.3/Tue Feb 24 12:00:56 2009// Tgeant4-09-04-ref-0016 /G4ModelCommandsT.hh/1.13/Tue Feb 24 12:00:56 2009// Tgeant4-09-04-ref-0017 /G4ModelCompoundCommandsT.hh/1.1/Mon Sep 11 21:52:18 2006// Tgeant4-09-04-ref-0018 /G4ModelingParameters.hh/1.18/Tue May 11 11:13:35 2010// Tgeant4-09-04-ref-0019 /G4ModelingParameters.icc/1.12/Tue May 11 11:13:35 2010// Tgeant4-09-04-ref-0020 /G4NullModel.hh/1.7/Thu Jun 29 21:30:30 2006// Tgeant4-09-04-ref-0021 /G4PSHitsModel.hh/1.4/Wed Nov 4 12:44:39 2009// Tgeant4-09-04-ref-0022 /G4PhysicalVolumeMassScene.hh/1.11/Sun May 30 11:23:25 2010// Tgeant4-09-04-ref-0023 /G4PhysicalVolumeModel.hh/1.36/Tue May 11 11:16:51 2010// Tgeant4-09-04-ref-0024 /G4PhysicalVolumeSearchScene.hh/1.20/Sun May 30 11:23:25 2010// Tgeant4-09-04-ref-0025 /G4PhysicalVolumeSearchScene.icc/1.6/Thu Jun 29 21:30:38 2006// Tgeant4-09-04-ref-0026 /G4ScaleModel.hh/1.4/Wed Nov 1 10:28:42 2006// Tgeant4-09-04-ref-0027 /G4TextModel.hh/1.7/Wed Nov 1 10:28:42 2006// Tgeant4-09-04-ref-0028 /G4TrajectoriesModel.hh/1.11/Tue May 11 11:21:52 2010// Tgeant4-09-04-ref-0029 /G4TrajectoryChargeFilter.hh/1.3/Fri Aug 25 19:44:14 2006// Tgeant4-09-04-ref-0030 /G4TrajectoryDrawByAttribute.hh/1.2/Tue May 11 11:31:31 2010// Tgeant4-09-04-ref-0031 /G4TrajectoryDrawByCharge.hh/1.8/Tue May 11 11:31:31 2010// Tgeant4-09-04-ref-0032 /G4TrajectoryDrawByOriginVolume.hh/1.5/Tue May 11 11:31:31 2010// Tgeant4-09-04-ref-0033 /G4TrajectoryDrawByParticleID.hh/1.8/Tue May 11 11:31:31 2010// Tgeant4-09-04-ref-0034 /G4TrajectoryDrawerUtils.hh/1.9/Tue May 11 11:58:18 2010// Tgeant4-09-04-ref-0035 /G4TrajectoryFilterFactories.hh/1.4/Tue Sep 12 18:53:03 2006// Tgeant4-09-04-ref-0036 /G4TrajectoryGenericDrawer.hh/1.3/Tue May 11 11:31:31 2010// Tgeant4-09-04-ref-0037 /G4TrajectoryModelFactories.hh/1.6/Tue Sep 12 18:53:03 2006// Tgeant4-09-04-ref-0038 /G4TrajectoryOriginVolumeFilter.hh/1.3/Fri Aug 25 19:44:14 2006// Tgeant4-09-04-ref-0039 /G4TrajectoryParticleFilter.hh/1.3/Fri Aug 25 19:44:14 2006// Tgeant4-09-04-ref-0040 /G4VAttValueFilter.hh/1.2/Wed Dec 13 15:50:04 2006// Tgeant4-09-04-ref-0041 /G4VModel.hh/1.19/Mon Jul 10 16:09:30 2006// Tgeant4-09-04-ref-0042 /G4VModel.icc/1.12/Mon Jul 10 16:09:30 2006// Tgeant4-09-04-ref-0043 /G4VModelCommand.hh/1.4/Mon Sep 11 21:22:02 2006// Tgeant4-09-04-ref-0044 /G4VModelFactory.hh/1.6/Thu Jun 29 21:32:30 2006// Tgeant4-09-04-ref-0045 /G4VTrajectoryModel.hh/1.8/Tue May 11 11:31:31 2010// Tgeant4-09-04-ref-0046 /G4VisTrajContext.hh/1.4/Tue Feb 24 12:00:56 2009// Tgeant4-09-04-ref-0047 /G4VisTrajContext.icc/1.4/Tue Feb 24 12:00:56 2009// Tgeant4-09-04-ref-001 /G4AttFilterUtils.hh/1.2/Wed Dec 13 15:49:58 2006// 2 /G4AttValueFilterT.hh/1.3/Wed Dec 13 15:50:00 2006// 3 /G4AttributeFilterT.hh/1.7/Mon Jan 3 14:39:14 2011// 4 /G4AxesModel.hh/1.6/Wed Nov 1 10:28:42 2006// 5 /G4BoundingSphereScene.hh/1.20/Sun May 30 11:23:25 2010// 6 /G4CallbackModel.hh/1.5/Thu Jun 29 21:30:10 2006// 7 /G4DigiFilterFactories.hh/1.1/Sun May 30 11:24:30 2010// 8 /G4DigiModel.hh/1.1/Sun May 30 11:24:30 2010// 9 /G4FlavoredParallelWorldModel.hh/1.8/Thu Jun 29 21:30:12 2006// 10 /G4HitFilterFactories.hh/1.1/Tue Sep 12 18:53:03 2006// 11 /G4HitsModel.hh/1.10/Thu Nov 2 11:57:31 2006// 12 /G4LogicalVolumeModel.hh/1.9/Wed Nov 1 10:28:42 2006// 13 /G4ModelApplyCommandsT.hh/1.6/Wed Nov 10 10:16:47 2010// 14 /G4ModelColourMap.hh/1.2/Thu Jun 29 21:30:22 2006// 15 /G4ModelCommandUtils.hh/1.3/Tue Feb 24 12:00:56 2009// 16 /G4ModelCommandsT.hh/1.13/Tue Feb 24 12:00:56 2009// 17 /G4ModelCompoundCommandsT.hh/1.1/Mon Sep 11 21:52:18 2006// 18 /G4ModelingParameters.hh/1.18/Tue May 11 11:13:35 2010// 19 /G4ModelingParameters.icc/1.12/Tue May 11 11:13:35 2010// 20 /G4NullModel.hh/1.7/Thu Jun 29 21:30:30 2006// 21 /G4PSHitsModel.hh/1.4/Wed Nov 4 12:44:39 2009// 22 /G4PhysicalVolumeMassScene.hh/1.11/Sun May 30 11:23:25 2010// 23 /G4PhysicalVolumeModel.hh/1.36/Tue May 11 11:16:51 2010// 24 /G4PhysicalVolumeSearchScene.hh/1.20/Sun May 30 11:23:25 2010// 25 /G4PhysicalVolumeSearchScene.icc/1.6/Thu Jun 29 21:30:38 2006// 26 /G4ScaleModel.hh/1.4/Wed Nov 1 10:28:42 2006// 27 /G4TextModel.hh/1.7/Wed Nov 1 10:28:42 2006// 28 /G4TrajectoriesModel.hh/1.11/Tue May 11 11:21:52 2010// 29 /G4TrajectoryChargeFilter.hh/1.3/Fri Aug 25 19:44:14 2006// 30 /G4TrajectoryDrawByAttribute.hh/1.2/Tue May 11 11:31:31 2010// 31 /G4TrajectoryDrawByCharge.hh/1.8/Tue May 11 11:31:31 2010// 32 /G4TrajectoryDrawByOriginVolume.hh/1.5/Tue May 11 11:31:31 2010// 33 /G4TrajectoryDrawByParticleID.hh/1.8/Tue May 11 11:31:31 2010// 34 /G4TrajectoryDrawerUtils.hh/1.9/Tue May 11 11:58:18 2010// 35 /G4TrajectoryFilterFactories.hh/1.4/Tue Sep 12 18:53:03 2006// 36 /G4TrajectoryGenericDrawer.hh/1.3/Tue May 11 11:31:31 2010// 37 /G4TrajectoryModelFactories.hh/1.6/Tue Sep 12 18:53:03 2006// 38 /G4TrajectoryOriginVolumeFilter.hh/1.3/Fri Aug 25 19:44:14 2006// 39 /G4TrajectoryParticleFilter.hh/1.3/Fri Aug 25 19:44:14 2006// 40 /G4VAttValueFilter.hh/1.2/Wed Dec 13 15:50:04 2006// 41 /G4VModel.hh/1.19/Mon Jul 10 16:09:30 2006// 42 /G4VModel.icc/1.12/Mon Jul 10 16:09:30 2006// 43 /G4VModelCommand.hh/1.4/Mon Sep 11 21:22:02 2006// 44 /G4VModelFactory.hh/1.6/Thu Jun 29 21:32:30 2006// 45 /G4VTrajectoryModel.hh/1.8/Tue May 11 11:31:31 2010// 46 /G4VisTrajContext.hh/1.4/Tue Feb 24 12:00:56 2009// 47 /G4VisTrajContext.icc/1.4/Tue Feb 24 12:00:56 2009// 48 48 D -
trunk/source/visualization/modeling/include/G4AttributeFilterT.hh
r1346 r1348 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4AttributeFilterT.hh,v 1. 6 2006/12/13 15:50:02 gunterExp $26 // $Id: G4AttributeFilterT.hh,v 1.7 2010/12/11 16:41:11 allison Exp $ 27 27 // GEANT4 tag $Name: $ 28 28 // … … 128 128 // Expect definition to exist 129 129 if (!G4AttUtils::ExtractAttDef(object, fAttName, attDef)) { 130 std::ostringstream o; 131 o <<"Unable to extract attribute definition named "<<fAttName; 132 G4Exception 133 ("G4AttributeFilterT::Evaluate", "InvalidAttributeDefinition", FatalErrorInArgument, o.str().c_str()); 130 static G4bool warnedUnableToExtract = false; 131 if (!warnedUnableToExtract) { 132 std::ostringstream o; 133 o <<"Unable to extract attribute definition named "<<fAttName; 134 G4Exception 135 ("G4AttributeFilterT::Evaluate", "InvalidAttributeDefinition", JustWarning, o.str().c_str()); 136 G4cout << "Available attributes:\n" 137 << object.GetAttDefs(); 138 warnedUnableToExtract = true; 139 } 140 return false; 134 141 } 135 142 … … 152 159 // Expect value to exist 153 160 if (!G4AttUtils::ExtractAttValue(object, fAttName, attVal)) { 154 std::ostringstream o; 155 o <<"Unable to extract attribute value named "<<fAttName; 156 G4Exception 157 ("G4AttributeFilterT::Evaluate", "InvalidAttributeValue", FatalErrorInArgument, o.str().c_str()); 161 static G4bool warnedUnableToExtract = false; 162 if (!warnedUnableToExtract) { 163 std::ostringstream o; 164 o <<"Unable to extract attribute value named "<<fAttName; 165 G4Exception 166 ("G4AttributeFilterT::Evaluate", "InvalidAttributeValue", JustWarning, o.str().c_str()); 167 } 168 G4cout << "Available attributes:\n" 169 << object.GetAttDefs(); 170 warnedUnableToExtract = true; 171 return false; 158 172 } 159 173 -
trunk/source/visualization/modeling/src/CVS/Entries
r1346 r1348 1 /G4AttFilterUtils.cc/1.4/Wed Dec 13 15:50:06 2006// Tgeant4-09-04-ref-002 /G4AxesModel.cc/1.6/Thu Jun 29 21:32:38 2006// Tgeant4-09-04-ref-003 /G4BoundingSphereScene.cc/1.11/Thu Jun 29 21:32:40 2006// Tgeant4-09-04-ref-004 /G4DigiFilterFactories.cc/1.1/Sun May 30 11:24:30 2010// Tgeant4-09-04-ref-005 /G4DigiModel.cc/1.1/Sun May 30 11:24:30 2010// Tgeant4-09-04-ref-006 /G4FlavoredParallelWorldModel.cc/1.7/Thu Jun 29 21:32:42 2006// Tgeant4-09-04-ref-007 /G4HitFilterFactories.cc/1.2/Sun May 30 11:24:03 2010// Tgeant4-09-04-ref-008 /G4HitsModel.cc/1.18/Tue Nov 14 14:42:08 2006// Tgeant4-09-04-ref-009 /G4LogicalVolumeModel.cc/1.14/Wed Nov 1 10:28:42 2006// Tgeant4-09-04-ref-0010 /G4ModelingParameters.cc/1.16/Tue May 11 11:13:35 2010// Tgeant4-09-04-ref-0011 /G4NullModel.cc/1.9/Thu Jun 29 21:32:50 2006// Tgeant4-09-04-ref-0012 /G4PSHitsModel.cc/1.4/Wed Nov 4 12:44:39 2009// Tgeant4-09-04-ref-0013 /G4PhysicalVolumeMassScene.cc/1.7/Mon Nov 6 09:24:13 2006// Tgeant4-09-04-ref-0014 /G4PhysicalVolumeModel.cc/1.68/Fri Nov 5 15:19:29 2010// Tgeant4-09-04-ref-0015 /G4PhysicalVolumeSearchScene.cc/1.14/Sun Jul 27 10:49:24 2008// Tgeant4-09-04-ref-0016 /G4ScaleModel.cc/1.4/Thu Jun 29 21:32:58 2006// Tgeant4-09-04-ref-0017 /G4TextModel.cc/1.7/Thu Jun 29 21:33:00 2006// Tgeant4-09-04-ref-0018 /G4TrajectoriesModel.cc/1.25/Tue May 11 11:21:52 2010// Tgeant4-09-04-ref-0019 /G4TrajectoryChargeFilter.cc/1.4/Fri Aug 25 19:44:14 2006// Tgeant4-09-04-ref-0020 /G4TrajectoryDrawByAttribute.cc/1. 5/Fri May 28 02:00:59 2010//Tgeant4-09-04-ref-0021 /G4TrajectoryDrawByCharge.cc/1.10/Fri May 28 02:00:59 2010// Tgeant4-09-04-ref-0022 /G4TrajectoryDrawByOriginVolume.cc/1.6/Fri May 28 02:00:59 2010// Tgeant4-09-04-ref-0023 /G4TrajectoryDrawByParticleID.cc/1.11/Tue Jun 1 21:17:41 2010// Tgeant4-09-04-ref-0024 /G4TrajectoryDrawerUtils.cc/1.1 5/dummy timestamp from new-entry//Tgeant4-09-04-ref-0025 /G4TrajectoryFilterFactories.cc/1.5/Tue Sep 12 18:53:03 2006// Tgeant4-09-04-ref-0026 /G4TrajectoryGenericDrawer.cc/1.3/Tue May 11 11:31:31 2010// Tgeant4-09-04-ref-0027 /G4TrajectoryModelFactories.cc/1.7/Tue Sep 12 18:53:03 2006// Tgeant4-09-04-ref-0028 /G4TrajectoryOriginVolumeFilter.cc/1.3/Fri Aug 25 19:44:14 2006// Tgeant4-09-04-ref-0029 /G4TrajectoryParticleFilter.cc/1.3/Fri Aug 25 19:44:14 2006// Tgeant4-09-04-ref-0030 /G4VModel.cc/1.14/Wed Nov 1 10:33:00 2006// Tgeant4-09-04-ref-0031 /G4VTrajectoryModel.cc/1.3/Thu Jun 29 21:33:26 2006// Tgeant4-09-04-ref-0032 /G4VisTrajContext.cc/1.6/Tue Feb 24 12:00:56 2009// Tgeant4-09-04-ref-001 /G4AttFilterUtils.cc/1.4/Wed Dec 13 15:50:06 2006// 2 /G4AxesModel.cc/1.6/Thu Jun 29 21:32:38 2006// 3 /G4BoundingSphereScene.cc/1.11/Thu Jun 29 21:32:40 2006// 4 /G4DigiFilterFactories.cc/1.1/Sun May 30 11:24:30 2010// 5 /G4DigiModel.cc/1.1/Sun May 30 11:24:30 2010// 6 /G4FlavoredParallelWorldModel.cc/1.7/Thu Jun 29 21:32:42 2006// 7 /G4HitFilterFactories.cc/1.2/Sun May 30 11:24:03 2010// 8 /G4HitsModel.cc/1.18/Tue Nov 14 14:42:08 2006// 9 /G4LogicalVolumeModel.cc/1.14/Wed Nov 1 10:28:42 2006// 10 /G4ModelingParameters.cc/1.16/Tue May 11 11:13:35 2010// 11 /G4NullModel.cc/1.9/Thu Jun 29 21:32:50 2006// 12 /G4PSHitsModel.cc/1.4/Wed Nov 4 12:44:39 2009// 13 /G4PhysicalVolumeMassScene.cc/1.7/Mon Nov 6 09:24:13 2006// 14 /G4PhysicalVolumeModel.cc/1.68/Fri Nov 5 15:19:29 2010// 15 /G4PhysicalVolumeSearchScene.cc/1.14/Sun Jul 27 10:49:24 2008// 16 /G4ScaleModel.cc/1.4/Thu Jun 29 21:32:58 2006// 17 /G4TextModel.cc/1.7/Thu Jun 29 21:33:00 2006// 18 /G4TrajectoriesModel.cc/1.25/Tue May 11 11:21:52 2010// 19 /G4TrajectoryChargeFilter.cc/1.4/Fri Aug 25 19:44:14 2006// 20 /G4TrajectoryDrawByAttribute.cc/1.6/Mon Jan 3 14:39:15 2011// 21 /G4TrajectoryDrawByCharge.cc/1.10/Fri May 28 02:00:59 2010// 22 /G4TrajectoryDrawByOriginVolume.cc/1.6/Fri May 28 02:00:59 2010// 23 /G4TrajectoryDrawByParticleID.cc/1.11/Tue Jun 1 21:17:41 2010// 24 /G4TrajectoryDrawerUtils.cc/1.16/Result of merge// 25 /G4TrajectoryFilterFactories.cc/1.5/Tue Sep 12 18:53:03 2006// 26 /G4TrajectoryGenericDrawer.cc/1.3/Tue May 11 11:31:31 2010// 27 /G4TrajectoryModelFactories.cc/1.7/Tue Sep 12 18:53:03 2006// 28 /G4TrajectoryOriginVolumeFilter.cc/1.3/Fri Aug 25 19:44:14 2006// 29 /G4TrajectoryParticleFilter.cc/1.3/Fri Aug 25 19:44:14 2006// 30 /G4VModel.cc/1.14/Wed Nov 1 10:33:00 2006// 31 /G4VTrajectoryModel.cc/1.3/Thu Jun 29 21:33:26 2006// 32 /G4VisTrajContext.cc/1.6/Tue Feb 24 12:00:56 2009// 33 33 D -
trunk/source/visualization/modeling/src/G4TrajectoryDrawByAttribute.cc
r1346 r1348 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4TrajectoryDrawByAttribute.cc,v 1. 5 2010/05/28 02:00:59allison Exp $26 // $Id: G4TrajectoryDrawByAttribute.cc,v 1.6 2010/12/11 16:41:11 allison Exp $ 27 27 // GEANT4 tag $Name: $ 28 28 // … … 97 97 // Expect definition to exist 98 98 if (!G4AttUtils::ExtractAttDef(object, fAttName, attDef)) { 99 std::ostringstream o; 100 o <<"Unable to extract attribute definition named "<<fAttName; 101 G4Exception 102 ("G4TrajectoryDrawByAttribute::Draw", "InvalidAttributeDefinition", FatalErrorInArgument, o.str().c_str()); 99 static G4bool warnedUnableToExtract = false; 100 if (!warnedUnableToExtract) { 101 std::ostringstream o; 102 o <<"Unable to extract attribute definition named "<<fAttName; 103 G4Exception 104 ("G4TrajectoryDrawByAttribute::Draw", "InvalidAttributeDefinition", JustWarning, o.str().c_str()); 105 G4cout << "Available attributes:\n" 106 << object.GetAttDefs(); 107 warnedUnableToExtract = true; 108 } 109 return; 103 110 } 104 111 … … 127 134 // Expect value to exist 128 135 if (!G4AttUtils::ExtractAttValue(object, fAttName, attVal)) { 136 static G4bool warnedUnableToExtract = false; 137 if (!warnedUnableToExtract) { 129 138 std::ostringstream o; 130 139 o <<"Unable to extract attribute value named "<<fAttName; 131 140 G4Exception 132 ("G4TrajectoryDrawByAttribute::Draw", "InvalidAttributeValue", FatalErrorInArgument, o.str().c_str()); 141 ("G4TrajectoryDrawByAttribute::Draw", "InvalidAttributeValue", JustWarning, o.str().c_str()); 142 G4cout << "Available attributes:\n" 143 << object.GetAttDefs(); 144 warnedUnableToExtract = true; 145 } 146 return; 133 147 } 134 148 -
trunk/source/visualization/modeling/src/G4TrajectoryDrawerUtils.cc
r1346 r1348 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4TrajectoryDrawerUtils.cc,v 1.1 5 2010/11/14 22:13:55allison Exp $26 // $Id: G4TrajectoryDrawerUtils.cc,v 1.16 2010/12/11 16:40:16 allison Exp $ 27 27 // GEANT4 tag $Name: $ 28 28 // … … 44 44 namespace G4TrajectoryDrawerUtils { 45 45 46 47 void GetPoints(const G4VTrajectory& traj, 48 G4Polyline& trajectoryLine, 49 G4Polymarker& auxiliaryPoints, 50 G4Polymarker& stepPoints) 51 { 46 enum TimesValidity {InvalidTimes, ValidTimes}; 47 48 TimesValidity GetPointsAndTimes 49 (const G4VTrajectory& traj, 50 const G4VisTrajContext& context, 51 G4Polyline& trajectoryLine, 52 G4Polymarker& auxiliaryPoints, 53 G4Polymarker& stepPoints, 54 std::vector<G4double>& trajectoryLineTimes, 55 std::vector<G4double>& auxiliaryPointTimes, 56 std::vector<G4double>& stepPointTimes) 57 { 58 TimesValidity validity = InvalidTimes; 59 if (context.GetTimeSliceInterval()) validity = ValidTimes; 60 61 // Memory for last trajectory point position for auxiliary point 62 // time interpolation algorithm. There are no auxiliary points 63 // for the first trajectory point, so its initial value is 64 // immaterial. 65 G4ThreeVector lastTrajectoryPointPosition; 66 52 67 // Keep positions. Don't store unless first or different. 53 68 std::vector<G4ThreeVector> positions; … … 62 77 if (positions.size() == 0 || 63 78 trajectoryPointPosition != positions[positions.size()-1]) { 79 80 // Pre- and Post-Point times from the trajectory point... 81 G4double trajectoryPointPreTime = -std::numeric_limits<double>::max(); 82 G4double trajectoryPointPostTime = std::numeric_limits<double>::max(); 83 84 if (context.GetTimeSliceInterval() && validity == ValidTimes) { 85 86 std::vector<G4AttValue>* trajectoryPointAttValues = 87 aTrajectoryPoint->CreateAttValues(); 88 if (!trajectoryPointAttValues) { 89 static G4bool warnedNoAttValues = false; 90 if (!warnedNoAttValues) { 91 G4cout << 92 "*************************************************************************" 93 "\n* WARNING: G4TrajectoryDrawerUtils::GetPointsAndTimes: no att values." 94 "\n*************************************************************************" 95 << G4endl; 96 warnedNoAttValues = true; 97 } 98 validity = InvalidTimes; 99 } else { 100 G4bool foundPreTime = false, foundPostTime = false; 101 for (std::vector<G4AttValue>::iterator i = 102 trajectoryPointAttValues->begin(); 103 i != trajectoryPointAttValues->end(); ++i) { 104 if (i->GetName() == "PreT") { 105 trajectoryPointPreTime = 106 G4UIcommand::ConvertToDimensionedDouble(i->GetValue()); 107 foundPreTime = true; 108 } 109 if (i->GetName() == "PostT") { 110 trajectoryPointPostTime = 111 G4UIcommand::ConvertToDimensionedDouble(i->GetValue()); 112 foundPostTime = true; 113 } 114 } 115 if (!foundPreTime || !foundPostTime) { 116 static G4bool warnedTimesNotFound = false; 117 if (!warnedTimesNotFound) { 118 G4cout << 119 "*************************************************************************" 120 "\n* WARNING: G4TrajectoryDrawerUtils::GetPointsAndTimes: times not found." 121 "\n*************************************************************************" 122 << G4endl; 123 warnedTimesNotFound = true; 124 } 125 validity = InvalidTimes; 126 } 127 } 128 } 64 129 65 130 const std::vector<G4ThreeVector>* auxiliaries … … 74 139 trajectoryLine.push_back(auxPointPosition); 75 140 auxiliaryPoints.push_back(auxPointPosition); 141 if (validity == ValidTimes) { 142 // Interpolate time for auxiliary points... 143 const G4ThreeVector& auxPointPosition = (*auxiliaries)[iAux]; 144 G4double s1 = 145 (auxPointPosition - lastTrajectoryPointPosition).mag(); 146 G4double s2 = 147 (trajectoryPointPosition - auxPointPosition).mag(); 148 G4double t = trajectoryPointPreTime + 149 (trajectoryPointPostTime - trajectoryPointPreTime) * 150 (s1 / (s1 + s2)); 151 trajectoryLineTimes.push_back(t); 152 auxiliaryPointTimes.push_back(t); 153 } 76 154 } 77 155 } … … 81 159 trajectoryLine.push_back(trajectoryPointPosition); 82 160 stepPoints.push_back(trajectoryPointPosition); 83 } 84 } 161 if (validity == ValidTimes) { 162 trajectoryLineTimes.push_back(trajectoryPointPostTime); 163 stepPointTimes.push_back(trajectoryPointPostTime); 164 } 165 lastTrajectoryPointPosition = trajectoryPointPosition; 166 } 167 } 168 return validity; 85 169 } 86 170 … … 476 560 if (!context.GetDrawLine() && !context.GetDrawAuxPts() && !context.GetDrawStepPts()) return; 477 561 478 // Get points to draw 562 // Get points and times (times are returned only if time-slicing 563 // is requested). 479 564 G4Polyline trajectoryLine; 480 565 G4Polymarker stepPoints; 481 566 G4Polymarker auxiliaryPoints; 482 483 GetPoints(traj, trajectoryLine, auxiliaryPoints, stepPoints); 484 485 if (context.GetTimeSliceInterval()) { 486 487 // Get corresponding track time information, if any 488 std::vector<G4double> trajectoryLineTimes; 489 std::vector<G4double> stepPointTimes; 490 std::vector<G4double> auxiliaryPointTimes; 491 492 GetTimes(traj, trajectoryLineTimes, auxiliaryPointTimes, stepPointTimes); 493 494 // Check validity 495 if (trajectoryLineTimes.size() != trajectoryLine.size() || 496 stepPointTimes.size() != stepPoints.size() || 497 auxiliaryPointTimes.size() != auxiliaryPoints.size()) { 498 499 // Revert to drawing without time information... 500 DrawWithoutTime(context, trajectoryLine, auxiliaryPoints, stepPoints); 501 } else { 502 503 SliceLine(context.GetTimeSliceInterval(), 504 trajectoryLine, trajectoryLineTimes); 505 506 DrawWithTime(context, 507 trajectoryLine, auxiliaryPoints, stepPoints, 508 trajectoryLineTimes, auxiliaryPointTimes, stepPointTimes); 509 } 567 std::vector<G4double> trajectoryLineTimes; 568 std::vector<G4double> stepPointTimes; 569 std::vector<G4double> auxiliaryPointTimes; 570 571 TimesValidity validity = GetPointsAndTimes 572 (traj, context, 573 trajectoryLine, auxiliaryPoints, stepPoints, 574 trajectoryLineTimes, auxiliaryPointTimes, stepPointTimes); 575 576 if (validity == ValidTimes) { 577 578 SliceLine(context.GetTimeSliceInterval(), 579 trajectoryLine, trajectoryLineTimes); 580 581 DrawWithTime(context, 582 trajectoryLine, auxiliaryPoints, stepPoints, 583 trajectoryLineTimes, auxiliaryPointTimes, stepPointTimes); 510 584 511 585 } else {
Note: See TracChangeset
for help on using the changeset viewer.
