Changeset 1136 for trunk/source/visualization/management/src

Timestamp:

Nov 2, 2009, 3:49:55 PM (15 years ago)

Author:

garnier

Message:

debug updates

Location:

trunk/source/visualization/management/src

Files:

• G4Scene.cc (modified) (4 diffs)
• G4VSceneHandler.cc (modified) (6 diffs)
• G4ViewParameters.cc (modified) (1 diff)
• G4VisCommandsSceneAdd.cc (modified) (2 diffs)
• G4VisCommandsViewer.cc (modified) (1 diff)
• G4VisManager.cc (modified) (4 diffs)

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

@@ -50 +50 @@
 G4bool G4Scene::AddRunDurationModel (G4VModel* pModel, G4bool warn) {
   std::vector<G4VModel*>::const_iterator i;
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4Scene::AddRunDurationModel\n");
+#endif
   for (i = fRunDurationModelList.begin ();
        i != fRunDurationModelList.end (); ++i) {
@@ -56 +59 @@
   }
   if (i != fRunDurationModelList.end ()) {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+    printf("G4Scene::AddRunDurationModel i != fRunDurationModelList.end ()\n");
+#endif
     if (warn) {
       G4cout << "G4Scene::AddRunDurationModel: model \""
@@ -72 +78 @@
 
 void G4Scene::CalculateExtent () {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+    printf("G4Scene::CalculateExtent\n");
+#endif
   G4int nModels = fRunDurationModelList.size ();
   G4BoundingSphereScene boundingSphereScene;
@@ -84 +93 @@
   fExtent = boundingSphereScene.GetBoundingSphereExtent ();
   fStandardTargetPoint = fExtent.GetExtentCentre ();
+#ifdef G4DEBUG_VIS_MANAGEMENT
+    printf("G4Scene::CalculateExtent END\n");
+#endif
 }
 

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

@@ -451 +451 @@
     if (pPolyhedron) {
       pPolyhedron -> SetVisAttributes (fpVisAttribs);
+#ifdef G4DEBUG_VIS_MANAGEMENT
       printf("G4VSceneHandler::RequestPrimitives VSolid: %d\n",pPolyhedron);
+#endif
       G4cout <<
         "G4VSceneHandler::RequestPrimitives VSolid " << solid.GetName () <<G4endl;
@@ -480 +482 @@
   if (!fpScene) return;
 
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4VSceneHandler::ProcessScene : 2\n");
+#endif
   G4VisManager* visManager = G4VisManager::GetInstance();
 
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4VSceneHandler::ProcessScene : 3\n");
+#endif
   if (!visManager->GetConcreteInstance()) return;
 
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4VSceneHandler::ProcessScene : 4\n");
+#endif
   G4VisManager::Verbosity verbosity = visManager->GetVerbosity();
 
@@ -494 +505 @@
   ClearStore ();
 
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4VSceneHandler::ProcessScene : 5\n");
+#endif
   // Reset fMarkForClearingTransientStore.  No need to clear transient
   // store since it has just been cleared above.  (Leaving
@@ -507 +521 @@
 
   if (runDurationModelList.size ()) {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4VSceneHandler::ProcessScene : 6\n");
+#endif
     if (verbosity >= G4VisManager::confirmations) {
       G4cout << "Traversing scene data..." << G4endl;
@@ -520 +537 @@
 
     for (size_t i = 0; i < runDurationModelList.size (); i++) {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4VSceneHandler::ProcessScene : 7\n");
+#endif
       G4VModel* pModel = runDurationModelList[i];
       // Note: this is not the place to take action on
@@ -533 +553 @@
     // Repeat if required...
     if (fSecondPassRequested) {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4VSceneHandler::ProcessScene : 8\n");
+#endif
       fSecondPass = true;
       for (size_t i = 0; i < runDurationModelList.size (); i++) {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4VSceneHandler::ProcessScene : 9\n");
+#endif
         G4VModel* pModel = runDurationModelList[i];
         pModel -> SetModelingParameters (pMP);

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

@@ -83 +83 @@
   fWindowLocationHintXNegative(true),
   fWindowLocationHintYNegative(false),
-  fXGeometryString("600x600-0+0"),
   fAutoRefresh (false),
   fBackgroundColour (G4Colour(0.,0.,0.)),         // Black

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

@@ -1200 +1200 @@
 void G4VisCommandSceneAddText::SetNewValue (G4UIcommand*, G4String newValue) {
 
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4VisCommandSceneAddText::SetNewValue -%s-\n",newValue.c_str());
+#endif
   G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
   G4bool warn = verbosity >= G4VisManager::warnings;
@@ -1230 +1233 @@
   const G4String& currentSceneName = pScene -> GetName ();
   G4bool successful = pScene -> AddRunDurationModel (model, warn);
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4VisCommandSceneAddText::SetNewValue success? :%d--\n",successful);
+#endif
   if (successful) {
     if (verbosity >= G4VisManager::confirmations) {

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

@@ -564 +564 @@
 void G4VisCommandViewerCreate::SetNewValue (G4UIcommand*, G4String newValue) {
 
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4VisCommandViewerCreate::SetNewValue : %s\n",newValue.c_str());
+#endif
   G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
 

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

@@ -98 +98 @@
   // All other objects use default constructors.
 {
+
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4VisManager::G4VisManager\n");
+#endif
   fpTrajDrawModelMgr = new G4VisModelManager<G4VTrajectoryModel>("/vis/modeling/trajectories");
   fpTrajFilterMgr = new G4VisFilterManager<G4VTrajectory>("/vis/filtering/trajectories");
@@ -661 +665 @@
 
 void G4VisManager::CreateViewer (G4String name,G4String XGeometry) {
+  printf("G4VisManager::CreateViewer -------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
 
   if (!fInitialised) Initialise ();
 
   if (fpSceneHandler) {
+    printf("G4VisManager::CreateViewer 1-------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
     G4VViewer* p = fpGraphicsSystem -> CreateViewer (*fpSceneHandler, name);
+    printf("G4VisManager::CreateViewer 2-------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
 
     // Viewer is created, now we can set geometry parameters
     // Before 12/2008, it was done in G4VViewer.cc but it did not have to be there!
     
+    //    printf("G4VisManager::CreateViewer 3-------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
     G4ViewParameters vp = p->GetViewParameters();
+    //    printf("G4VisManager::CreateViewer 4-------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
     vp.SetXGeometryString(XGeometry);
     p->SetViewParameters(vp); //parse string and store parameters
-    
+
     if (!p) {
       if (fVerbosity >= errors) {
@@ -739 +748 @@
 
 void G4VisManager::GeometryHasChanged () {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4VisManager::GeometryHasChanged \n");
+#endif
   if (fVerbosity >= confirmations) {
     G4cout << "G4VisManager::GeometryHasChanged() called." << G4endl;
@@ -803 +815 @@
   // Check the manager's current scene...
   if (fpScene && fpScene -> GetRunDurationModelList ().size () == 0) {
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4VisManager::GeometryHasChanged NO MODELS\n");
+#endif
     if (fVerbosity >= warnings) {
       G4cout << "WARNING: The current scene \""