Ignore:
Timestamp:
Nov 16, 2007, 11:59:21 AM (18 years ago)
Author:
garnier
Message:

r659@mac-90108: laurentgarnier | 2007-11-16 12:02:01 +0100
mise a jour de Geant4 au head ET qq mise a jour pour Qt de mon cote

Location:
trunk/geant4/visualization
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/visualization/History

    r593 r609  
    1 $Id: History,v 1.414 2007/07/10 17:54:09 allison Exp $
     1$Id: History,v 1.417 2007/11/15 10:18:32 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2424History file for visualization category
    2525---------------------------------------
     26
     2715th November 2007  John Allison
     28- opengl-V09-00-03: Re-introduced Qt files. (All files now properly protected.)
     29
     3013th November 2007  John Allison  (vis-V09-00-02)
     31- Removed OpenGL Qt files from tag.  File are still at head - need fixing.
     32
     3310th November 2007  John Allison  (vis-V09-00-01)
     34- opengl-V09-00-01: Minor improvements in design and messaging.
     35- modeling-V09-00-00: Minor improvements in messaging.
     36- visman-V09-00-01:Minor improvement in messaging.
    2637
    273810th July 2007  John Allison  (vis-V09-00-00)

  • trunk/geant4/visualization/OpenGL/History

    r593 r609  
    1 $Id: History,v 1.94 2007/08/21 14:05:50 allison Exp $
     1$Id: History,v 1.100 2007/11/16 10:41:54 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2121-------------------------------------
    2222
     23<<<<<<< History
     2415 Nov 2007, Laurent Garnier
     25 - G4UIQt,G4Qt : Adding a GEANT4_QT_DEBUG flag to hide all debug messages
     26 - G4UIQt,G4Qt : Compilation improvements for Qt3
     27 - G4UIQt,G4Qt : Minors corrections on G4UIQt helpWidget
     28
     2914 Nov 2007, Laurent Garnier
     30 - G4OpenGLStoredQtViewer.cc : Correction of a bug with mouse move event in
     31     Qt4
     32 - G4OpenGLQtExportDialog_moc.cc, G4OpenGLQtViewer.cc, G4OpenGLQtViewer_moc.cc :
     33     Adding protection for Qt version between 4.0 and 4.2
     34
     3513 Nov 2007, Laurent Garnier
     36 - G4UIQt,G4Qt : Moving all moc in one big file interface/G4UIQT_moc.cc,
     37   including Qt3 and Qt4 moc support
     38
     3909 Nov 2007, Laurent Garnier
     40 - G4UIQt,G4Qt : Change all include directive to be compatible with Qt3
     41
     4208 Nov 2007, Laurent Garnier
     43 - moc_G4OpenGLQtExportDialog.cc move in G4OpenGLQtExportDialog_moc.cc
     44 - moc_G4OpenGLQtViewer.cc move to G4OpenGLQtViewer_moc.cc
     45
     4627 Sept 2007, Laurent Garnier
     47 - Adding sur files for G4UIQt driver :
     48   - G4OpenGLImmediateQt.cc
     49   - G4OpenGLImmediateQtViewer.cc
     50   - G4OpenGLQtExportDialog.cc
     51   - G4OpenGLQtViewer.cc
     52   - G4OpenGLStoredQt.cc
     53   - G4OpenGLStoredQtViewer.cc
     54   - moc_G4OpenGLQtExportDialog.cc
     55   - moc_G4OpenGLQtViewer.cc
     56
     57=======
     5815th November 2007  John Allison  (opengl-V09-00-03)
     59- Re-introduced Qt files, now properly protected by cpp flags.
     60- cpp flags also added to some other files not previously properly protected.
     61
     6213th November 2007  John Allison  (opengl-V09-00-02)
     63- Removed Qt files from tag.  File are still at head - need fixing.
     64
     6510th November 2007  John Allison  (opengl-V09-00-01)
     66- Moved WinSize_x, y to base class G4OpenGLViewer.
     67- Minor improvement in guidance for /vis/ogl/printEPS.
     68
     6928th September 2007  lgarnier
     70- first import of G4UI Qt files : Do not try to compil them
     71
     72>>>>>>> 1.99
    237321st August 2007  John Allison  (opengl-V09-00-00)
    2474- Removed redundant G4OpenGLXViewerMessenger.
    … …  
    2777- G4OpenGLSceneHandler and G4OpenGLXViewerMessenger:
    2878  Fixed gcc-4.1.2 compiler warnings.
    29 
    30 G4OpenGLXViewer: Trapped glXMakeCurrent in Initialise function.
    3179
    328025th May 2007  John Allison  (opengl-V08-03-02)

  • trunk/geant4/visualization/OpenInventor/History

    r593 r609  
    1 $Id: History,v 1.93 2007/04/03 13:35:48 allison Exp $
     1$Id: History,v 1.94 2007/10/23 14:56:35 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2020History file for visualization/OpenInventor
    2121-------------------------------------------
     22
     2323rd October 2007  Gabriele Cosmo
     24- Initialise local vectors in SoPolyhedron.cc to fix compilation warnings
     25  on gcc-4.2.2 for use of non-initialised values.
    2226
    23273rd April 2007  John Allison  (openinventor-V08-02-02 - needs visman-V08-02-03)

  • trunk/geant4/visualization/OpenInventor/include/SoG4Polyhedron.h

    r593 r609  
    2525//
    2626//
    27 // $Id: SoG4Polyhedron.h,v 1.2 2006/12/13 15:49:56 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-00-ref-01 $
     27// $Id: SoG4Polyhedron.h,v 1.3 2007/09/17 16:08:00 gcosmo Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030// John Allison  26th October 2006
    … …  
    3535
    3636// Inheritance :
    37 #include <Geant4_SoPolyhedron.h>
     37#include "Geant4_SoPolyhedron.h"
    3838#include "G4AttHolder.hh"
    3939

  • trunk/geant4/visualization/OpenInventor/src/SoPolyhedron.cc

    r529 r609  
    129129     SoTextureCoordinateElement::FUNCTION);
    130130  const SoTextureCoordinateElement *tce = NULL;
    131   SbVec4f texCoord;
     131  SbVec4f texCoord(0.,0.,0.,0.);
    132132  if (useTexFunction) {
    133133    tce = SoTextureCoordinateElement::getInstance(state);
    … …  
    416416    int32_t* coords = new int32_t[ncoord];
    417417
    418     SbVec3f pvb,pve;
     418    SbVec3f pvb(0.,0.,0.), pve(0.,0.,0.);
    419419
    420420    SbBool empty = TRUE;

  • trunk/geant4/visualization/management/History

    r593 r609  
    1 $Id: History,v 1.101 2007/07/10 17:52:25 allison Exp $
     1$Id: History,v 1.102 2007/11/10 15:05:46 allison Exp $
    22
    33-------------------------------------------------------------------
    … …  
    2626History file for visualization management sub-category
    2727------------------------------------------------------
     28
     2910th November 2007  John Allison  (visman-V09-00-01)
     30- G4VisManager.cc: Minor improvement in messaging.
     31- G4VisCommandsScene.cc: Improvements in /vis/scene/endOfEventAction messaging.
    2832
    293310th July 2007  John Allison  (visman-V09-00-00)

  • trunk/geant4/visualization/vis.mac

    r562 r609  
    1818# Use this open statement to get an .eps and .prim files
    1919# suitable for viewing in DAWN.
    20 /vis/open DAWNFILE
     20###/vis/open DAWNFILE
    2121#
    2222# Use this open statement instead for OpenGL in immediate mode.

  • trunk/geant4/visualization/visTutor/exN03Vis12.loop

    r562 r609  
    22/vis/ogl/set/startTime {startTime} ns {timeRange} ns
    33# Print eps file
    4 #/vis/oglx/printEPS
     4#/vis/ogl/printEPS

  • trunk/geant4/visualization/visTutor/exN03Vis12.mac

    r562 r609  
    11#######################################################################
    2 #  MACRO FILE NAME: exN03Vis12.mac                                     #
     2#  MACRO FILE NAME: exN03Vis12.mac                                    #
    33#                                                                     #
    4 #  AUTHOR(S): Laurent Garnier                                         #
     4#  AUTHOR(S): John Allison                                            #
    55#                                                                     #
    6 #  DATE: July 01, 2007                                                #
     6#  DATE: 16th August 2006                                             #
    77#                                                                     #
    8 #  CONTENTS: A basic macro for demonstrating Inventor driver          #
     8#  CONTENTS: A basic macro for demonstrating time slicing             #
    99#                                                                     #
    10 #  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis12.mac            #
     10#  USAGE:  % $G4BINDIR/exampleN03  visTutor/exN03Vis12.mac             #
    1111#                                                                     #
    12 #  REQUIRED PLATFORMS & SOFTWARES: Unix, Motif, X-window, OpenGL,Qt   #
    13 #                                  HEPVis                             #
    14 #                                  Inventor (TGS or SoFree)           #
     12#  REQUIRED PLATFORMS & SOFTWARES: Mac/Unix with X-Windows, OpenGL    #
    1513#                                                                     #
    16 #  ENVIRONMENTAL VARIABLES (C-MACROS) FOR INSTALLATION:               #
    17 #  (See geant4/source/visualization/README for details.)              #
    18 #                                                                     #
    19 #    % setenv G4VIS_BUILD_OIX_DRIVER       1                          #
    20 #                                                                     #
    21 #  ENVIRONMENTAL VARIABLES (C-MACROS) FOR COMPILATION:                #
    22 #  (See geant4/source/visualization/README for details.)              #
    23 #                                                                     #
    24 #    % setenv G4VIS_USE_OIQT               1                          #
    25 #                                                                     #
    2614#  ADDITIONAL NOTES:                                                  #
    2715#                                                                     #
    2816#######################################################################
    2917
    30 # Create "scene-0"
    31 /vis/scene/create
     18/control/verbose 2
     19/vis/verbose confirmations
    3220
    33 # Invoke the OpenInventor driver
    34 /vis/sceneHandler/create OGLIQT
    35 /vis/viewer/create
     21/vis/open OGLSX
     22/vis/drawVolume
     23/vis/scene/add/eventID
     24/vis/scene/add/trajectories rich
    3625
    37 # Add the world volume to the current scene
    38 /vis/scene/add/volume
    39 #/vis/scene/add/volume Layer
    40 # Name of the absorbers = name of their material (Lead) !
    41 #/vis/scene/add/volume Lead
    42 # Name of the gaps = name of their material (liquidArgon) !
    43 #/vis/scene/add/volume liquidArgon
    44 #/vis/scene/add/trajectories
    45 /tracking/storeTrajectory 1
     26# Set up drawByCharge with time slicing
     27/vis/modeling/trajectories/create/drawByCharge
     28/vis/modeling/trajectories/drawByCharge-0/default/setDrawStepPts true
     29/vis/modeling/trajectories/drawByCharge-0/default/setStepPtsSize 5
     30/vis/modeling/trajectories/drawByCharge-0/default/setDrawAuxPts true
     31/vis/modeling/trajectories/drawByCharge-0/default/setAuxPtsSize 5
     32/vis/modeling/trajectories/drawByCharge-0/default/setTimeSliceInterval 0.001 ns
     33/vis/modeling/trajectories/list
     34#/N03/det/setField 5 T
     35#/N03/det/update
     36/run/beamOn
    4637
    47 # Bird-eye view of events
    48 /vis/viewer/reset
    49 /vis/viewer/set/viewpointThetaPhi   45 45
     38# Configure OpenGL for display-by-time
     39/vis/ogl/set/fade 1
     40/vis/ogl/set/displayHeadTime true
     41/control/alias timeRange 0.1
     42/vis/verbose warnings
     43/control/verbose 0
     44/control/loop visTutor/exN03Vis12.loop startTime -{timeRange} 0.7 0.005
     45/control/verbose 2
     46/vis/verbose confirmations
     47/vis/ogl/set/displayHeadTime false
    5048
    51 /vis/scene/notifyHandlers
     49# Set up drawByParticleID with time slicing
     50/vis/modeling/trajectories/create/drawByParticleID
     51/vis/modeling/trajectories/drawByParticleID-0/set e- red
     52/vis/modeling/trajectories/drawByParticleID-0/set e+ blue
     53/vis/modeling/trajectories/drawByParticleID-0/set pi- cyan
     54/vis/modeling/trajectories/drawByParticleID-0/set pi+ magenta
     55#/vis/modeling/trajectories/drawByParticleID-0/default/setDrawStepPts true
     56/vis/modeling/trajectories/drawByParticleID-0/default/setStepPtsSize 5
     57#/vis/modeling/trajectories/drawByParticleID-0/default/setDrawAuxPts true
     58/vis/modeling/trajectories/drawByParticleID-0/default/setAuxPtsSize 5
     59/vis/modeling/trajectories/drawByParticleID-0/default/setTimeSliceInterval 0.001 ns
     60/vis/modeling/trajectories/list
    5261
     62# Remove gammas
     63/vis/filtering/trajectories/create/particleFilter
     64/vis/filtering/trajectories/particleFilter-0/add gamma
     65/vis/filtering/trajectories/particleFilter-0/invert true
     66
     67/gun/energy 1 GeV
     68/run/beamOn
     69/control/alias timeRange 0.1
     70/vis/ogl/set/displayHeadTime true
     71/vis/ogl/set/displayLightFront true -90 0 0 mm
     72/vis/verbose warnings
     73/control/verbose 0
     74/control/loop visTutor/exN03Vis12.loop startTime -{timeRange} 0.7 0.001
    5375/control/verbose 2
    54 #######################################################################
    55 #   Controls on an Inventor examiner viewer are :                     #
    56 #  - in picking mode (cursor is the upper left arrow)                 #
    57 #   Ctrl + pick a volume : see daughters.                             #
    58 #   Shift + pick a volume : see mother.                               #
    59 #  - in viewing mode (cursor is the hand)                             #
    60 #   Left-button + pointer move : rotate.                              #
    61 #   Ctrl+Left-button + pointer move : pane.                           #
    62 #   Ctrl+Shift+Left-button + pointer move : scale.                    #
    63 #   Middle-button + pointer move : pane.                              #
    64 #                                                                     #
    65 #######################################################################
     76/vis/verbose confirmations
     77/vis/ogl/set/displayLightFront false
     78/vis/ogl/set/displayHeadTime false
    6679
    67 /vis/viewer/update
    68 
    69 /run/beamOn 1
    70 
     80# To see pi -> mu -> e decay.
     81/gun/particle pi+
     82/vis/filtering/trajectories/particleFilter-0/add anti_nu_mu
     83/vis/filtering/trajectories/particleFilter-0/add nu_mu
     84/vis/filtering/trajectories/particleFilter-0/add anti_nu_e
     85/vis/filtering/trajectories/particleFilter-0/add nu_e
     86# Accumulate several events for effect
     87# /vis/scene/endOfEventAction accumulate
     88/gun/energy 100 MeV
     89#/vis/viewer/set/globalLineWidthScale 2
     90/run/beamOn
     91/control/alias timeRange 1000
     92/vis/ogl/set/displayHeadTime true
     93/vis/verbose warnings
     94/control/verbose 0
     95/control/loop visTutor/exN03Vis12.loop startTime -{timeRange} 3000 5
     96/control/verbose 2
     97/vis/verbose confirmations

  • trunk/geant4/visualization/visTutor/exN03Vis13.loop

    r562 r609  
    55/vis/viewer/refresh
    66# Print eps file
    7 #/vis/oglx/printEPS
     7#/vis/ogl/printEPS

  • trunk/geant4/visualization/visTutor/gui.mac

    r562 r609  
    3333/gui/addButton vis Vis3(OGLSX) "/control/execute visTutor/exN03Vis3.mac"
    3434/gui/addButton vis Vis4(OGLIX) "/control/execute visTutor/exN03Vis4.mac"
    35 /gui/addButton vis Vis12(OGLIQT) "/control/execute visTutor/exN03Vis12.mac"
     35/gui/addButton vis Vis15(OGLIQT) "/control/execute visTutor/exN03Vis15.mac"
    3636/gui/addButton vis Vis14(OGLSQT) "/control/execute visTutor/exN03Vis14.mac"
    3737/gui/addButton vis Vis5(OIX)   "/control/execute visTutor/exN03Vis5.mac"
Note: See TracChangeset for help on using the changeset viewer.