Changeset 1241 for trunk/source/visualization/management

Timestamp:

Mar 10, 2010, 11:29:32 AM (16 years ago)

Author:

garnier

Message:

update

Location:

trunk/source/visualization/management

Files:

• GNUmakefile (modified) (1 diff)
• History (modified) (2 diffs)
• src/G4VSceneHandler.cc (modified) (4 diffs)
• src/G4VisManager.cc (modified) (6 diffs)

trunk/source/visualization/management/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.16 2009/11/04 12:58:43 allison Exp $
+# $Id: GNUmakefile,v 1.17 2010/03/08 16:34:17 lgarnier Exp $
 # -------------------------------------------------------------
 # GNUmakefile for visualization library.  John Allison, 5/7/95.

trunk/source/visualization/management/History

@@ -1 @@
-$Id: History,v 1.137 2009/11/22 14:08:09 allison Exp $
+$Id: History,v 1.138 2010/03/08 16:34:17 lgarnier Exp $
 
 -------------------------------------------------------------------
@@ -26 +26 @@
 History file for visualization management sub-category
 ------------------------------------------------------
+8th March 2010 Laurent Garnier
+-G4VisManager.cc : Add protection against null pointer
 
 22nd November 2009  John Allison  (visman-V09-02-08)

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

@@ -118 +118 @@
 
 G4VSceneHandler::~G4VSceneHandler () {
-//   G4ViewerListIterator i;
-//   for (i = fViewerList.begin(); i != fViewerList.end(); ++i) {
-//      delete *i;
-//    }
   G4VViewer* last;
   while( ! fViewerList.empty() ) {
@@ -471 +467 @@
 
 void G4VSceneHandler::RequestPrimitives (const G4VSolid& solid) {
-#ifdef G4DEBUG_VIS_MANAGEMENT
-  printf("G4VSceneHandler::RequestPrimitives\n");
-#endif
   BeginPrimitives (*fpObjectTransformation);
   G4NURBS* pNURBS = 0;
@@ -520 +513 @@
     break;
   }
-#ifdef G4DEBUG_VIS_MANAGEMENT
-  printf("G4VSceneHandler::RequestPrimitives BEFORE END\n");
-#endif
   EndPrimitives ();
-#ifdef G4DEBUG_VIS_MANAGEMENT
-  printf("G4VSceneHandler::RequestPrimitives END\n");
-#endif
 }
 
 void G4VSceneHandler::ProcessScene (G4VViewer&) {
-#ifdef G4DEBUG_VIS_MANAGEMENT
-  printf("G4VSceneHandler::ProcessScene\n");
-#endif
 
   if (!fpScene) return;
@@ -667 +651 @@
 
   fMarkForClearingTransientStore = tmpMarkForClearingTransientStore;
-#ifdef G4DEBUG_VIS_MANAGEMENT
-  printf("G4VSceneHandler::ProcessScene END\n");
-#endif
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VisManager.cc,v 1.122 2009/11/04 12:58:00 allison Exp $
+// $Id: G4VisManager.cc,v 1.123 2010/03/08 16:34:17 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -174 +174 @@
 
 G4VisManager::~G4VisManager () {
-  printf("G4VisManager::~G4VisManager DELETING \n");
   fpInstance = 0;
   size_t i;
   for (i = 0; i < fSceneList.size (); ++i) {
-    printf("G4VisManager::~G4VisManager DELETING 1 \n");
     delete fSceneList[i];
   }
   for (i = 0; i < fAvailableSceneHandlers.size (); ++i) {
-  printf("G4VisManager::~G4VisManager DELETING 2\n");
   if (fAvailableSceneHandlers[i] != NULL) {
     delete fAvailableSceneHandlers[i];
@@ -188 +185 @@
   }
   for (i = 0; i < fAvailableGraphicsSystems.size (); ++i) {
-    printf("G4VisManager::~G4VisManager DELETING 3\n");
     if (fAvailableGraphicsSystems[i]) {
       delete fAvailableGraphicsSystems[i];
@@ -198 +194 @@
   }
   for (i = 0; i < fMessengerList.size (); ++i) {
-  printf("G4VisManager::~G4VisManager DELETING 4\n");
     delete fMessengerList[i];
   }
   for (i = 0; i < fDirectoryList.size (); ++i) {
-  printf("G4VisManager::~G4VisManager DELETING 5\n");
     delete fDirectoryList[i];
   }
 
-  printf("G4VisManager::~G4VisManager DELETING 6\n");
   delete fpTrajDrawModelMgr;
-  printf("G4VisManager::~G4VisManager DELETING 7\n");
   delete fpTrajFilterMgr;
-  printf("G4VisManager::~G4VisManager DELETING 8\n");
   delete fpHitFilterMgr;
-  printf("G4VisManager::~G4VisManager DELETING 9\n");
 }
 
@@ -388 +378 @@
   return happy;
 }
-
-
 
 const G4VTrajectoryModel*
@@ -830 +818 @@
   }
 
-  }
+}
 void G4VisManager::NotifyHandlers () {