Ignore:
Timestamp:
Feb 25, 2009, 4:19:05 PM (15 years ago)
Author:
garnier
Message:

test pour GL_POINTS au lieu de glBitmap

Location:
trunk/source/visualization
Files:
88 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/GNUmakefile

    r924 r931  
    2424  SUBLIBS += G4zlib
    2525endif
     26
     27CPPFLAGS += -DG4DEBUG_VIS_OGL
    2628
    2729# Libraries which can be used without external packages or libraries...

  • trunk/source/visualization/History

    r924 r931  
    1 $Id: History,v 1.426 2009/02/16 15:31:05 lgarnier Exp $
     1$Id: History,v 1.427 2009/02/24 12:27:07 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2424History file for visualization category
    2525---------------------------------------
     26
     2724th February 2009  John Allison
     28- modeling-V09-02-00 - needs greps-V09-02-00:
     29  o Added setAux/StepPtsSizeType commands (candidates: "none world screen").
     30  o Added unit to setAux/StepPtsSize for SizeType == world.
    2631
    273216 February 2009, Laurent Garnier

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

    r917 r931  
    2525//
    2626//
    27 // $Id: G4OpenGLQtViewer.cc,v 1.35 2009/02/04 16:48:41 lgarnier Exp $
     27// $Id: G4OpenGLQtViewer.cc,v 1.36 2009/02/25 15:14:29 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

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

    r930 r931  
    160160void G4OpenGLSceneHandler::AddPrimitive (const G4Polyline& line)
    161161{
     162  printf("----1");
    162163  G4int nPoints = line.size ();
    163164  if (nPoints <= 0) return;
    … …  
    367368
    368369  // Draw...
    369 ///   if (sizeType == world) {  // Size specified in world coordinates.
    370     //    printf("G4OpenGLSceneHandler::AddCircleSquare  world\n");
    371     //    DrawXYPolygon (shape, size, centre, pVA);
    372 
    373 //   } else { // Size specified in screen (window) coordinates.
    374 //     printf("G4OpenGLSceneHandler::AddCircleSquare  bitmap\n");
    375 
    376      glRasterPos3d(centre.x(),centre.y(),centre.z());
    377      const GLubyte* marker =
    378        G4OpenGLBitMapStore::GetBitMap(shape, size, filled);
    379      glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
    380      glBitmap(GLsizei(size), GLsizei(size), size/2., size/2., 0., 0., marker);
    381 //   }
     370   if (sizeType == world) {  // Size specified in world coordinates.
     371     printf("G4OpenGLSceneHandler::AddCircleSquare  world\n");
     372     DrawXYPolygon (shape, size, centre, pVA);
     373
     374   } else { // Size specified in screen (window) coordinates.
     375     printf("G4OpenGLSceneHandler::AddCircleSquare  screen bitmap size:%d\n",size);
     376     
     377     int test=3;
     378     if (test == 1) {
     379          // Find window coordinates of centre...   
     380     GLdouble modelMatrix[16];   
     381     glGetDoublev (GL_MODELVIEW_MATRIX, modelMatrix);   
     382     G4double projectionMatrix[16];   
     383     glGetDoublev (GL_PROJECTION_MATRIX, projectionMatrix);   
     384     GLint viewport[4];   
     385     glGetIntegerv(GL_VIEWPORT,viewport);   
     386     GLdouble winx, winy, winz;   
     387     gluProject(centre.x(), centre.y(), centre.z(),   
     388                modelMatrix, projectionMatrix, viewport,   
     389                &winx, &winy, &winz);   
     390     
     391     // Determine ratio window:world...   
     392     const G4Vector3D& viewpointDirection =
     393       fpViewer -> GetViewParameters().GetViewpointDirection();
     394     const G4Vector3D& up = fpViewer->GetViewParameters().GetUpVector();
     395     const G4Vector3D inScreen = (up.cross(viewpointDirection)).unit();   
     396     const G4Vector3D p = centre + inScreen;   
     397     GLdouble winDx, winDy, winDz;   
     398     gluProject(p.x(), p.y(), p.z(),   
     399                modelMatrix, projectionMatrix, viewport,   
     400                &winDx, &winDy, &winDz);   
     401     G4double winWorldRatio = std::sqrt(std::pow(winx - winDx, 2) +   
     402                                   std::pow(winy - winDy, 2));   
     403     DrawXYPolygon (shape, size/winWorldRatio, centre, pVA);
     404
     405     } else if (test == 2) {
     406//        glMatrixMode(GL_PROJECTION);
     407       glPushMatrix();
     408//        glLoadIdentity();
     409       //       gluOrtho2D(0.0,640.0,480.0,10.0);
     410       
     411       //       glDisable(GL_DEPTH_TEST);
     412       glRotatef (30, 0, -1, 0);
     413       glRotatef (20, -1, 0, 0);
     414       glRotatef (50, 0, 0, -1);
     415       DrawXYPolygon (shape, size, centre, pVA);
     416       
     417       
     418       glPopMatrix();
     419       
     420//        glMatrixMode(GL_MODELVIEW);
     421       //       glEnable(GL_DEPTH_TEST);
     422     } else if (test == 3){                 // Avec DrawPolygone, mais en forcant
     423
     424       glPointSize (size);       
     425       glBegin (GL_POINTS);
     426       glVertex3f(centre.x(),centre.y(),centre.z());
     427       glEnd();
     428       //Antialiasing sur les points
     429       glEnable (GL_POINT_SMOOTH);
     430       //Gestion de la transparence
     431       glEnable(GL_BLEND);
     432       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     433
     434       //        const G4Point3D targetPoint
     435       //          = fSceneHandler.GetScene()->GetStandardTargetPoint()
     436       //          + fVP.GetCurrentTargetPoint ();
     437       //        G4double radius = fSceneHandler.GetScene()->GetExtent().GetExtentRadius();
     438       //        if(radius<=0.) radius = 1.;
     439       //        const G4double cameraDistance = fVP.GetCameraDistance (radius);
     440       //        const G4Point3D cameraPosition =
     441       //          targetPoint + cameraDistance * fVP.GetViewpointDirection().unit();
     442     } else {
     443       glRasterPos3d(centre.x(),centre.y(),centre.z());
     444       const GLubyte* marker =
     445         G4OpenGLBitMapStore::GetBitMap(shape, size, filled);
     446       glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
     447       glBitmap(GLsizei(size), GLsizei(size), size/2., size/2., 0., 0., marker);
     448     }
     449   }
    382450}
    383451

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

    r929 r931  
    220220{
    221221#ifdef G4DEBUG_VIS_OGL
    222   printf("G4OpenGLStoredQtViewer::paintGL ??\n");
     222  printf("G4OpenGLStoredQtViewer::paintGL ready %d hasTorepaint:%d\n",readyToPaint,hasToRepaint);
    223223#endif
    224224  if (!readyToPaint) {

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

    r929 r931  
    3333
    3434#ifdef G4VIS_BUILD_OPENGL_DRIVER
     35
     36#define G4DEBUG_VIS_OGL
    3537
    3638#include "G4ios.hh"
    … …  
    143145
    144146void G4OpenGLViewer::ClearView () {
     147#ifdef G4DEBUG_VIS_OGL
     148  printf("G4OpenGLViewer::ClearView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
     149#endif
    145150  glClearColor (background.GetRed(),
    146151                background.GetGreen(),
    … …  
    154159  glClear (GL_STENCIL_BUFFER_BIT);
    155160  glFlush ();
     161#ifdef G4DEBUG_VIS_OGL
     162  printf("G4OpenGLViewer::ClearView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
     163#endif
    156164}
    157165
    … …  
    169177
    170178void G4OpenGLViewer::SetView () {
     179
     180#ifdef G4DEBUG_VIS_OGL
     181  printf("G4OpenGLViewer::SetView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
     182#endif
    171183
    172184  if (!fSceneHandler.GetScene()) {
    … …  
    308320  background = fVP.GetBackgroundColour ();
    309321
     322#ifdef G4DEBUG_VIS_OGL
     323  printf("G4OpenGLViewer::SetView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
     324#endif
    310325}
    311326
    312327void G4OpenGLViewer::HaloingFirstPass () {
    313328 
     329#ifdef G4DEBUG_VIS_OGL
     330  printf("G4OpenGLViewer::HaloingFirstPass VVVVVVVVVVVVVVVVVV \n");
     331#endif
    314332  //To perform haloing, first Draw all information to the depth buffer
    315333  //alone, using a chunky line width, and then Draw all info again, to
    … …  
    334352void G4OpenGLViewer::HaloingSecondPass () {
    335353
     354#ifdef G4DEBUG_VIS_OGL
     355  printf("G4OpenGLViewer::HaloingSecondtPass VVVVVVVVVVVVVVVVVV \n");
     356#endif
    336357  //And finally, turn the colour buffer back on with a sesible line width...
    337358  glColorMask (GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
    … …  
    888909
    889910  // FIXME : TEST
    890   G4VMarker defaultMarker = GetViewParameters().GetDefaultMarker();
    891   defaultMarker.SetWorldSize(defaultMarker.GetScreenSize());
    892   defaultMarker.SetWorldDiameter(defaultMarker.GetScreenDiameter());
    893   defaultMarker.SetWorldRadius(defaultMarker.GetScreenRadius());
     911  printf("G4OpenGLViewer::WritePostScript world size:%f\n",GetViewParameters().GetDefaultMarker().GetWorldSize());
     912  G4ViewParameters vp = GetViewParameters(); 
     913  G4VMarker defaultMarker = vp.GetDefaultMarker();
     914  G4VMarker myMarker = vp.GetDefaultMarker();
     915
     916  myMarker.SetScreenSize(0); // before SetWorldSize
     917  myMarker.SetScreenDiameter(0); // before SetWorldSize
     918  myMarker.SetScreenRadius(0); // before SetWorldSize
     919
     920  myMarker.SetWorldSize(6.);
     921  myMarker.SetWorldDiameter(4.);
     922  myMarker.SetWorldRadius(3.);
     923//   myMarker.SetWorldSize(defaultMarker.GetScreenSize());
     924//   myMarker.SetWorldDiameter(defaultMarker.GetScreenDiameter());
     925//   myMarker.SetWorldRadius(defaultMarker.GetScreenRadius());
     926
     927  vp.SetDefaultMarker(myMarker);
     928  SetViewParameters(vp);
    894929
    895930  fGL2PSAction->setFileName("PostScriptViaGL2PS.ps");
    896931  if (fGL2PSAction->enableFileWriting()) {
    897     ShowView();
     932    NeedKernelVisit ();
    898933    ProcessView();
    899     DrawView();
     934    SetView ();
     935    ClearView ();
     936    DrawView ();
    900937    fGL2PSAction->disableFileWriting();
    901938  }
    902 //   defaultMarker.SetScreenSize(defaultMarker.GetWorldSize());
    903 //   defaultMarker.SetScreenDiameter(defaultMarker.GetWorldDiameter());
    904 //   defaultMarker.SetScreenRadius(defaultMarker.GetWorldRadius());
     939  vp.SetDefaultMarker(defaultMarker);
     940  SetViewParameters(vp);
    905941  // FIXME : TEST
    906942

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

    r916 r931  
    2525//
    2626//
    27 // $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1.8 2009/01/19 16:26:40 lgarnier Exp $
     27// $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1.9 2009/02/25 15:15:50 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

  • trunk/source/visualization/OpenInventor/History

    r924 r931  
    1 $Id: History,v 1.97 2009/02/16 15:31:05 lgarnier Exp $
     1$Id: History,v 1.98 2009/02/18 10:04:25 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2020History file for visualization/OpenInventor
    2121-------------------------------------------
     22
     2318 February 2009, Laurent Garnier
     24 - Bug fix in gl2ps drawing
    2225
    232616 February 2009, Laurent Garnier

  • trunk/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc

    r929 r931  
    2525//
    2626//
    27 // $Id: G4OpenInventorSceneHandler.cc,v 1.54 2008/04/04 13:40:04 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4OpenInventorSceneHandler.cc,v 1.55 2009/02/18 14:21:38 lgarnier Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    4646#include <Inventor/nodes/SoLineSet.h>
    4747#include <Inventor/nodes/SoCube.h>
    48 #include <Inventor/nodes/SoSphere.h>
    4948#include <Inventor/nodes/SoFont.h>
    5049#include <Inventor/nodes/SoText2.h>
    … …  
    230229void G4OpenInventorSceneHandler::AddPrimitive (const G4Polymarker& polymarker)
    231230{
    232   printf("G4OpenInventorSceneHandler::AddPrimitive------ \n");
    233 
    234231  AddProperties(polymarker.GetVisAttributes()); // Transformation, colour, etc.
    235232

  • trunk/source/visualization/OpenInventor/src/SoMarkerSet.cc

    r930 r931  
    657657//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
    658658{
    659   printf("HEPVis_SoMarkerSet::GLRender\n");
     659  //  printf("HEPVis_SoMarkerSet::GLRender\n");
    660660  SoState* state = aAction->getState();
    661661
    … …  
    711711//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
    712712{
    713   //  printf("drawMarker\n");
    714713  GLsizei w = 0,h = 0;
    715714  GLfloat xorig = 0,yorig = 0;
    … …  
    719718    w = h = 5;
    720719    xorig = yorig = 2;
     720  } else if((aStyle>=18)&&(aStyle<36)) {
     721    w = h = 7;
     722    xorig = yorig = 3;
     723  } else if((aStyle>=36)&&(aStyle<54)) {
     724    w = h = 9;
     725    xorig = yorig = 4;
     726  } else {
     727    return;
     728  }
     729  if (w != 0) {
    721730    GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
    722731    glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
    723732    delete bitmap;
    724   } else if((aStyle>=18)&&(aStyle<36)) {
    725     w = h = 7;
    726     xorig = yorig = 3;
    727     GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
    728     glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
    729     delete bitmap;
    730   } else if((aStyle>=36)&&(aStyle<54)) {
    731     w = h = 9;
    732     xorig = yorig = 4;
    733     GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
    734     glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
    735     delete bitmap;
    736   } else {
    737     return;
    738733  }
     734  printf("DM %d %d %f %f",w,h,xorig,yorig);
    739735
    740736  if(aAction->isOfType(SoGL2PSAction::getClassTypeId())) {
    741     ((SoGL2PSAction*)aAction)->addBitmap(w,h,xorig,yorig,xmove,ymove);
     737    printf(" GL2PS ");
     738    ((SoGL2PSAction*)aAction)->addBitmap(w-2,h-2,xorig,yorig,xmove,ymove);
    742739  }
    743740

  • trunk/source/visualization/management/src/G4VSceneHandler.cc

    r850 r931  
    2626//
    2727// $Id: G4VSceneHandler.cc,v 1.83 2008/01/04 22:03:46 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r913 r931  
    8888{
    8989  fDefaultMarker.SetScreenSize (5.);
     90  printf("G4ViewParameters -------------------------------------------------------------\n");
    9091  // Markers are 5 pixels "overall" size, i.e., diameter.
    9192}

  • trunk/source/visualization/management/src/G4VisCommandsSceneHandler.cc

    r850 r931  
    2626//
    2727// $Id: G4VisCommandsSceneHandler.cc,v 1.32 2006/06/29 21:29:46 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: $
    2929
    3030// /vis/sceneHandler commands - John Allison  10th October 1998

  • trunk/source/visualization/management/src/G4VisStateDependent.cc

    r850 r931  
    2626//
    2727// $Id: G4VisStateDependent.cc,v 1.6 2006/06/29 21:30:02 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: $
    2929
    3030#include "G4VisStateDependent.hh"

  • trunk/source/visualization/modeling/History

    r916 r931  
    1 $Id: History,v 1.106 2008/11/21 21:50:02 perl Exp $
     1$Id: History,v 1.109 2009/02/25 14:21:45 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2121---------------------------------------
    2222
    23 27th July 2008  John Allison (modeling-V09-01-01)
     2325th February 2009  John Allison  (modeling-V09-02-01 - needs greps-V09-02-01)
     24- G4ModelApplyCommandsT: Added visManager->NotifyHandlers() after
     25  application (Apply) of all commands.  Forces update of all viewers
     26  after a change of model, e.g., trajectory colour, point size, etc.
     27
     2824th February 2009  John Allison  (modeling-V09-02-00 - needs greps-V09-02-00)
     29- Added setAux/StepPtsSizeType commands (candidates: "none world screen").
     30- Added unit to setAux/StepPtsSize for SizeType == world.
     31
     3227th July 2008  John Allison  (modeling-V09-01-01)
    2433- G4PhysicalVolumeSearchScene.cc: Cosmetic improvement to a message.
    2534

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

    r850 r931  
    2525//
    2626// $Id: G4AttFilterUtils.hh,v 1.2 2006/12/13 15:49:58 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Visualisation attribute filter utility functions.

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

    r850 r931  
    2525//
    2626// $Id: G4AttValueFilterT.hh,v 1.3 2006/12/13 15:50:00 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Templated class for G4AttValue filters.

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

    r850 r931  
    2525//
    2626// $Id: G4AttributeFilterT.hh,v 1.6 2006/12/13 15:50:02 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Generic attribute filter.

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

    r850 r931  
    2626//
    2727// $Id: G4AxesModel.hh,v 1.6 2006/11/01 10:28:42 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r842 r931  
    2626//
    2727// $Id: G4BoundingSphereScene.hh,v 1.18 2008/01/04 21:59:15 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4CallbackModel.hh,v 1.5 2006/06/29 21:30:10 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4FlavoredParallelWorldModel.hh,v 1.8 2006/06/29 21:30:12 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030// P. Mora de Freitas et M.Verderi - 19 June 1998.

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

    r850 r931  
    2525//
    2626/// $Id: G4HitFilterFactories.hh,v 1.1 2006/09/12 18:53:03 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929//

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

    r850 r931  
    2626//
    2727// $Id: G4HitsModel.hh,v 1.10 2006/11/02 11:57:31 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4LogicalVolumeModel.hh,v 1.9 2006/11/01 10:28:42 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2424// ********************************************************************
    2525//
    26 // $Id: G4ModelApplyCommandsT.hh,v 1.5 2006/09/11 21:22:02 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     26// $Id: G4ModelApplyCommandsT.hh,v 1.6 2009/02/25 14:17:11 allison Exp $
     27// GEANT4 tag $Name: $
    2828//
    2929// Abstract model messenges. Derived classes should implement
    … …  
    4444#include "G4UIcommand.hh"
    4545#include "G4VModelCommand.hh"
    46 #include "globals.hh"
     46#include "G4VVisManager.hh"
    4747#include <sstream>
    4848
    … …  
    152152
    153153  Apply(parameter, myColour);
     154  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
     155  if (visManager) visManager->NotifyHandlers();
    154156}
    155157
    … …  
    254256
    255257  Apply(myColour);
     258  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
     259  if (visManager) visManager->NotifyHandlers();
    256260}
    257261
    … …  
    301305{
    302306  Apply(fpCmd->GetNewBoolValue(newValue));
     307  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
     308  if (visManager) visManager->NotifyHandlers();
    303309}
    304310
    … …  
    347353{
    348354  Apply();
     355  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
     356  if (visManager) visManager->NotifyHandlers();
    349357}
    350358
    … …  
    395403{
    396404  Apply(fpCmd->GetNewDoubleValue(newValue));
     405  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
     406  if (visManager) visManager->NotifyHandlers();
    397407}
    398408
    … …  
    443453{
    444454  Apply(fpCmd->GetNewDoubleValue(newValue));
     455  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
     456  if (visManager) visManager->NotifyHandlers();
    445457}
    446458
    … …  
    490502{
    491503  Apply(fpCmd->GetNewIntValue(newValue));
     504  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
     505  if (visManager) visManager->NotifyHandlers();
    492506}
    493507
    … …  
    537551{
    538552  Apply(newValue);
     553  G4VVisManager* visManager = G4VVisManager::GetConcreteInstance();
     554  if (visManager) visManager->NotifyHandlers();
    539555}
    540556

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

    r850 r931  
    2525//
    2626// $Id: G4ModelColourMap.hh,v 1.2 2006/06/29 21:30:22 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Generic variable->G4Colour map, where "variable" is the template

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

    r850 r931  
    2424// ********************************************************************
    2525//
    26 // $Id: G4ModelCommandUtils.hh,v 1.2 2006/09/13 12:54:31 allison Exp $
    27 // GEANT4 tag $Name: HEAD $
     26// $Id: G4ModelCommandUtils.hh,v 1.3 2009/02/24 12:00:56 allison Exp $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay September 2006
    … …  
    5353    messengers.push_back(new G4ModelCmdSetStepPtsColour<G4VisTrajContext>(context, placement));
    5454    messengers.push_back(new G4ModelCmdSetStepPtsSize<G4VisTrajContext>(context, placement));
     55    messengers.push_back(new G4ModelCmdSetStepPtsSizeType<G4VisTrajContext>(context, placement));
    5556    messengers.push_back(new G4ModelCmdSetStepPtsType<G4VisTrajContext>(context, placement));
    5657    messengers.push_back(new G4ModelCmdSetStepPtsFillStyle<G4VisTrajContext>(context, placement));
    … …  
    6061    messengers.push_back(new G4ModelCmdSetAuxPtsColour<G4VisTrajContext>(context, placement));
    6162    messengers.push_back(new G4ModelCmdSetAuxPtsSize<G4VisTrajContext>(context, placement));
     63    messengers.push_back(new G4ModelCmdSetAuxPtsSizeType<G4VisTrajContext>(context, placement));
    6264    messengers.push_back(new G4ModelCmdSetAuxPtsType<G4VisTrajContext>(context, placement));
    6365    messengers.push_back(new G4ModelCmdSetAuxPtsFillStyle<G4VisTrajContext>(context, placement));

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

    r850 r931  
    2424// ********************************************************************
    2525//
    26 // $Id: G4ModelCommandsT.hh,v 1.12 2006/11/01 10:34:03 allison Exp $
    27 // GEANT4 tag $Name: HEAD $
     26// $Id: G4ModelCommandsT.hh,v 1.13 2009/02/24 12:00:56 allison Exp $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Generic model messenges.
    … …  
    398398// Set auxiliary points size command
    399399template <typename M>
    400 class G4ModelCmdSetAuxPtsSize : public G4ModelCmdApplyDouble<M> {
     400class G4ModelCmdSetAuxPtsSize : public G4ModelCmdApplyString<M> {
    401401 
    402402public:
    403403
    404404  G4ModelCmdSetAuxPtsSize(M* model, const G4String& placement,
    405                           const G4String& cmdName="setAuxPtsSize")
    406     :G4ModelCmdApplyDouble<M>(model, placement, cmdName)
    407   {
    408     G4ModelCmdApplyDouble<M>::Command()->SetGuidance("Set auxiliary points size command");
    409   }
    410  
    411 protected:
    412 
    413    void Apply(const G4double& myDouble) {
    414      G4VModelCommand<M>::Model()->SetAuxPtsSize(myDouble);
    415   }
     405                           const G4String& cmdName="setAuxPtsSize")
     406    :G4ModelCmdApplyString<M>(model, placement, cmdName)
     407  {
     408    G4ModelCmdApplyString<M>::Command()->SetGuidance("Set auxiliary points size command");
     409  }
     410 
     411protected:
     412
     413   void Apply(const G4String& sizeString) {
     414     std::istringstream iss(sizeString);
     415     G4double size;
     416     G4String unit;
     417     iss >> size >> unit;
     418     if (G4VModelCommand<M>::Model()->GetAuxPtsSizeType() == G4VMarker::world)
     419       {
     420         G4double myDouble = G4UIcmdWithADoubleAndUnit::GetNewDoubleValue(sizeString);
     421         G4VModelCommand<M>::Model()->SetAuxPtsSize(myDouble);
     422       }
     423     else  // none or screen
     424       {
     425         G4VModelCommand<M>::Model()->SetAuxPtsSize(size);
     426       }
     427   }
    416428 
    417429};
    … …  
    420432// Set step points size command
    421433template <typename M>
    422 class G4ModelCmdSetStepPtsSize : public G4ModelCmdApplyDouble<M> {
     434class G4ModelCmdSetStepPtsSize : public G4ModelCmdApplyString<M> {
    423435 
    424436public:
    … …  
    426438  G4ModelCmdSetStepPtsSize(M* model, const G4String& placement,
    427439                           const G4String& cmdName="setStepPtsSize")
    428     :G4ModelCmdApplyDouble<M>(model, placement, cmdName)
    429   {
    430     G4ModelCmdApplyDouble<M>::Command()->SetGuidance("Set step points size command");
    431   }
    432  
    433 protected:
    434 
    435    void Apply(const G4double& myDouble) {
    436      G4VModelCommand<M>::Model()->SetStepPtsSize(myDouble);
    437   }
     440    :G4ModelCmdApplyString<M>(model, placement, cmdName)
     441  {
     442    G4ModelCmdApplyString<M>::Command()->SetGuidance("Set step points size command");
     443  }
     444 
     445protected:
     446
     447   void Apply(const G4String& sizeString) {
     448     std::istringstream iss(sizeString);
     449     G4double size;
     450     G4String unit;
     451     iss >> size >> unit;
     452     if (G4VModelCommand<M>::Model()->GetStepPtsSizeType() == G4VMarker::world)
     453       {
     454         G4double myDouble = G4UIcmdWithADoubleAndUnit::GetNewDoubleValue(sizeString);
     455         G4VModelCommand<M>::Model()->SetStepPtsSize(myDouble);
     456       }
     457     else  // none or screen
     458       {
     459         G4VModelCommand<M>::Model()->SetStepPtsSize(size);
     460       }
     461   }
    438462 
    439463};
    … …  
    516540
    517541////////////////////////////////////////////////////////////////////////
     542// Set step points size type command
     543template <typename M>
     544class G4ModelCmdSetStepPtsSizeType : public G4ModelCmdApplyString<M> {
     545 
     546public:
     547
     548  G4ModelCmdSetStepPtsSizeType(M* model, const G4String& placement,
     549                                const G4String& cmdName="setStepPtsSizeType")
     550    :G4ModelCmdApplyString<M>(model, placement, cmdName)
     551  {
     552    G4UIcmdWithAString* cmd = G4ModelCmdApplyString<M>::Command();
     553    cmd->SetGuidance("Set step size type.");
     554    cmd->SetCandidates("none world screen");
     555  }
     556 
     557protected:
     558
     559  void Apply(const G4String& type) {
     560    G4VMarker::SizeType mySizeType;
     561   
     562    if (type == "none") {mySizeType = G4VMarker::none;}
     563    else if (type == "world") {mySizeType = G4VMarker::world;}
     564    else if (type == "screen") {mySizeType = G4VMarker::screen;}
     565    else {
     566      std::ostringstream o;
     567      o << "Invalid argument. See command guidance for options.";
     568      G4Exception
     569        ("G4ModelCmdSetStepPtsSizeType::Apply",
     570         "InvalidArgument", JustWarning, o.str().c_str());
     571      return;
     572    }
     573    G4VModelCommand<M>::Model()->SetStepPtsSizeType(mySizeType);
     574  }
     575 
     576};
     577
     578////////////////////////////////////////////////////////////////////////
     579// Set auxiliary points size type command
     580template <typename M>
     581class G4ModelCmdSetAuxPtsSizeType : public G4ModelCmdApplyString<M> {
     582 
     583public:
     584
     585  G4ModelCmdSetAuxPtsSizeType(M* model, const G4String& placement,
     586                               const G4String& cmdName="setAuxPtsSizeType")
     587    :G4ModelCmdApplyString<M>(model, placement, cmdName)
     588  {
     589    G4UIcmdWithAString* cmd = G4ModelCmdApplyString<M>::Command();
     590    cmd->SetGuidance("Set auxiliary size type.");
     591    cmd->SetCandidates("none world screen");
     592  }
     593 
     594protected:
     595
     596  void Apply(const G4String& type) {
     597    G4VMarker::SizeType mySizeType;
     598   
     599    if (type == "none") {mySizeType = G4VMarker::none;}
     600    else if (type == "world") {mySizeType = G4VMarker::world;}
     601    else if (type == "screen") {mySizeType = G4VMarker::screen;}
     602    else {
     603      std::ostringstream o;
     604      o << "Invalid argument. See command guidance for options.";
     605      G4Exception
     606        ("G4ModelCmdSetAuxPtsSizeType::Apply",
     607         "InvalidArgument", JustWarning, o.str().c_str());
     608      return;
     609    }
     610    G4VModelCommand<M>::Model()->SetAuxPtsSizeType(mySizeType);
     611  }
     612 
     613};
     614
     615////////////////////////////////////////////////////////////////////////
    518616// Set step points fill style command
    519617template <typename M>

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

    r850 r931  
    2525//
    2626// $Id: G4ModelCompoundCommandsT.hh,v 1.1 2006/09/11 21:52:18 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay September 2006

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

    r850 r931  
    2626//
    2727// $Id: G4ModelingParameters.hh,v 1.17 2006/11/14 14:42:08 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4ModelingParameters.icc,v 1.11 2006/11/14 14:42:08 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4NullModel.hh,v 1.7 2006/06/29 21:30:30 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r842 r931  
    2626//
    2727// $Id: G4PhysicalVolumeMassScene.hh,v 1.9 2008/01/04 21:59:15 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4PhysicalVolumeModel.hh,v 1.34 2007/04/03 13:46:49 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r842 r931  
    2626//
    2727// $Id: G4PhysicalVolumeSearchScene.hh,v 1.18 2008/01/04 21:59:15 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4PhysicalVolumeSearchScene.icc,v 1.6 2006/06/29 21:30:38 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4ScaleModel.hh,v 1.4 2006/11/01 10:28:42 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4TextModel.hh,v 1.7 2006/11/01 10:28:42 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4TrajectoriesModel.hh,v 1.10 2006/10/26 11:10:23 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryChargeFilter.hh,v 1.3 2006/08/25 19:44:14 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Filter trajectories according to charge. Only registered

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryDrawByAttribute.hh,v 1.1 2006/09/11 21:52:18 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay September 2006

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryDrawByCharge.hh,v 1.7 2006/06/29 21:31:49 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryDrawByOriginVolume.hh,v 1.4 2006/06/29 21:31:51 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Class Description:

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryDrawByParticleID.hh,v 1.7 2006/06/29 21:31:53 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryDrawerUtils.hh,v 1.7 2007/05/30 08:56:55 allison Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005

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

    r850 r931  
    2525//
    2626/// $Id: G4TrajectoryFilterFactories.hh,v 1.4 2006/09/12 18:53:03 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929//

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryGenericDrawer.hh,v 1.2 2006/06/29 21:31:59 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryModelFactories.hh,v 1.6 2006/09/12 18:53:03 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl October 2005

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryOriginVolumeFilter.hh,v 1.3 2006/08/25 19:44:14 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Filter trajectories according to volume name. Only registered

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryParticleFilter.hh,v 1.3 2006/08/25 19:44:14 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Filter trajectories according to particle type. Only registered

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

    r850 r931  
    2525//
    2626// $Id: G4VAttValueFilter.hh,v 1.2 2006/12/13 15:50:04 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Abstract base class for G4AttValue filters

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

    r850 r931  
    2626//
    2727// $Id: G4VModel.hh,v 1.19 2006/07/10 16:09:30 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4VModel.icc,v 1.12 2006/07/10 16:09:30 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2525//
    2626// $Id: G4VModelCommand.hh,v 1.4 2006/09/11 21:22:02 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005

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

    r850 r931  
    2525//
    2626// $Id: G4VModelFactory.hh,v 1.6 2006/06/29 21:32:30 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl October 2005

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

    r850 r931  
    2525//
    2626// $Id: G4VTrajectoryModel.hh,v 1.7 2006/08/14 11:43:34 allison Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl October 2005

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

    r850 r931  
    2424// ********************************************************************
    2525//
    26 // $Id: G4VisTrajContext.hh,v 1.3 2006/08/14 11:47:53 allison Exp $
    27 // GEANT4 tag $Name: HEAD $
     26// $Id: G4VisTrajContext.hh,v 1.4 2009/02/24 12:00:56 allison Exp $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay May 2006
    … …  
    7272  G4double GetAuxPtsSize() const;
    7373
     74  void SetAuxPtsSizeType(const G4VMarker::SizeType& sizeType);
     75  G4VMarker::SizeType GetAuxPtsSizeType() const;
     76
    7477  void SetAuxPtsFillStyle(const G4VMarker::FillStyle& style);
    7578  G4VMarker::FillStyle GetAuxPtsFillStyle() const;
    … …  
    9093  void SetStepPtsSize(const G4double& size);
    9194  G4double GetStepPtsSize() const;
     95
     96  void SetStepPtsSizeType(const G4VMarker::SizeType& sizeType);
     97  G4VMarker::SizeType GetStepPtsSizeType() const;
    9298
    9399  void SetStepPtsFillStyle(const G4VMarker::FillStyle& style);
    … …  
    117123  G4Polymarker::MarkerType fAuxPtsType;
    118124  G4double fAuxPtsSize;
     125  G4VMarker::SizeType fAuxPtsSizeType;
    119126  G4VMarker::FillStyle fAuxPtsFillStyle;
    120127  G4Colour fAuxPtsColour;
    … …  
    125132  G4Polymarker::MarkerType fStepPtsType;
    126133  G4double fStepPtsSize;
     134  G4VMarker::SizeType fStepPtsSizeType;
    127135  G4VMarker::FillStyle fStepPtsFillStyle;
    128136  G4Colour fStepPtsColour;

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

    r850 r931  
    2424// ********************************************************************
    2525//
    26 // $Id: G4VisTrajContext.icc,v 1.3 2006/08/14 11:47:53 allison Exp $
    27 // GEANT4 tag $Name: HEAD $
     26// $Id: G4VisTrajContext.icc,v 1.4 2009/02/24 12:00:56 allison Exp $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay May 2006
    … …  
    6161inline G4double G4VisTrajContext::GetAuxPtsSize() const {return fAuxPtsSize;}
    6262
     63inline void G4VisTrajContext::SetAuxPtsSizeType(const G4VMarker::SizeType& sizeType) {fAuxPtsSizeType = sizeType;}
     64inline G4VMarker::SizeType G4VisTrajContext::GetAuxPtsSizeType() const {return fAuxPtsSizeType;}
     65
    6366inline void G4VisTrajContext::SetAuxPtsFillStyle(const G4VMarker::FillStyle& style) {fAuxPtsFillStyle = style;}
    6467inline G4VMarker::FillStyle G4VisTrajContext::GetAuxPtsFillStyle() const {return fAuxPtsFillStyle;}
    … …  
    7982inline void G4VisTrajContext::SetStepPtsSize(const G4double& size) {fStepPtsSize = size;}
    8083inline G4double G4VisTrajContext::GetStepPtsSize() const {return fStepPtsSize;}
     84
     85inline void G4VisTrajContext::SetStepPtsSizeType(const G4VMarker::SizeType& sizeType) {fStepPtsSizeType = sizeType;}
     86inline G4VMarker::SizeType G4VisTrajContext::GetStepPtsSizeType() const {return fStepPtsSizeType;}
    8187
    8288inline void G4VisTrajContext::SetStepPtsFillStyle(const G4VMarker::FillStyle& style) {fStepPtsFillStyle = style;}

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

    r850 r931  
    2525//
    2626// $Id: G4AttFilterUtils.cc,v 1.4 2006/12/13 15:50:06 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Visualisation attribute filter utility functions.

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

    r850 r931  
    2626//
    2727// $Id: G4AxesModel.cc,v 1.6 2006/06/29 21:32:38 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4BoundingSphereScene.cc,v 1.11 2006/06/29 21:32:40 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4FlavoredParallelWorldModel.cc,v 1.7 2006/06/29 21:32:42 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030// P. Mora de Freitas et M.Verderi - 19 June 1998.

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

    r850 r931  
    2525//
    2626/// $Id: G4HitFilterFactories.cc,v 1.1 2006/09/12 18:53:03 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929//

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

    r850 r931  
    2626//
    2727// $Id: G4HitsModel.cc,v 1.18 2006/11/14 14:42:08 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4LogicalVolumeModel.cc,v 1.14 2006/11/01 10:28:42 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4ModelingParameters.cc,v 1.15 2006/11/14 14:42:08 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4NullModel.cc,v 1.9 2006/06/29 21:32:50 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4PhysicalVolumeMassScene.cc,v 1.7 2006/11/06 09:24:13 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4PhysicalVolumeModel.cc,v 1.63 2007/11/10 14:56:36 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4PhysicalVolumeSearchScene.cc,v 1.14 2008/07/27 10:49:24 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4ScaleModel.cc,v 1.4 2006/06/29 21:32:58 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4TextModel.cc,v 1.7 2006/06/29 21:33:00 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2626//
    2727// $Id: G4TrajectoriesModel.cc,v 1.24 2006/11/14 14:42:08 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryChargeFilter.cc,v 1.4 2006/08/25 19:44:14 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Filter trajectories according to charge. Only registered

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryDrawByAttribute.cc,v 1.3 2006/09/14 15:41:42 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay August 2006

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryDrawByCharge.cc,v 1.8 2006/06/29 21:33:06 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryDrawByOriginVolume.cc,v 1.4 2006/06/29 21:33:08 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay March 2006

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryDrawByParticleID.cc,v 1.8 2006/06/29 21:33:10 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005

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

    r850 r931  
    2424// ********************************************************************
    2525//
    26 // $Id: G4TrajectoryDrawerUtils.cc,v 1.11 2007/05/30 08:56:55 allison Exp $
    27 // GEANT4 tag $Name: HEAD $
     26// $Id: G4TrajectoryDrawerUtils.cc,v 1.12 2009/02/24 12:00:56 allison Exp $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005
    … …  
    254254    if (myContext.GetDrawAuxPts() && (auxiliaryPoints.size() > 0)) {
    255255      auxiliaryPoints.SetMarkerType(myContext.GetAuxPtsType());
    256       auxiliaryPoints.SetScreenSize(myContext.GetAuxPtsSize());
     256      auxiliaryPoints.SetSize(myContext.GetAuxPtsSizeType(), myContext.GetAuxPtsSize());
    257257      auxiliaryPoints.SetFillStyle(myContext.GetAuxPtsFillStyle());
    258258
    … …  
    266266    if (myContext.GetDrawStepPts() && (stepPoints.size() > 0)) {
    267267      stepPoints.SetMarkerType(myContext.GetStepPtsType());
    268       stepPoints.SetScreenSize(myContext.GetStepPtsSize());
     268      stepPoints.SetSize(myContext.GetStepPtsSizeType(), myContext.GetStepPtsSize());
    269269      stepPoints.SetFillStyle(myContext.GetStepPtsFillStyle());
    270270
    … …  
    313313        point.push_back(auxiliaryPoints[i]);
    314314        point.SetMarkerType(myContext.GetAuxPtsType());
    315         point.SetScreenSize(myContext.GetAuxPtsSize());
     315        point.SetSize(myContext.GetAuxPtsSizeType(), myContext.GetAuxPtsSize());
    316316        point.SetFillStyle(myContext.GetAuxPtsFillStyle());
    317317        auxiliaryPointsAttribs.SetStartTime(auxiliaryPointTimes[i]);
    … …  
    330330        point.push_back(stepPoints[i]);
    331331        point.SetMarkerType(myContext.GetStepPtsType());
    332         point.SetScreenSize(myContext.GetStepPtsSize());
     332        point.SetSize(myContext.GetStepPtsSizeType(), myContext.GetStepPtsSize());
    333333        point.SetFillStyle(myContext.GetStepPtsFillStyle());
    334334        stepPointsAttribs.SetStartTime(stepPointTimes[i]);

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

    r850 r931  
    2525//
    2626/// $Id: G4TrajectoryFilterFactories.cc,v 1.5 2006/09/12 18:53:03 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929//

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryGenericDrawer.cc,v 1.2 2006/06/29 21:33:16 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay May 2006

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryModelFactories.cc,v 1.7 2006/09/12 18:53:03 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl October 2005

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryOriginVolumeFilter.cc,v 1.3 2006/08/25 19:44:14 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Filter trajectories according to volume name. Only registered

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

    r850 r931  
    2525//
    2626// $Id: G4TrajectoryParticleFilter.cc,v 1.3 2006/08/25 19:44:14 tinslay Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Filter trajectories according to particle type. Only registered

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

    r850 r931  
    2626//
    2727// $Id: G4VModel.cc,v 1.14 2006/11/01 10:33:00 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: modeling-V09-02-00 $
    2929//
    3030//

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

    r850 r931  
    2525//
    2626// $Id: G4VTrajectoryModel.cc,v 1.3 2006/06/29 21:33:26 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: modeling-V09-02-00 $
    2828//
    2929// Jane Tinslay May 2006

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

    r834 r931  
    3535  ,fAuxPtsType(G4Polymarker::squares)
    3636  ,fAuxPtsSize(2)
     37  ,fAuxPtsSizeType(G4VMarker::screen)
    3738  ,fAuxPtsFillStyle(G4VMarker::filled)
    3839  ,fAuxPtsColour(G4Colour::Magenta())
    … …  
    4142  ,fStepPtsType(G4Polymarker::circles)
    4243  ,fStepPtsSize(2)
     44  ,fStepPtsSizeType(G4VMarker::screen)
    4345  ,fStepPtsFillStyle(G4VMarker::filled)
    4446  ,fStepPtsColour(G4Colour::Yellow())
Note: See TracChangeset for help on using the changeset viewer.