Ignore:
Timestamp:
Nov 2, 2009, 3:49:55 PM (15 years ago)
Author:
garnier
Message:

debug updates

Location:
trunk/source/visualization
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/History

    r1051 r1136  
    1 $Id: History,v 1.442 2009/05/14 16:58:54 lgarnier Exp $
     1$Id: History,v 1.445 2009/08/20 15:16:58 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2424History file for visualization category
    2525---------------------------------------
     2615 October 2009 Laurent Garnier
     27 - G4OpenGLViewer.cc : Fix a problem with printing.
     28
     2913 October 2009 Laurent Garnier
     30 - G4OpenGLQtViewer.cc/G4OpenGLStoreQtViewer.cc : Fix problems with
     31   mac OS X 10.6
     32
     3319 August 2009 Laurent Garnier
     34 - RayTracer : Fix an bad use of fVP parameters [bugzilla Problem 1072]
     35
     3618 May 2009, Joseph Perl (vis-V09-02-05)
     37- opengl-V09-02-04: add missing header to G4OpenGLViewerMessenger.hh
     38
     3915 May 2009, Joseph Perl (vis-V09-02-04)
     40- opengl-V09-02-04: Improvements to GL and Qt, printing, redraw logic,
     41  debug messages and fixes for compiler warnings
     42- visman-V09-02-02:Added /vis/viewer/set/targetPoint,
     43  improved end of run event keeping information
     44- vis-HepRep-V09-02-00:resolve compilation errors reported by gcc-4.4.0
    2645
    274614th May 2009  Laurent Garnier

  • trunk/source/visualization/OpenInventor/History

    r1097 r1136  
    1 $Id: History,v 1.100 2009/07/24 10:21:14 lgarnier Exp $
     1$Id: History,v 1.101 2009/09/18 12:48:43 lgarnier Exp $
    22-------------------------------------------------------------------
    33

  • trunk/source/visualization/OpenInventor/include/G4OpenInventorWinViewer.hh

    r1097 r1136  
    2525//
    2626//
    27 // $Id: G4OpenInventorWinViewer.hh,v 1.9 2006/06/29 21:20:34 gunter Exp $
     27// $Id: G4OpenInventorWinViewer.hh,v 1.10 2009/09/18 12:48:43 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

  • trunk/source/visualization/OpenInventor/include/G4OpenInventorXtViewer.hh

    r1097 r1136  
    2525//
    2626//
    27 // $Id: G4OpenInventorXtViewer.hh,v 1.14 2006/06/29 21:20:40 gunter Exp $
     27// $Id: G4OpenInventorXtViewer.hh,v 1.15 2009/09/18 12:48:43 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

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

    r1074 r1136  
    2525//
    2626//
    27 // $Id: G4OpenInventorWin.cc,v 1.6 2006/06/29 21:22:20 gunter Exp $
     27// $Id: G4OpenInventorWin.cc,v 1.7 2009/09/18 12:48:43 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

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

    r1098 r1136  
    2525//
    2626//
    27 // $Id: G4OpenInventorWinViewer.cc,v 1.25 2006/06/29 21:22:22 gunter Exp $
     27// $Id: G4OpenInventorWinViewer.cc,v 1.26 2009/09/18 12:48:43 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

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

    r1097 r1136  
    2525//
    2626//
    27 // $Id: G4OpenInventorXtViewer.cc,v 1.24 2006/06/29 21:22:26 gunter Exp $
     27// $Id: G4OpenInventorXtViewer.cc,v 1.25 2009/09/18 12:48:43 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

  • trunk/source/visualization/RayTracer/History

    r1096 r1136  
    1 $Id: History,v 1.56 2009/08/19 08:39:19 lgarnier Exp $
     1$Id: History,v 1.58 2009/09/16 16:58:26 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2525---------------------------------------
    2626
     2716 September 2009  John Allison  (raytracer-V09-02-00)
     28- Cosmetic adjustments and tagging.
     29
    273019 August 2009 Laurent Garnier
    28  - G4RayTracerViewer.cc, G4RayTracerXViewer.cc : Fix an bad use of fVP
    29    parameters
     31- G4RayTracerViewer.cc, G4RayTracerXViewer.cc : Fix an bad use of fVP
     32  parameters
    3033
    313418 August 2009 Laurent Garnier
    32  - G4RayTracerXViewer, G4RTXScanner : Fix a crash introduce by the
    33    new way of handling window size hints (January 2009)
     35- G4RayTracerXViewer, G4RTXScanner : Fix a crash introduce by the
     36  new way of handling window size hints (January 2009)
    3437
    35384th April 2008  John Allison  (raytracer-V09-01-00)
    36  - Fixed gcc-4.3.0 compiler warnings.
     39- Fixed gcc-4.3.0 compiler warnings.
    3740
    384114th June 2007  John Allison  (raytracer-V08-03-01)

  • trunk/source/visualization/RayTracer/include/G4RayTracerXViewer.hh

    r1096 r1136  
    2525//
    2626//
    27 // $Id: G4RayTracerXViewer.hh,v 1.4 2009/08/18 14:13:57 lgarnier Exp $
     27// $Id: G4RayTracerXViewer.hh,v 1.5 2009/09/16 16:56:52 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929
    … …  
    4141  G4RayTracerXViewer(G4VSceneHandler&,const G4String& name);
    4242  virtual ~G4RayTracerXViewer();
    43   void Initialise ();
     43  void Initialise();
    4444};
    4545

  • trunk/source/visualization/RayTracer/src/G4RTXScanner.cc

    r1096 r1136  
    2525//
    2626//
    27 // $Id: G4RTXScanner.cc,v 1.6 2009/08/18 10:47:15 lgarnier Exp $
     27// $Id: G4RTXScanner.cc,v 1.7 2009/09/16 16:56:52 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    120120  // Window size and position...
    121121  int xOffset = 0, yOffset = 0;
     122  XSizeHints* size_hints = XAllocSizeHints();
    122123  unsigned int width, height;
    123   XSizeHints* size_hints = XAllocSizeHints();
    124124  const G4String& XGeometryString = vp.GetXGeometryString();
    125125  if (!XGeometryString.empty()) {
    … …  
    152152  } else {
    153153    G4cout << "ERROR: Geometry string \""
    154            << XGeometryString     
    155            << "\" is empty.  Using \"600x600\"."
     154           << XGeometryString
     155           << "\" is empty.  Using \"600x600\"."
    156156           << G4endl;
    157157    width = 600;
    158     height = 600; 
     158    height = 600;
    159159  }
    160160  size_hints->width = width;

  • trunk/source/visualization/RayTracer/src/G4RayTracerXViewer.cc

    r1096 r1136  
    2525//
    2626//
    27 // $Id: G4RayTracerXViewer.cc,v 1.7 2009/08/19 08:39:19 lgarnier Exp $
     27// $Id: G4RayTracerXViewer.cc,v 1.8 2009/09/16 16:56:52 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929
    … …  
    4646                    name,
    4747                    new G4TheRayTracer(new G4RTJpegMaker, new G4RTXScanner))
    48 {
    49 }
     48{}
     49
     50G4RayTracerXViewer::~G4RayTracerXViewer() {}
    5051
    5152void G4RayTracerXViewer::Initialise() {
    … …  
    6465}
    6566
    66 G4RayTracerXViewer::~G4RayTracerXViewer() {}
    67 
    6867#endif

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

    r954 r1136  
    5050G4bool G4Scene::AddRunDurationModel (G4VModel* pModel, G4bool warn) {
    5151  std::vector<G4VModel*>::const_iterator i;
     52#ifdef G4DEBUG_VIS_MANAGEMENT
     53  printf("G4Scene::AddRunDurationModel\n");
     54#endif
    5255  for (i = fRunDurationModelList.begin ();
    5356       i != fRunDurationModelList.end (); ++i) {
    … …  
    5659  }
    5760  if (i != fRunDurationModelList.end ()) {
     61#ifdef G4DEBUG_VIS_MANAGEMENT
     62    printf("G4Scene::AddRunDurationModel i != fRunDurationModelList.end ()\n");
     63#endif
    5864    if (warn) {
    5965      G4cout << "G4Scene::AddRunDurationModel: model \""
    … …  
    7278
    7379void G4Scene::CalculateExtent () {
     80#ifdef G4DEBUG_VIS_MANAGEMENT
     81    printf("G4Scene::CalculateExtent\n");
     82#endif
    7483  G4int nModels = fRunDurationModelList.size ();
    7584  G4BoundingSphereScene boundingSphereScene;
    … …  
    8493  fExtent = boundingSphereScene.GetBoundingSphereExtent ();
    8594  fStandardTargetPoint = fExtent.GetExtentCentre ();
     95#ifdef G4DEBUG_VIS_MANAGEMENT
     96    printf("G4Scene::CalculateExtent END\n");
     97#endif
    8698}
    8799

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

    r1038 r1136  
    451451    if (pPolyhedron) {
    452452      pPolyhedron -> SetVisAttributes (fpVisAttribs);
     453#ifdef G4DEBUG_VIS_MANAGEMENT
    453454      printf("G4VSceneHandler::RequestPrimitives VSolid: %d\n",pPolyhedron);
     455#endif
    454456      G4cout <<
    455457        "G4VSceneHandler::RequestPrimitives VSolid " << solid.GetName () <<G4endl;
    … …  
    480482  if (!fpScene) return;
    481483
     484#ifdef G4DEBUG_VIS_MANAGEMENT
     485  printf("G4VSceneHandler::ProcessScene : 2\n");
     486#endif
    482487  G4VisManager* visManager = G4VisManager::GetInstance();
    483488
     489#ifdef G4DEBUG_VIS_MANAGEMENT
     490  printf("G4VSceneHandler::ProcessScene : 3\n");
     491#endif
    484492  if (!visManager->GetConcreteInstance()) return;
    485493
     494#ifdef G4DEBUG_VIS_MANAGEMENT
     495  printf("G4VSceneHandler::ProcessScene : 4\n");
     496#endif
    486497  G4VisManager::Verbosity verbosity = visManager->GetVerbosity();
    487498
    … …  
    494505  ClearStore ();
    495506
     507#ifdef G4DEBUG_VIS_MANAGEMENT
     508  printf("G4VSceneHandler::ProcessScene : 5\n");
     509#endif
    496510  // Reset fMarkForClearingTransientStore.  No need to clear transient
    497511  // store since it has just been cleared above.  (Leaving
    … …  
    507521
    508522  if (runDurationModelList.size ()) {
     523#ifdef G4DEBUG_VIS_MANAGEMENT
     524  printf("G4VSceneHandler::ProcessScene : 6\n");
     525#endif
    509526    if (verbosity >= G4VisManager::confirmations) {
    510527      G4cout << "Traversing scene data..." << G4endl;
    … …  
    520537
    521538    for (size_t i = 0; i < runDurationModelList.size (); i++) {
     539#ifdef G4DEBUG_VIS_MANAGEMENT
     540  printf("G4VSceneHandler::ProcessScene : 7\n");
     541#endif
    522542      G4VModel* pModel = runDurationModelList[i];
    523543      // Note: this is not the place to take action on
    … …  
    533553    // Repeat if required...
    534554    if (fSecondPassRequested) {
     555#ifdef G4DEBUG_VIS_MANAGEMENT
     556  printf("G4VSceneHandler::ProcessScene : 8\n");
     557#endif
    535558      fSecondPass = true;
    536559      for (size_t i = 0; i < runDurationModelList.size (); i++) {
     560#ifdef G4DEBUG_VIS_MANAGEMENT
     561  printf("G4VSceneHandler::ProcessScene : 9\n");
     562#endif
    537563        G4VModel* pModel = runDurationModelList[i];
    538564        pModel -> SetModelingParameters (pMP);

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

    r1088 r1136  
    8383  fWindowLocationHintXNegative(true),
    8484  fWindowLocationHintYNegative(false),
    85   fXGeometryString("600x600-0+0"),
    8685  fAutoRefresh (false),
    8786  fBackgroundColour (G4Colour(0.,0.,0.)),         // Black

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

    r1087 r1136  
    12001200void G4VisCommandSceneAddText::SetNewValue (G4UIcommand*, G4String newValue) {
    12011201
     1202#ifdef G4DEBUG_VIS_MANAGEMENT
     1203  printf("G4VisCommandSceneAddText::SetNewValue -%s-\n",newValue.c_str());
     1204#endif
    12021205  G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
    12031206  G4bool warn = verbosity >= G4VisManager::warnings;
    … …  
    12301233  const G4String& currentSceneName = pScene -> GetName ();
    12311234  G4bool successful = pScene -> AddRunDurationModel (model, warn);
     1235#ifdef G4DEBUG_VIS_MANAGEMENT
     1236  printf("G4VisCommandSceneAddText::SetNewValue success? :%d--\n",successful);
     1237#endif
    12321238  if (successful) {
    12331239    if (verbosity >= G4VisManager::confirmations) {

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

    r1041 r1136  
    564564void G4VisCommandViewerCreate::SetNewValue (G4UIcommand*, G4String newValue) {
    565565
     566#ifdef G4DEBUG_VIS_MANAGEMENT
     567  printf("G4VisCommandViewerCreate::SetNewValue : %s\n",newValue.c_str());
     568#endif
    566569  G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
    567570

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

    r1050 r1136  
    9898  // All other objects use default constructors.
    9999{
     100
     101#ifdef G4DEBUG_VIS_MANAGEMENT
     102  printf("G4VisManager::G4VisManager\n");
     103#endif
    100104  fpTrajDrawModelMgr = new G4VisModelManager<G4VTrajectoryModel>("/vis/modeling/trajectories");
    101105  fpTrajFilterMgr = new G4VisFilterManager<G4VTrajectory>("/vis/filtering/trajectories");
    … …  
    661665
    662666void G4VisManager::CreateViewer (G4String name,G4String XGeometry) {
     667  printf("G4VisManager::CreateViewer -------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
    663668
    664669  if (!fInitialised) Initialise ();
    665670
    666671  if (fpSceneHandler) {
     672    printf("G4VisManager::CreateViewer 1-------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
    667673    G4VViewer* p = fpGraphicsSystem -> CreateViewer (*fpSceneHandler, name);
     674    printf("G4VisManager::CreateViewer 2-------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
    668675
    669676    // Viewer is created, now we can set geometry parameters
    670677    // Before 12/2008, it was done in G4VViewer.cc but it did not have to be there!
    671678   
     679    //    printf("G4VisManager::CreateViewer 3-------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
    672680    G4ViewParameters vp = p->GetViewParameters();
     681    //    printf("G4VisManager::CreateViewer 4-------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
    673682    vp.SetXGeometryString(XGeometry);
    674683    p->SetViewParameters(vp); //parse string and store parameters
    675    
     684
    676685    if (!p) {
    677686      if (fVerbosity >= errors) {
    … …  
    739748
    740749void G4VisManager::GeometryHasChanged () {
     750#ifdef G4DEBUG_VIS_MANAGEMENT
     751  printf("G4VisManager::GeometryHasChanged \n");
     752#endif
    741753  if (fVerbosity >= confirmations) {
    742754    G4cout << "G4VisManager::GeometryHasChanged() called." << G4endl;
    … …  
    803815  // Check the manager's current scene...
    804816  if (fpScene && fpScene -> GetRunDurationModelList ().size () == 0) {
     817#ifdef G4DEBUG_VIS_MANAGEMENT
     818  printf("G4VisManager::GeometryHasChanged NO MODELS\n");
     819#endif
    805820    if (fVerbosity >= warnings) {
    806821      G4cout << "WARNING: The current scene \""

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

    r1038 r1136  
    9696      // Add Voxels.
    9797      G4DrawVoxels dv;
    98 
    99       // FIXME : LG 1 May 2009 : return a pointer...should be destroy by the compiler
    10098      G4PlacedPolyhedronList* pPPL =
    10199        dv.CreatePlacedPolyhedra (fpTopPV -> GetLogicalVolume ());
    … …  
    104102        const G4Polyhedron& polyhedron = (*pPPL)[i].GetPolyhedron ();
    105103        sceneHandler.BeginPrimitives (transform);
    106         printf("G4LogicalVolumeModel::DescribeYourselfTo BEFORE ADD %d\n",fpTopPV -> GetLogicalVolume ());
    107         if (&polyhedron) {
    108           printf("G4LogicalVolumeModel::DescribeYourselfTo  poly FAILED\n");
    109         } else {
    110           printf("G4LogicalVolumeModel::DescribeYourselfTo  poly OK\n");
    111         }
    112104        sceneHandler.AddPrimitive (polyhedron);
    113         printf("G4LogicalVolumeModel::DescribeYourselfTo AFTER ADD\n");
    114105        sceneHandler.EndPrimitives ();
    115106      }
Note: See TracChangeset for help on using the changeset viewer.