Ignore:
Timestamp:
Jan 5, 2011, 12:19:12 PM (13 years ago)
Author:
garnier
Message:

update

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

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/management/CVS/Entries

    r1347 r1348  
    11D/include////
    22D/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  
    1010
    1111# For debug mode
    12 CPPFLAGS += -DG4DEBUG_VIS_MANAGEMENT
     12# CPPFLAGS += -DG4DEBUG_VIS_MANAGEMENT
    1313
    1414GLOBLIBS  = libG4modeling.lib

  • trunk/source/visualization/management/History

    r1346 r1348  
    1 $Id: History,v 1.160.2.1 2010/12/14 15:55:56 gcosmo Exp $
     1$Id: History,v 1.163 2010/12/27 12:41:19 allison Exp $
    22
    33-------------------------------------------------------------------
    … …  
    2727------------------------------------------------------
    2828
     2927th December 2010  John Allison  (visman-V09-04-00)
     30- Tagged.  This tag DOES include changes below of December 11th.
     31
    293214th December 2010  Gabriele Cosmo  (visman-V09-03-16)
    3033- G4VisManager: moved GetVerbosity() static method to non-inline to allow for
    3134  Windows DLL exporting.
     35- Tag does NOT include changes below of December 11th.
     36
     3711th 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.
    3245
    334613th 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-00
    2 /G4Scene.hh/1.19/Wed Nov  4 12:49:16 2009//Tgeant4-09-04-ref-00
    3 /G4Scene.icc/1.15/Wed Nov  4 12:49:16 2009//Tgeant4-09-04-ref-00
    4 /G4SceneHandlerList.hh/1.8/Thu Jun 29 21:28:00 2006//Tgeant4-09-04-ref-00
    5 /G4SceneList.hh/1.10/Thu Jun 29 21:28:02 2006//Tgeant4-09-04-ref-00
    6 /G4VGraphicsSystem.hh/1.12/Thu May 20 07:55:47 2010//Tgeant4-09-04-ref-00
    7 /G4VGraphicsSystem.icc/1.8/Thu May 20 07:55:47 2010//Tgeant4-09-04-ref-00
    8 /G4VSceneHandler.hh/1.44/Sun May 30 11:30:49 2010//Tgeant4-09-04-ref-00
    9 /G4VSceneHandler.icc/1.20/Thu Jan 11 16:38:14 2007//Tgeant4-09-04-ref-00
    10 /G4VUserVisAction.hh/1.8/Thu Jun 29 21:28:12 2006//Tgeant4-09-04-ref-00
    11 /G4VViewer.hh/1.18/Thu Jun 29 21:28:14 2006//Tgeant4-09-04-ref-00
    12 /G4VViewer.icc/1.11/Thu Jun 29 21:28:16 2006//Tgeant4-09-04-ref-00
    13 /G4VVisCommand.hh/1.18/Thu Jun 29 21:28:18 2006//Tgeant4-09-04-ref-00
    14 /G4VVisCommand.icc/1.5/Thu Jun 29 21:28:20 2006//Tgeant4-09-04-ref-00
    15 /G4ViewParameters.hh/1.30/Wed Jan 21 16:59:22 2009//Tgeant4-09-04-ref-00
    16 /G4ViewParameters.icc/1.18/Wed Jan 21 16:59:22 2009//Tgeant4-09-04-ref-00
    17 /G4ViewerList.hh/1.8/Thu Jun 29 21:28:26 2006//Tgeant4-09-04-ref-00
    18 /G4VisCommandModelCreate.hh/1.3/Thu Jun 29 21:28:28 2006//Tgeant4-09-04-ref-00
    19 /G4VisCommands.hh/1.8/Mon Mar  9 12:42:00 2009//Tgeant4-09-04-ref-00
    20 /G4VisCommandsCompound.hh/1.9/Thu Jun 29 21:28:32 2006//Tgeant4-09-04-ref-00
    21 /G4VisCommandsGeometry.hh/1.3/Thu Jun 29 21:28:34 2006//Tgeant4-09-04-ref-00
    22 /G4VisCommandsGeometrySet.hh/1.4/Tue Jun 15 16:33:55 2010//Tgeant4-09-04-ref-00
    23 /G4VisCommandsListManager.hh/1.3/Thu Jun 29 21:28:38 2006//Tgeant4-09-04-ref-00
    24 /G4VisCommandsScene.hh/1.19/Tue Nov 14 14:59:54 2006//Tgeant4-09-04-ref-00
    25 /G4VisCommandsSceneAdd.hh/1.21/Thu Jun  3 10:17:44 2010//Tgeant4-09-04-ref-00
    26 /G4VisCommandsSceneHandler.hh/1.8/Thu Jun 29 21:28:44 2006//Tgeant4-09-04-ref-00
    27 /G4VisCommandsViewer.hh/1.23/Wed Sep 13 13:17:29 2006//Tgeant4-09-04-ref-00
    28 /G4VisCommandsViewerSet.hh/1.24/Wed Oct  6 10:15:38 2010//Tgeant4-09-04-ref-00
    29 /G4VisExecutive.hh/1.10/Fri May 28 16:48:03 2010//Tgeant4-09-04-ref-00
    30 /G4VisExecutive.icc/1.27/Sun Nov  7 11:14:33 2010//Tgeant4-09-04-ref-00
    31 /G4VisFeaturesOfDAWNFILE.hh/1.5/Thu Jun 29 21:28:54 2006//Tgeant4-09-04-ref-00
    32 /G4VisFeaturesOfFukuiRenderer.hh/1.5/Thu Jun 29 21:28:56 2006//Tgeant4-09-04-ref-00
    33 /G4VisFeaturesOfOpenGL.hh/1.6/Wed Oct  3 14:20:23 2007//Tgeant4-09-04-ref-00
    34 /G4VisFeaturesOfOpenInventor.hh/1.5/Thu Jun 29 21:29:00 2006//Tgeant4-09-04-ref-00
    35 /G4VisFilterManager.hh/1.4/Thu Jun 29 21:29:02 2006//Tgeant4-09-04-ref-00
    36 /G4VisListManager.hh/1.8/Thu Jun 29 21:29:04 2006//Tgeant4-09-04-ref-00
    37 /G4VisManager.hh/1.76/Fri Nov 26 15:30:48 2010//Tgeant4-09-04-ref-00
    38 /G4VisModelManager.hh/1.4/Thu Jun 29 21:29:10 2006//Tgeant4-09-04-ref-00
    39 /G4VisStateDependent.hh/1.5/Thu Jun 29 21:29:12 2006//Tgeant4-09-04-ref-00
    40 /G4VisManager.icc/1.23/Wed Dec 22 14:32:23 2010//Tgeant4-09-04-ref-00
     1/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//
    4141D

  • trunk/source/visualization/management/include/G4VisListManager.hh

    r1346 r1348  
    2424// ********************************************************************
    2525//
    26 // $Id: G4VisListManager.hh,v 1.8 2006/06/29 21:29:04 gunter Exp $
     26// $Id: G4VisListManager.hh,v 1.9 2010/12/11 17:01:25 allison Exp $
    2727// GEANT4 tag $Name:  $
    2828//
    … …  
    9494  assert (0 != ptr);
    9595
    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;   
    10999}
    110100

  • 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-00
    2 /G4Scene.cc/1.24/Wed Nov  4 12:49:16 2009//Tgeant4-09-04-ref-00
    3 /G4SceneHandlerList.cc/1.4/Thu Jun 29 21:29:18 2006//Tgeant4-09-04-ref-00
    4 /G4SceneList.cc/1.6/Thu Jun 29 21:29:20 2006//Tgeant4-09-04-ref-00
    5 /G4VGraphicsSystem.cc/1.11/Thu Jun 29 21:29:22 2006//Tgeant4-09-04-ref-00
    6 /G4VSceneHandler.cc/1.96/Fri Nov  5 16:00:11 2010//Tgeant4-09-04-ref-00
    7 /G4VViewer.cc/1.26/Tue Nov 17 14:37:06 2009//Tgeant4-09-04-ref-00
    8 /G4VVisCommand.cc/1.18/Thu Jun 29 21:29:28 2006//Tgeant4-09-04-ref-00
    9 /G4ViewParameters.cc/1.38/Fri Nov  5 16:00:11 2010//Tgeant4-09-04-ref-00
    10 /G4ViewerList.cc/1.4/Thu Jun 29 21:29:32 2006//Tgeant4-09-04-ref-00
    11 /G4VisCommands.cc/1.24/Mon Mar  9 12:42:00 2009//Tgeant4-09-04-ref-00
    12 /G4VisCommandsCompound.cc/1.40/Thu May 20 07:54:01 2010//Tgeant4-09-04-ref-00
    13 /G4VisCommandsGeometry.cc/1.4/Fri Jan  5 16:29:38 2007//Tgeant4-09-04-ref-00
    14 /G4VisCommandsGeometrySet.cc/1.8/Tue Jun 15 16:34:30 2010//Tgeant4-09-04-ref-00
    15 /G4VisCommandsScene.cc/1.70/Fri Nov 26 15:31:09 2010//Tgeant4-09-04-ref-00
    16 /G4VisCommandsSceneAdd.cc/1.84/Sat Nov  6 18:34:26 2010//Tgeant4-09-04-ref-00
    17 /G4VisCommandsSceneHandler.cc/1.32/Thu Jun 29 21:29:46 2006//Tgeant4-09-04-ref-00
    18 /G4VisCommandsViewer.cc/1.77/Sun Nov  7 11:14:07 2010//Tgeant4-09-04-ref-00
    19 /G4VisCommandsViewerSet.cc/1.53/Fri Nov  5 15:57:20 2010//Tgeant4-09-04-ref-00
    20 /G4VisFeaturesOfDAWNFILE.cc/1.6/Thu Jun 29 21:29:52 2006//Tgeant4-09-04-ref-00
    21 /G4VisFeaturesOfFukuiRenderer.cc/1.5/Thu Jun 29 21:29:54 2006//Tgeant4-09-04-ref-00
    22 /G4VisFeaturesOfOpenGL.cc/1.6/Wed Oct  3 14:21:55 2007//Tgeant4-09-04-ref-00
    23 /G4VisFeaturesOfOpenInventor.cc/1.5/Thu Jun 29 21:29:58 2006//Tgeant4-09-04-ref-00
    24 /G4VisStateDependent.cc/1.6/Thu Jun 29 21:30:02 2006//Tgeant4-09-04-ref-00
    25 /G4VisManager.cc/1.131/Wed Dec 22 14:26:53 2010//Tgeant4-09-04-ref-00
     1/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//
    2626D

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

    r1346 r1348  
    2525//
    2626//
    27 // $Id: G4VisCommandsScene.cc,v 1.70 2010/11/13 10:52:00 allison Exp $
     27// $Id: G4VisCommandsScene.cc,v 1.71 2010/12/11 16:53:20 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929
    … …  
    545545        for (G4int iV = 0; iV < nViewers; iV++) {
    546546          G4VViewer* aViewer = viewerList [iV];
     547          // Force rebuild of graphical database, if any.
     548          aViewer -> NeedKernelVisit();
    547549          if (aViewer->GetViewParameters().IsAutoRefresh()) {
    548550            aSceneHandler -> SetCurrentViewer (aViewer);
    … …  
    562564            // uncomment the next line.
    563565            //aSceneHandler->ClearTransientStore();
    564             // Now, force rebuild of graphical database, if any, and re-draw.
    565             aViewer -> NeedKernelVisit();
    566566            aViewer -> SetView ();
    567567            aViewer -> ClearView ();

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

    r1346 r1348  
    2525//
    2626//
    27 // $Id: G4VisCommandsSceneAdd.cc,v 1.84 2010/11/06 18:34:26 allison Exp $
     27// $Id: G4VisCommandsSceneAdd.cc,v 1.85 2010/12/11 16:50:10 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929// /vis/scene commands - John Allison  9th August 1998
    … …  
    6666#include "G4TransportationManager.hh"
    6767#include "G4PropagatorInField.hh"
     68#include "G4Trajectory.hh"
     69#include "G4TrajectoryPoint.hh"
    6870#include "G4RichTrajectory.hh"
    6971#include "G4RichTrajectoryPoint.hh"
     72#include "G4SmoothTrajectory.hh"
     73#include "G4SmoothTrajectoryPoint.hh"
    7074#include "G4AttDef.hh"
    7175#include "G4ios.hh"
    … …  
    14591463  UImanager->SetVerboseLevel(keepVerbose);
    14601464
    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()
    14681473             << G4RichTrajectoryPoint().GetAttDefs();
     1474    } else if (smooth) {
     1475      G4cout << G4SmoothTrajectory().GetAttDefs()
     1476             << G4SmoothTrajectoryPoint().GetAttDefs();
     1477    } else {
     1478      G4cout << G4Trajectory().GetAttDefs()
     1479             << G4TrajectoryPoint().GetAttDefs();
    14691480    }
    14701481  }
Note: See TracChangeset for help on using the changeset viewer.