Changeset 1050

Timestamp:

May 26, 2009, 3:35:10 PM (15 years ago)

Author:

garnier

Message:

update pas dans CVS

Location:

trunk/source/visualization/management/src

Files:

• G4VisCommandsScene.cc (modified) (2 diffs)
• G4VisCommandsViewerSet.cc (modified) (5 diffs)
• G4VisManager.cc (modified) (3 diffs)

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

@@ -557 +557 @@
             aViewer -> NeedKernelVisit();
 #ifdef G4DEBUG_VIS_MANAGEMENT
-            printf("G4VisCommandSceneNotifyHandlers::SetNewValue Call SetView()\n");
+            G4cout << "G4VisCommandSceneNotifyHandlers::SetNewValue."        << G4endl;
+            printf("\n\nG4VisCommandSceneNotifyHandlers::SetNewValue ---%s--- Call SetView() 1\n",newValue.data());
 #endif
             aViewer -> SetView ();
 #ifdef G4DEBUG_VIS_MANAGEMENT
-            printf("G4VisCommandSceneNotifyHandlers::SetNewValue Call SetView() END\n");
-            printf("G4VisCommandSceneNotifyHandlers::SetNewValue Call ClearView()\n");
+            printf("G4VisCommandSceneNotifyHandlers::SetNewValue Call SetView() END 2\n");
+            printf("G4VisCommandSceneNotifyHandlers::SetNewValue Call ClearView() 3\n");
 #endif
             aViewer -> ClearView ();
 #ifdef G4DEBUG_VIS_MANAGEMENT
-            printf("G4VisCommandSceneNotifyHandlers::SetNewValue Call ClearView() END\n");
-            printf("G4VisCommandSceneNotifyHandlers::SetNewValue Call DrawView()\n");
+            printf("G4VisCommandSceneNotifyHandlers::SetNewValue Call ClearView() END 4\n");
+            printf("G4VisCommandSceneNotifyHandlers::SetNewValue Call DrawView() 5\n");
 #endif
             aViewer -> DrawView ();
 #ifdef G4DEBUG_VIS_MANAGEMENT
-            printf("G4VisCommandSceneNotifyHandlers::SetNewValue Call DrawView() END\n");
+            printf("G4VisCommandSceneNotifyHandlers::SetNewValue Call DrawView() END 6\n");
 #endif
             if (flush) aViewer -> ShowView ();
@@ -629 +630 @@
       if (pCurrentViewer && pCurrentSceneHandler->GetScene()) {
 #ifdef G4DEBUG_VIS_MANAGEMENT
-            printf("G4VisCommandSceneNotifyHandlers::SetNewValue Call SetView()\n");
+            printf("G4VisCommandSceneNotifyHandlers::SetNewValue Call SetView() 7\n");
 #endif
         pCurrentViewer -> SetView ();
 #ifdef G4DEBUG_VIS_MANAGEMENT
-            printf("G4VisCommandSceneNotifyHandlers::SetNewValue Call SetView() END\n");
+            printf("G4VisCommandSceneNotifyHandlers::SetNewValue Call SetView() END 8\n");
 #endif
       }
     }
   }
+#ifdef G4DEBUG_VIS_MANAGEMENT
+            G4cout << "G4VisCommandSceneNotifyHandlers::SetNewValue.  END"           << G4endl;
+            printf("G4VisCommandSceneNotifyHandlers::SetNewValue END 99\n\n\n");
+#endif
 }
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VisCommandsViewerSet.cc,v 1.49 2007/07/10 17:51:54 allison Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4VisCommandsViewerSet.cc,v 1.50 2009/05/13 18:17:25 allison Exp $
+// GEANT4 tag $Name: HEAD $
 
 // /vis/viewer/set commands - John Allison  16th May 2000
@@ -37 +37 @@
 #include "G4UIcmdWithAnInteger.hh"
 #include "G4UIcmdWithADouble.hh"
+#include "G4UIcmdWith3VectorAndUnit.hh"
 #include "G4UnitsTable.hh"
 #include "G4VisManager.hh"
@@ -317 +318 @@
   fpCommandStyle->SetParameterName ("style",omitable = false);
 
+  fpCommandTargetPoint = new G4UIcmdWith3VectorAndUnit
+    ("/vis/viewer/set/targetPoint", this);
+  fpCommandTargetPoint->SetGuidance
+    ("Set target point.");
+  fpCommandTargetPoint->SetGuidance
+    ("This sets the \"Current Target Point\" relative to the \"Standard");
+  fpCommandTargetPoint->SetGuidance
+    ("Target Point\" so that the actual target point is as requested.");
+  fpCommandTargetPoint->SetGuidance
+    ("(See G4ViewParameters.hh for an explanation of target points.)");
+  fpCommandTargetPoint->SetParameterName("x", "y", "z", omitable = false);
+  fpCommandTargetPoint->SetUnitCategory("Length");
+
   fpCommandUpThetaPhi = new G4UIcommand
     ("/vis/viewer/set/upThetaPhi", this);
@@ -401 +415 @@
   delete fpCommandSectionPlane;
   delete fpCommandStyle;
+  delete fpCommandTargetPoint;
   delete fpCommandUpThetaPhi;
   delete fpCommandUpVector;
@@ -912 +927 @@
   }
 
+  else if (command == fpCommandTargetPoint) {
+    G4ThreeVector targetPoint =
+      fpCommandTargetPoint->GetNew3VectorValue(newValue);
+    const G4Point3D& standardTargetPoint =
+      currentViewer->GetSceneHandler()->GetScene()->GetStandardTargetPoint();
+    vp.SetCurrentTargetPoint(targetPoint - standardTargetPoint);
+    if (verbosity >= G4VisManager::confirmations) {
+      G4cout << "Target point set to "
+             << fpCommandTargetPoint->ConvertToStringWithBestUnit
+        (targetPoint)
+             << "\n\"Current Target Point\" set to  "
+             << fpCommandTargetPoint->ConvertToStringWithBestUnit
+        (vp.GetCurrentTargetPoint())
+             << "\n\"Standard Target Point\" is "
+             << fpCommandTargetPoint->ConvertToStringWithBestUnit
+        (standardTargetPoint)
+             << G4endl;
+    }
+  }
+
   else if (command == fpCommandUpThetaPhi) {
     G4double theta, phi;

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

@@ -87 +87 @@
   fpSceneHandler   (0),
   fpViewer         (0),
-  fVerbosity       (warnings),
+  fVerbosity       (all),//warnings),
   fpStateDependent (0),
   fEventRefreshing          (false),
@@ -814 +814 @@
 void G4VisManager::NotifyHandlers () {
 
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4VisManager::NotifyHandlers \n");
+#endif
   if (fVerbosity >= confirmations) {
     G4cout << "G4VisManager::NotifyHandler() called." << G4endl;
@@ -842 +845 @@
   }
 
+#ifdef G4DEBUG_VIS_MANAGEMENT
+  printf("G4VisManager::NotifyHandlers END\n");
+#endif
 }