Changeset 593 for trunk/geant4/visualization/management/src
- Timestamp:
- Nov 9, 2007, 3:32:25 PM (17 years ago)
- Location:
- trunk/geant4/visualization/management/src
- Files:
-
- 25 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/visualization/management/src/G4GraphicsSystemList.cc
r531 r593 26 26 // 27 27 // $Id: G4GraphicsSystemList.cc,v 1.4 2006/06/29 21:29:14 gunter Exp $ 28 // GEANT4 tag $Name: geant4-0 8-01-patch-01 $28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 30 30 #include "G4GraphicsSystemList.hh" -
trunk/geant4/visualization/management/src/G4Scene.cc
r531 r593 26 26 // 27 27 // $Id: G4Scene.cc,v 1.23 2006/11/26 15:51:12 allison Exp $ 28 // GEANT4 tag $Name: geant4-0 8-02-patch-01 $28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 // 30 30 // -
trunk/geant4/visualization/management/src/G4SceneHandlerList.cc
r531 r593 26 26 // 27 27 // $Id: G4SceneHandlerList.cc,v 1.4 2006/06/29 21:29:18 gunter Exp $ 28 // GEANT4 tag $Name: geant4-0 8-01-patch-01 $28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 30 30 #include "G4SceneHandlerList.hh" -
trunk/geant4/visualization/management/src/G4SceneList.cc
r531 r593 26 26 // 27 27 // $Id: G4SceneList.cc,v 1.6 2006/06/29 21:29:20 gunter Exp $ 28 // GEANT4 tag $Name: geant4-0 8-01-patch-01 $28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 30 30 #include "G4SceneList.hh" -
trunk/geant4/visualization/management/src/G4VGraphicsSystem.cc
r531 r593 26 26 // 27 27 // $Id: G4VGraphicsSystem.cc,v 1.11 2006/06/29 21:29:22 gunter Exp $ 28 // GEANT4 tag $Name: geant4-0 8-01-patch-01 $28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 // 30 30 // -
trunk/geant4/visualization/management/src/G4VSceneHandler.cc
r561 r593 25 25 // 26 26 // 27 // $Id: G4VSceneHandler.cc,v 1. 77 2006/11/21 14:23:53allison Exp $28 // GEANT4 tag $Name: geant4-0 8-02-patch-01 $27 // $Id: G4VSceneHandler.cc,v 1.82 2007/05/16 15:47:44 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 // 30 30 // … … 71 71 #include "G4ModelingParameters.hh" 72 72 #include "G4VTrajectory.hh" 73 #include "G4VTrajectoryPoint.hh" 74 #include "G4HitsModel.hh" 73 75 #include "G4VHit.hh" 74 76 #include "Randomize.hh" … … 77 79 #include "G4Run.hh" 78 80 #include "G4Transform3D.hh" 81 #include "G4AttHolder.hh" 82 #include "G4AttDef.hh" 79 83 80 84 G4VSceneHandler::G4VSceneHandler (G4VGraphicsSystem& system, G4int id, const G4String& name): … … 95 99 fpObjectTransformation (0), 96 100 fNestingDepth (0), 97 fpVisAttribs (0), 98 fRequestedEvent (0) 101 fpVisAttribs (0) 99 102 { 100 103 G4VisManager* pVMan = G4VisManager::GetInstance (); … … 421 424 G4NURBS* pNURBS = 0; 422 425 G4Polyhedron* pPolyhedron = 0; 423 const G4VisAttributes* pVisAttribs =424 fpViewer -> GetApplicableVisAttributes (fpVisAttribs);425 426 switch (fpViewer -> GetViewParameters () . GetRepStyle ()) { 426 427 case G4ViewParameters::nurbs: 427 428 pNURBS = solid.CreateNURBS (); 428 429 if (pNURBS) { 429 pNURBS -> SetVisAttributes 430 (fpViewer -> GetApplicableVisAttributes (pVisAttribs)); 430 pNURBS -> SetVisAttributes (fpVisAttribs); 431 431 AddPrimitive (*pNURBS); 432 432 delete pNURBS; … … 447 447 case G4ViewParameters::polyhedron: 448 448 default: 449 G4Polyhedron::SetNumberOfRotationSteps (GetNoOfSides ( pVisAttribs));449 G4Polyhedron::SetNumberOfRotationSteps (GetNoOfSides (fpVisAttribs)); 450 450 pPolyhedron = solid.GetPolyhedron (); 451 451 G4Polyhedron::ResetNumberOfRotationSteps (); 452 452 if (pPolyhedron) { 453 pPolyhedron -> SetVisAttributes ( pVisAttribs);453 pPolyhedron -> SetVisAttributes (fpVisAttribs); 454 454 AddPrimitive (*pPolyhedron); 455 455 } … … 471 471 472 472 void G4VSceneHandler::ProcessScene (G4VViewer&) { 473 printf("G4VSceneHandler::ProcessScene\n"); 473 474 474 if (!fpScene) return; 475 475 … … 545 545 G4StateManager* stateManager = G4StateManager::GetStateManager(); 546 546 G4ApplicationState state = stateManager->GetCurrentState(); 547 548 printf("G4VSceneHandler::ProcessScene 1\n");549 547 if (state == G4State_Idle) { 550 printf("G4VSceneHandler::ProcessScene 2 : idle\n");551 548 552 549 visManager->SetEventRefreshing(true); 553 550 554 if (fRequestedEvent) { 555 DrawEvent(fRequestedEvent); 556 printf("G4VSceneHandler::ProcessScene 3 : fRequestedEvent\n"); 551 if (visManager->GetRequestedEvent()) { 552 DrawEvent(visManager->GetRequestedEvent()); 557 553 558 554 } else { 559 printf("G4VSceneHandler::ProcessScene 3 : not fRequestedEvent\n");560 555 561 556 G4RunManager* runManager = G4RunManager::GetRunManager(); 562 const G4Run* run = runManager->GetCurrentRun();563 const std::vector<const G4Event*>* events =564 run? run->GetEventVector(): 0;565 size_t nKeptEvents = 0;566 if (events) nKeptEvents = events->size();567 557 if (runManager) { 568 printf("G4VSceneHandler::ProcessScene 4 : run manager OK\n"); 569 if (fpScene->GetRefreshAtEndOfEvent()) { 570 printf("G4VSceneHandler::ProcessScene 5 : fpScene->GetRefreshAtEndOfEvent()\n"); 571 572 if (verbosity >= G4VisManager::confirmations) { 573 G4cout << "Refreshing event..." << G4endl; 574 } 575 const G4Event* event = 0; 576 if (events && events->size()) event = events->back(); 577 if (event) DrawEvent(event); 578 579 } else { // Accumulating events. 580 printf("G4VSceneHandler::ProcessScene 7\n"); 581 582 if (verbosity >= G4VisManager::confirmations) { 583 G4cout << "Refreshing events in run..." << G4endl; 584 } 585 for (size_t i = 0; i < nKeptEvents; ++i) { 586 const G4Event* event = (*events)[i]; 558 const G4Run* run = runManager->GetCurrentRun(); 559 const std::vector<const G4Event*>* events = 560 run? run->GetEventVector(): 0; 561 size_t nKeptEvents = 0; 562 if (events) nKeptEvents = events->size(); 563 if (nKeptEvents) { 564 565 if (fpScene->GetRefreshAtEndOfEvent()) { 566 567 if (verbosity >= G4VisManager::confirmations) { 568 G4cout << "Refreshing event..." << G4endl; 569 } 570 const G4Event* event = 0; 571 if (events && events->size()) event = events->back(); 587 572 if (event) DrawEvent(event); 588 } 589 590 if (!fpScene->GetRefreshAtEndOfRun()) { 591 if (verbosity >= G4VisManager::warnings) { 592 G4cout << 593 "WARNING: Cannot refresh events accumulated over more" 594 "\n than one runs. Refreshed just the last run..." 595 << G4endl; 573 574 } else { // Accumulating events. 575 576 if (verbosity >= G4VisManager::confirmations) { 577 G4cout << "Refreshing events in run..." << G4endl; 578 } 579 for (size_t i = 0; i < nKeptEvents; ++i) { 580 const G4Event* event = (*events)[i]; 581 if (event) DrawEvent(event); 582 } 583 584 if (!fpScene->GetRefreshAtEndOfRun()) { 585 if (verbosity >= G4VisManager::warnings) { 586 G4cout << 587 "WARNING: Cannot refresh events accumulated over more" 588 "\n than one runs. Refreshed just the last run." 589 << G4endl; 590 } 596 591 } 597 592 } 598 593 } 599 594 } 600 }601 visManager->SetEventRefreshing(false);602 }595 } 596 visManager->SetEventRefreshing(false); 597 } 603 598 604 599 fMarkForClearingTransientStore = tmpMarkForClearingTransientStore; 605 printf("G4VSceneHandler::ProcessScene terminé \n");606 600 } 607 601 608 602 void G4VSceneHandler::DrawEvent(const G4Event* event) 609 603 { 610 printf("G4VSceneHandler::DrawEvent \n");611 604 const std::vector<G4VModel*>& EOEModelList = 612 605 fpScene -> GetEndOfEventModelList (); … … 718 711 } 719 712 713 void G4VSceneHandler::LoadAtts(const G4Visible& visible, G4AttHolder* holder) 714 { 715 // Load G4Atts from G4VisAttributes, if any... 716 const G4VisAttributes* va = visible.GetVisAttributes(); 717 if (va) { 718 const std::map<G4String,G4AttDef>* vaDefs = 719 va->GetAttDefs(); 720 if (vaDefs) { 721 holder->AddAtts(visible.GetVisAttributes()->CreateAttValues(), vaDefs); 722 } 723 } 724 725 G4PhysicalVolumeModel* pPVModel = 726 dynamic_cast<G4PhysicalVolumeModel*>(fpModel); 727 if (pPVModel) { 728 // Load G4Atts from G4PhysicalVolumeModel... 729 const std::map<G4String,G4AttDef>* defs = pPVModel->GetAttDefs(); 730 if (defs) { 731 holder->AddAtts(pPVModel->CreateCurrentAttValues(), defs); 732 } 733 } 734 735 G4TrajectoriesModel* trajModel = dynamic_cast<G4TrajectoriesModel*>(fpModel); 736 if (trajModel) { 737 // Load G4Atts from trajectory... 738 const G4VTrajectory* traj = trajModel->GetCurrentTrajectory(); 739 const std::map<G4String,G4AttDef>* defs = traj->GetAttDefs(); 740 if (defs) { 741 holder->AddAtts(traj->CreateAttValues(), defs); 742 } 743 G4int nPoints = traj->GetPointEntries(); 744 for (G4int i = 0; i < nPoints; ++i) { 745 G4VTrajectoryPoint* trajPoint = traj->GetPoint(i); 746 const std::map<G4String,G4AttDef>* defs = trajPoint->GetAttDefs(); 747 if (defs) { 748 holder->AddAtts(trajPoint->CreateAttValues(), defs); 749 } 750 } 751 } 752 753 G4HitsModel* hitsModel = dynamic_cast<G4HitsModel*>(fpModel); 754 if (hitsModel) { 755 // Load G4Atts from hit... 756 const G4VHit* hit = hitsModel->GetCurrentHit(); 757 const std::map<G4String,G4AttDef>* defs = hit->GetAttDefs(); 758 if (defs) { 759 holder->AddAtts(hit->CreateAttValues(), defs); 760 } 761 } 762 } 763 720 764 const G4Colour& G4VSceneHandler::GetColour (const G4Visible& visible) { 721 765 // Colour is determined by the applicable vis attributes. … … 734 778 } 735 779 736 G4double G4VSceneHandler::GetLineWidth(const G4Visible& visible) 737 { 738 G4double lineWidth = fpViewer-> 739 GetApplicableVisAttributes(visible.GetVisAttributes())->GetLineWidth(); 780 G4double G4VSceneHandler::GetLineWidth(const G4VisAttributes* pVisAttribs) 781 { 782 G4double lineWidth = pVisAttribs->GetLineWidth(); 740 783 if (lineWidth < 1.) lineWidth = 1.; 741 784 lineWidth *= fpViewer -> GetViewParameters().GetGlobalLineWidthScale(); … … 749 792 // it can be overriddden by the ForceDrawingStyle flag in the vis 750 793 // attributes. 751 G4ViewParameters::DrawingStyle style = 794 G4ViewParameters::DrawingStyle style = 752 795 fpViewer->GetViewParameters().GetDrawingStyle(); 753 796 if (pVisAttribs -> IsForceDrawingStyle ()) { … … 821 864 // ForceLineSegmentsPerCircle in the vis attributes. 822 865 G4int lineSegmentsPerCircle = fpViewer->GetViewParameters().GetNoOfSides(); 823 if (pVisAttribs->GetForcedLineSegmentsPerCircle() > 0) 824 lineSegmentsPerCircle = pVisAttribs->GetForcedLineSegmentsPerCircle(); 825 const G4int nSegmentsMin = 12; 826 if (lineSegmentsPerCircle < nSegmentsMin) { 827 lineSegmentsPerCircle = nSegmentsMin; 828 G4cout << 829 "G4VSceneHandler::GetNoOfSides: attempt to set the" 830 "\nnumber of line segements per circle < " << nSegmentsMin 831 << "; forced to " << lineSegmentsPerCircle << G4endl; 866 if (pVisAttribs) { 867 if (pVisAttribs->IsForceLineSegmentsPerCircle()) 868 lineSegmentsPerCircle = pVisAttribs->GetForcedLineSegmentsPerCircle(); 869 const G4int nSegmentsMin = 12; 870 if (lineSegmentsPerCircle < nSegmentsMin) { 871 lineSegmentsPerCircle = nSegmentsMin; 872 G4cout << 873 "G4VSceneHandler::GetNoOfSides: attempt to set the" 874 "\nnumber of line segements per circle < " << nSegmentsMin 875 << "; forced to " << lineSegmentsPerCircle << G4endl; 876 } 832 877 } 833 878 return lineSegmentsPerCircle; -
trunk/geant4/visualization/management/src/G4VViewer.cc
r531 r593 25 25 // 26 26 // 27 // $Id: G4VViewer.cc,v 1.2 3 2006/06/29 21:29:26 gunterExp $28 // GEANT4 tag $Name: geant4-0 8-01-patch-01 $27 // $Id: G4VViewer.cc,v 1.24 2007/01/05 16:25:15 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 // 30 30 // … … 82 82 const G4VisAttributes* G4VViewer::GetApplicableVisAttributes 83 83 (const G4VisAttributes* pVisAttribs) const { 84 // If the pointer is null, pick up the default vis attributes from84 // If pVisAttribs is zero, pick up the default vis attributes from 85 85 // the view parameters. 86 86 if (!pVisAttribs) -
trunk/geant4/visualization/management/src/G4VVisCommand.cc
r531 r593 26 26 // 27 27 // $Id: G4VVisCommand.cc,v 1.18 2006/06/29 21:29:28 gunter Exp $ 28 // GEANT4 tag $Name: geant4-0 8-01-patch-01 $28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 30 30 // Base class for visualization commands - John Allison 9th August 1998 -
trunk/geant4/visualization/management/src/G4ViewParameters.cc
r531 r593 25 25 // 26 26 // 27 // $Id: G4ViewParameters.cc,v 1.2 8 2006/09/19 16:02:31allison Exp $28 // GEANT4 tag $Name: geant4-0 8-02-patch-01 $27 // $Id: G4ViewParameters.cc,v 1.29 2007/04/03 13:33:16 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 // 30 30 // … … 72 72 fWindowSizeHintY (600), 73 73 fAutoRefresh (false), 74 fBackgroundColour (G4Colour(0.,0.,0.)) // Black 74 fBackgroundColour (G4Colour(0.,0.,0.)), // Black 75 fPicking (false) 75 76 { 76 77 fDefaultMarker.SetScreenSize (5.); … … 273 274 (fXGeometryString != v.fXGeometryString) || 274 275 (fAutoRefresh != v.fAutoRefresh) || 275 (fBackgroundColour != v.fBackgroundColour)) 276 (fBackgroundColour != v.fBackgroundColour) || 277 (fPicking != v.fPicking) 278 ) 276 279 G4cout << "Difference in 1st batch." << G4endl; 277 280 … … 439 442 440 443 os << "\n Background colour: " << v.fBackgroundColour; 444 445 os << "\n Picking requested: "; 446 if (v.fPicking) os << "true"; 447 else os << "false"; 441 448 442 449 return os; … … 480 487 (fXGeometryString != v.fXGeometryString) || 481 488 (fAutoRefresh != v.fAutoRefresh) || 482 (fBackgroundColour != v.fBackgroundColour)) 489 (fBackgroundColour != v.fBackgroundColour) || 490 (fPicking != v.fPicking) 491 ) 483 492 return true; 484 493 -
trunk/geant4/visualization/management/src/G4ViewerList.cc
r531 r593 26 26 // 27 27 // $Id: G4ViewerList.cc,v 1.4 2006/06/29 21:29:32 gunter Exp $ 28 // GEANT4 tag $Name: geant4-0 8-01-patch-01 $28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 30 30 #include "G4ViewerList.hh" -
trunk/geant4/visualization/management/src/G4VisCommands.cc
r531 r593 25 25 // 26 26 // 27 // $Id: G4VisCommands.cc,v 1.2 0 2006/11/26 15:49:10allison Exp $28 // GEANT4 tag $Name: geant4-0 8-02-patch-01 $27 // $Id: G4VisCommands.cc,v 1.22 2007/03/27 15:47:32 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 30 30 // /vis/ top level commands - John Allison 5th February 2001 … … 40 40 #include "G4Run.hh" 41 41 #include "G4UIsession.hh" 42 43 ////////////// /vis/abortReviewKeptEvents ///////////////////////////// 44 45 G4VisCommandAbortReviewKeptEvents::G4VisCommandAbortReviewKeptEvents () { 46 G4bool omitable; 47 48 fpCommand = new G4UIcmdWithABool("/vis/abortReviewKeptEvents", this); 49 fpCommand -> SetGuidance("Abort review of kept events."); 50 fpCommand -> SetParameterName("abort", omitable=true); 51 fpCommand -> SetDefaultValue(true); 52 } 53 54 G4VisCommandAbortReviewKeptEvents::~G4VisCommandAbortReviewKeptEvents () { 55 delete fpCommand; 56 } 57 58 G4String G4VisCommandAbortReviewKeptEvents::GetCurrentValue (G4UIcommand*) { 59 return G4String(); 60 } 61 62 void G4VisCommandAbortReviewKeptEvents::SetNewValue (G4UIcommand*, 63 G4String newValue) { 64 fpVisManager->SetAbortReviewKeptEvents(G4UIcommand::ConvertToBool(newValue)); 65 G4cout << "Type \"continue\" to complete the abort." << G4endl; 66 } 42 67 43 68 ////////////// /vis/enable /////////////////////////////////////// … … 128 153 fpCommand -> SetGuidance 129 154 ("If a macro file is specified, it is executed for each event."); 130 fpCommand -> SetGuidance 131 ("If a macro file is not specified, each event is drawn to the current" 132 "\nviewer. After each event, the session is paused. The user may issue" 133 "\nany allowed command. Then enter \"continue\" to continue to the next" 134 "\nevent."); 155 fpCommand -> SetGuidance( 156 "If a macro file is not specified, each event is drawn to the current" 157 "\nviewer. After each event, the session is paused. The user may issue" 158 "\nany allowed command. Then enter \"cont[inue]\" to continue to the next" 159 "\nevent." 160 "\nUseful commands might be:" 161 "\n \"/vis/viewer/...\" to change the view (zoom, set/viewpoint,...)." 162 "\n \"/vis/oglx/printEPS\" to get hard copy." 163 "\n \"/vis/open\" to get alternative viewer." 164 "\n \"/vis/abortReviewKeptEvents\", then \"cont[inue]\", to abort."); 135 165 fpCommand -> SetParameterName("macro-file-name", omitable=true); 136 166 fpCommand -> SetDefaultValue(""); … … 185 215 } 186 216 187 G4VSceneHandler* sceneHandler = fpVisManager->GetCurrentSceneHandler();188 189 217 G4UImanager* UImanager = G4UImanager::GetUIpointer(); 190 218 G4int keepVerbose = UImanager->GetVerboseLevel(); … … 200 228 201 229 // Draw to viewer and pause session... 230 G4UIsession* session = UImanager->GetSession(); 202 231 for (size_t i = 0; i < nKeptEvents; ++i) { 203 232 const G4Event* event = (*events)[i]; 204 233 if (verbosity >= G4VisManager::warnings) { 205 234 G4cout << "Drawing event : " << event->GetEventID() << 206 ". At EndOfEvent, enter any command, then \"cont inue\"..."235 ". At EndOfEvent, enter any command, then \"cont[inue]\"..." 207 236 << G4endl; 237 static G4bool first = true; 238 if (first) { 239 first = false; 240 G4cout << 241 " Useful commands might be:" 242 "\n \"/vis/viewer/...\" to change the view (zoom, set/viewpoint,...)." 243 "\n \"/vis/oglx/printEPS\" to get hard copy." 244 "\n \"/vis/open\" to get alternative viewer." 245 "\n \"/vis/abortReviewKeptEvents\", then \"cont[inue]\", to abort." 246 << G4endl; 247 } 208 248 } 209 sceneHandler->SetEvent(event);249 fpVisManager->SetRequestedEvent(event); 210 250 UImanager->ApplyCommand("/vis/viewer/rebuild"); 211 251 /* The above command forces a rebuild of the scene, including … … 224 264 features or a complete re-think. 225 265 */ 226 if (!viewer->GetViewParameters().IsAutoRefresh()) 227 UImanager->ApplyCommand("/vis/viewer/flush"); 228 G4UIsession* session = UImanager->GetSession(); 266 UImanager->ApplyCommand("/vis/viewer/flush"); 229 267 session->PauseSessionStart("EndOfEvent"); 230 sceneHandler->SetEvent(0); 231 } 268 fpVisManager->SetRequestedEvent(0); 269 if (fpVisManager->GetAbortReviewKeptEvents()) break; 270 } 271 fpVisManager->SetAbortReviewKeptEvents(false); 232 272 233 273 } else { … … 240 280 << " with macro file \"" << macroFileName << G4endl; 241 281 } 242 sceneHandler->SetEvent(event);282 fpVisManager->SetRequestedEvent(event); 243 283 UImanager->ApplyCommand("/control/execute " + macroFileName); 244 sceneHandler->SetEvent(0);284 fpVisManager->SetRequestedEvent(0); 245 285 } 246 286 } -
trunk/geant4/visualization/management/src/G4VisCommandsCompound.cc
r531 r593 25 25 // 26 26 // 27 // $Id: G4VisCommandsCompound.cc,v 1.3 5 2006/12/12 11:48:13 gcosmoExp $28 // GEANT4 tag $Name: geant4-0 8-02-patch-01 $27 // $Id: G4VisCommandsCompound.cc,v 1.38 2007/03/27 15:41:34 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 30 30 // Compound /vis/ commands - John Allison 15th May 2000 … … 202 202 UImanager->SetVerboseLevel(newVerbose); 203 203 UImanager->ApplyCommand("/vis/scene/create"); 204 // UImanager->ApplyCommand("/vis/scene/add/eventID");205 204 UImanager->ApplyCommand(G4String("/vis/scene/add/volume " + newValue)); 206 205 UImanager->ApplyCommand("/vis/sceneHandler/attach"); 207 206 UImanager->SetVerboseLevel(keepVerbose); 208 207 static G4bool warned = false; 209 if (verbosity >= G4VisManager:: warnings && !warned) {208 if (verbosity >= G4VisManager::confirmations && !warned) { 210 209 G4cout << 211 " WARNING: For systems which are not \"auto-refresh\" you will need to"210 "NOTE: For systems which are not \"auto-refresh\" you will need to" 212 211 "\n issue \"/vis/viewer/refresh\" or \"/vis/viewer/flush\"." 213 212 << G4endl; … … 322 321 UImanager->SetVerboseLevel(keepVerbose); 323 322 static G4bool warned = false; 324 if (verbosity >= G4VisManager:: warnings && !warned) {323 if (verbosity >= G4VisManager::confirmations && !warned) { 325 324 G4cout << 326 " WARNING: For systems which are not \"auto-refresh\" you will need to"325 "NOTE: For systems which are not \"auto-refresh\" you will need to" 327 326 "\n issue \"/vis/viewer/refresh\" or \"/vis/viewer/flush\"." 328 327 << G4endl; -
trunk/geant4/visualization/management/src/G4VisCommandsGeometry.cc
r531 r593 25 25 // 26 26 // 27 // $Id: G4VisCommandsGeometry.cc,v 1. 3 2006/06/29 21:29:38 gunterExp $28 // GEANT4 tag $Name: geant4-0 8-01-patch-01 $27 // $Id: G4VisCommandsGeometry.cc,v 1.4 2007/01/05 16:29:38 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 30 30 // /vis/geometry commands - John Allison 31st January 2006 … … 147 147 return; 148 148 } 149 G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/rebuild"); 149 if (fpVisManager->GetCurrentViewer()) { 150 G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/rebuild"); 151 } 150 152 } -
trunk/geant4/visualization/management/src/G4VisCommandsGeometrySet.cc
r531 r593 25 25 // 26 26 // 27 // $Id: G4VisCommandsGeometrySet.cc,v 1. 6 2006/09/19 16:05:13allison Exp $28 // GEANT4 tag $Name: geant4-0 8-02-patch-01 $27 // $Id: G4VisCommandsGeometrySet.cc,v 1.7 2007/01/05 16:24:19 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 30 30 // /vis/geometry commands - John Allison 31st January 2006 … … 171 171 G4bool omitable; 172 172 fpCommand = new G4UIcommand("/vis/geometry/set/daughtersInvisible", this); 173 fpCommand->SetGuidance(" Sets daughters of logical volume(s) invisible.");173 fpCommand->SetGuidance("Makes daughters of logical volume(s) invisible."); 174 174 fpCommand->SetGuidance("\"all\" sets all logical volumes."); 175 175 fpCommand->SetGuidance … … 243 243 fpCommand = new G4UIcommand("/vis/geometry/set/forceAuxEdgeVisible", this); 244 244 fpCommand->SetGuidance 245 ("Sets auxiliary (soft) edges of logical volume(s) drawing visible."); 245 ("Forces auxiliary (soft) edges of logical volume(s) to be visible," 246 "\nregardless of the view parameters."); 246 247 fpCommand->SetGuidance("\"all\" sets all logical volumes."); 247 248 fpCommand->SetGuidance … … 288 289 } 289 290 291 ////////////// /vis/geometry/set/forceLineSegmentsPerCircle ///////////////////////// 292 293 G4VisCommandGeometrySetForceLineSegmentsPerCircle::G4VisCommandGeometrySetForceLineSegmentsPerCircle() 294 { 295 G4bool omitable; 296 fpCommand = new G4UIcommand("/vis/geometry/set/forceLineSegmentsPerCircle", this); 297 fpCommand->SetGuidance 298 ("Forces number of line segments per circle, the precision with which a" 299 "\ncurved line or surface is represented by a polygon or polyhedron," 300 "\nregardless of the view parameters."); 301 fpCommand->SetGuidance("\"all\" sets all logical volumes."); 302 fpCommand->SetGuidance 303 ("Optionally propagates down hierarchy to given depth."); 304 G4UIparameter* parameter; 305 parameter = new G4UIparameter ("logical-volume-name", 's', omitable = true); 306 parameter->SetDefaultValue("all"); 307 fpCommand->SetParameter(parameter); 308 parameter = new G4UIparameter("depth", 'd', omitable = true); 309 parameter->SetDefaultValue(0); 310 parameter->SetGuidance 311 ("Depth of propagation (-1 means unlimited depth)."); 312 fpCommand->SetParameter(parameter); 313 parameter = new G4UIparameter("lineSegmentsPerCircle", 'd', omitable = true); 314 parameter->SetGuidance 315 ("< 0 means not forced, i.e., under control of viewer."); 316 parameter->SetDefaultValue(-1); 317 fpCommand->SetParameter(parameter); 318 } 319 320 G4VisCommandGeometrySetForceLineSegmentsPerCircle::~G4VisCommandGeometrySetForceLineSegmentsPerCircle() 321 { 322 delete fpCommand; 323 } 324 325 G4String 326 G4VisCommandGeometrySetForceLineSegmentsPerCircle::GetCurrentValue(G4UIcommand*) 327 { 328 return ""; 329 } 330 331 void G4VisCommandGeometrySetForceLineSegmentsPerCircle::SetNewValue 332 (G4UIcommand*, G4String newValue) 333 { 334 G4String name; 335 G4int requestedDepth; 336 G4int lineSegmentsPerCircle; 337 std::istringstream iss(newValue); 338 iss >> name >> requestedDepth >> lineSegmentsPerCircle; 339 340 G4VisCommandGeometrySetForceLineSegmentsPerCircleFunction setForceLineSegmentsPerCircle(lineSegmentsPerCircle); 341 Set(name, setForceLineSegmentsPerCircle, requestedDepth); 342 } 343 290 344 ////////////// /vis/geometry/set/forceSolid ///////////////////////// 291 345 … … 295 349 fpCommand = new G4UIcommand("/vis/geometry/set/forceSolid", this); 296 350 fpCommand->SetGuidance 297 ("Sets logical volume(s) drawing always to be as solid (surface drawing)."); 351 ("Forces logical volume(s) always to be drawn solid (surface drawing)," 352 "\nregardless of the view parameters."); 298 353 fpCommand->SetGuidance("\"all\" sets all logical volumes."); 299 354 fpCommand->SetGuidance … … 345 400 fpCommand = new G4UIcommand("/vis/geometry/set/forceWireframe", this); 346 401 fpCommand->SetGuidance 347 ("Sets logical volume(s) drawing always to be as wireframe."); 402 ("Forces logical volume(s) always to be drawn as wireframe," 403 "\nregardless of the view parameters."); 348 404 fpCommand->SetGuidance("\"all\" sets all logical volumes."); 349 405 fpCommand->SetGuidance -
trunk/geant4/visualization/management/src/G4VisCommandsScene.cc
r531 r593 25 25 // 26 26 // 27 // $Id: G4VisCommandsScene.cc,v 1.6 5 2006/11/26 19:37:54allison Exp $28 // GEANT4 tag $Name: geant4-0 8-02-patch-01 $27 // $Id: G4VisCommandsScene.cc,v 1.66 2007/05/25 10:49:55 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 30 30 // /vis/scene commands - John Allison 9th August 1998 … … 480 480 G4VSceneHandler* pCurrentSceneHandler = 481 481 fpVisManager -> GetCurrentSceneHandler(); 482 if (!pCurrentSceneHandler) { 483 if (verbosity >= G4VisManager::warnings) { 484 G4cout << "WARNING: No current scene handler." 485 << G4endl; 486 } 487 return; 488 } 482 489 G4VViewer* pCurrentViewer = fpVisManager -> GetCurrentViewer(); 490 if (!pCurrentViewer) { 491 if (verbosity >= G4VisManager::warnings) { 492 G4cout << "WARNING: No current viewer." 493 << G4endl; 494 } 495 return; 496 } 483 497 G4Scene* pCurrentScene = fpVisManager -> GetCurrentScene(); 498 if (!pCurrentScene) { 499 if (verbosity >= G4VisManager::warnings) { 500 G4cout << "WARNING: No current scene." 501 << G4endl; 502 } 503 return; 504 } 484 505 G4VisManager::Verbosity currentVerbosity = fpVisManager -> GetVerbosity(); 485 506 -
trunk/geant4/visualization/management/src/G4VisCommandsSceneAdd.cc
r531 r593 26 26 // 27 27 // $Id: G4VisCommandsSceneAdd.cc,v 1.72 2006/11/25 15:37:31 allison Exp $ 28 // GEANT4 tag $Name: geant4-0 8-02-patch-01 $28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 // /vis/scene commands - John Allison 9th August 1998 30 30 -
trunk/geant4/visualization/management/src/G4VisCommandsSceneHandler.cc
r531 r593 26 26 // 27 27 // $Id: G4VisCommandsSceneHandler.cc,v 1.32 2006/06/29 21:29:46 gunter Exp $ 28 // GEANT4 tag $Name: geant4-0 8-01-patch-01 $28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 30 30 // /vis/sceneHandler commands - John Allison 10th October 1998 -
trunk/geant4/visualization/management/src/G4VisCommandsViewer.cc
r531 r593 25 25 // 26 26 // 27 // $Id: G4VisCommandsViewer.cc,v 1.6 6 2006/11/25 15:38:03allison Exp $28 // GEANT4 tag $Name: geant4-0 8-02-patch-01 $27 // $Id: G4VisCommandsViewer.cc,v 1.68 2007/01/11 16:41:30 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 30 30 // /vis/viewer commands - John Allison 25th October 1998 … … 73 73 fpCommand = new G4UIcommand ("/vis/viewer/addCutawayPlane", this); 74 74 fpCommand -> SetGuidance 75 ("Add cutaway plane A*x + B*y + C*z + D = 0to current viewer.");75 ("Add cutaway plane to current viewer."); 76 76 G4UIparameter* parameter; 77 77 parameter = new G4UIparameter("x",'d',omitable = true); … … 1139 1139 G4Scene* scene = sceneHandler->GetScene(); 1140 1140 if (!scene) { 1141 if (verbosity >= G4VisManager:: warnings) {1142 G4cout << " WARNING: SceneHandler \"" << sceneHandler->GetName()1141 if (verbosity >= G4VisManager::confirmations) { 1142 G4cout << "NOTE: SceneHandler \"" << sceneHandler->GetName() 1143 1143 << "\", to which viewer \"" << refreshName << "\"" << 1144 1144 "\n is attached, has no scene - \"/vis/scene/create\" and" … … 1413 1413 G4Scene* scene = sceneHandler->GetScene(); 1414 1414 if (!scene) { 1415 if (verbosity >= G4VisManager:: warnings) {1416 G4cout << " WARNING: SceneHandler \"" << sceneHandler->GetName()1415 if (verbosity >= G4VisManager::confirmations) { 1416 G4cout << "NOTE: SceneHandler \"" << sceneHandler->GetName() 1417 1417 << "\", to which viewer \"" << updateName << "\"" << 1418 1418 "\n is attached, has no scene - \"/vis/scene/create\" and" -
trunk/geant4/visualization/management/src/G4VisCommandsViewerSet.cc
r531 r593 25 25 // 26 26 // 27 // $Id: G4VisCommandsViewerSet.cc,v 1.4 7 2006/11/14 14:59:55allison Exp $28 // GEANT4 tag $Name: geant4-0 8-02-patch-01 $27 // $Id: G4VisCommandsViewerSet.cc,v 1.49 2007/07/10 17:51:54 allison Exp $ 28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 30 30 // /vis/viewer/set commands - John Allison 16th May 2000 … … 67 67 "\nview parameters."); 68 68 fpCommandAutoRefresh->SetParameterName("auto-refresh",omitable = true); 69 fpCommandAutoRefresh->SetDefaultValue( false);69 fpCommandAutoRefresh->SetDefaultValue(true); 70 70 71 71 fpCommandAuxEdge = new G4UIcmdWithABool … … 76 76 "\nsometimes called soft edges, become visible/invisible."); 77 77 fpCommandAuxEdge->SetParameterName("edge",omitable = true); 78 fpCommandAuxEdge->SetDefaultValue( false);78 fpCommandAuxEdge->SetDefaultValue(true); 79 79 80 80 fpCommandBackground = new G4UIcommand … … 247 247 fpCommandLineSegments->SetParameterName("line-segments",omitable = true); 248 248 fpCommandLineSegments->SetDefaultValue(24); 249 250 fpCommandPicking = new G4UIcmdWithABool 251 ("/vis/viewer/set/picking",this); 252 fpCommandPicking->SetGuidance("Sets picking, if available."); 253 fpCommandPicking->SetGuidance 254 ("If true, view is set up for picking, if available." 255 "\nFor required actions, watch for instructions for viewer."); 256 fpCommandPicking->SetParameterName("picking",omitable = true); 257 fpCommandPicking->SetDefaultValue(true); 249 258 250 259 fpCommandProjection = new G4UIcommand("/vis/viewer/set/projection",this); … … 388 397 delete fpCommandLightsThetaPhi; 389 398 delete fpCommandLightsVector; 399 delete fpCommandPicking; 390 400 delete fpCommandProjection; 391 401 delete fpCommandSectionPlane; … … 460 470 << G4endl; 461 471 } 462 currentViewer->SetViewParameters(vp); 463 return; // I.e., avoid a refresh for this command. 472 if (!vp.IsAutoRefresh()) { 473 currentViewer->SetViewParameters(vp); 474 return; // Avoid a refresh id auto-refresh has been set to off... 475 } // ...otherwise take normal action. 464 476 } 465 477 … … 754 766 } 755 767 768 else if (command == fpCommandPicking) { 769 vp.SetPicking(G4UIcommand::ConvertToBool(newValue)); 770 if (verbosity >= G4VisManager::confirmations) { 771 G4cout << "Picking "; 772 if (vp.IsPicking()) G4cout << "requested."; 773 else G4cout << "inhibited."; 774 G4cout << G4endl; 775 } 776 } 777 756 778 else if (command == fpCommandProjection) { 757 779 G4double fieldHalfAngle; -
trunk/geant4/visualization/management/src/G4VisFeaturesOfDAWNFILE.cc
r531 r593 26 26 // 27 27 // $Id: G4VisFeaturesOfDAWNFILE.cc,v 1.6 2006/06/29 21:29:52 gunter Exp $ 28 // GEANT4 tag $Name: geant4-0 8-01-patch-01 $28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 // 30 30 #include "G4VisFeaturesOfDAWNFILE.hh" -
trunk/geant4/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc
r531 r593 26 26 // 27 27 // $Id: G4VisFeaturesOfFukuiRenderer.cc,v 1.5 2006/06/29 21:29:54 gunter Exp $ 28 // GEANT4 tag $Name: geant4-0 8-01-patch-01 $28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 // 30 30 // -
trunk/geant4/visualization/management/src/G4VisFeaturesOfOpenGL.cc
r534 r593 25 25 // 26 26 // 27 // $Id: G4VisFeaturesOfOpenGL.cc,v 1. 5 2006/06/29 21:29:56 gunter Exp $28 // GEANT4 tag $Name: geant4-08-01-patch-01$27 // $Id: G4VisFeaturesOfOpenGL.cc,v 1.6 2007/10/03 14:21:55 lgarnier Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // -
trunk/geant4/visualization/management/src/G4VisFeaturesOfOpenInventor.cc
r531 r593 26 26 // 27 27 // $Id: G4VisFeaturesOfOpenInventor.cc,v 1.5 2006/06/29 21:29:58 gunter Exp $ 28 // GEANT4 tag $Name: geant4-0 8-01-patch-01 $28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 // 30 30 // -
trunk/geant4/visualization/management/src/G4VisManager.cc
r564 r593 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4VisManager.cc,v 1.1 09 2006/11/26 15:43:51allison Exp $27 // GEANT4 tag $Name: geant4-0 8-02-patch-01 $26 // $Id: G4VisManager.cc,v 1.113 2007/05/25 10:50:26 allison Exp $ 27 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 28 28 // 29 29 // … … 72 72 #include "Randomize.hh" 73 73 #include "G4RunManager.hh" 74 #include "G4EventManager.hh" 74 75 #include "G4Run.hh" 75 76 #include "G4Event.hh" … … 86 87 fpSceneHandler (0), 87 88 fpViewer (0), 88 fVerbosity ( confirmations),//(warnings),89 fVerbosity (warnings), 89 90 fpStateDependent (0), 90 91 fEventRefreshing (false), … … 92 93 fTransientsDrawnThisEvent (false), 93 94 fEventKeepingSuspended (false), 94 fKeptLastEvent (false) 95 fKeptLastEvent (false), 96 fpRequestedEvent (0), 97 fAbortReviewKeptEvents (false) 95 98 // All other objects use default constructors. 96 99 { … … 118 121 if (fpInstance) { 119 122 G4Exception 120 ("G4VisManager: attempt to Construct more than one VisManager. 123 ("G4VisManager: attempt to Construct more than one VisManager."); 121 124 } 122 125 else { … … 584 587 if (fpSceneHandler) { 585 588 G4VViewer* p = fpGraphicsSystem -> CreateViewer (*fpSceneHandler, name); 586 if (p) { 587 fpViewer = p; // Make current. 588 fpViewer -> Initialise (); 589 fpSceneHandler -> AddViewerToList (fpViewer); 590 fpSceneHandler -> SetCurrentViewer (fpViewer); 591 592 const G4ViewParameters& vp = fpViewer->GetViewParameters(); 593 G4bool warn = false; 594 if (vp.IsCulling () && vp.IsCullingInvisible ()) { 595 warn = true; 589 if (!p) { 590 if (fVerbosity >= errors) { 591 G4cout << "ERROR in G4VisManager::CreateViewer during " 592 << fpGraphicsSystem -> GetName () 593 << " viewer creation.\n No action taken." 594 << G4endl; 595 } 596 } else { 597 p -> Initialise (); 598 if (p -> GetViewId() < 0) { 599 if (fVerbosity >= errors) { 600 G4cout << "ERROR in G4VisManager::CreateViewer during " 601 << fpGraphicsSystem -> GetName () 602 << " viewer initialisation.\n No action taken." 603 << G4endl; 604 } 605 } else { 606 fpViewer = p; // Make current. 607 fpSceneHandler -> AddViewerToList (fpViewer); 608 fpSceneHandler -> SetCurrentViewer (fpViewer); 609 596 610 if (fVerbosity >= confirmations) { 597 G4cout << "G4VisManager::CreateViewer: new viewer created :"611 G4cout << "G4VisManager::CreateViewer: new viewer created." 598 612 << G4endl; 599 613 } 614 615 const G4ViewParameters& vp = fpViewer->GetViewParameters(); 600 616 if (fVerbosity >= parameters) { 601 617 G4cout << " view parameters are:\n " << vp << G4endl; 602 618 } 603 if (fVerbosity >= warnings) { 604 G4cout << 605 "WARNING: objects with visibility flag set to \"false\"" 606 " will not be drawn!" 607 "\n \"/vis/viewer/set/culling global false\" to Draw such objects." 608 << G4endl; 609 } 610 } 611 if (vp.IsCullingCovered ()) { 612 if (!warn) { 619 620 if (vp.IsCulling () && vp.IsCullingInvisible ()) { 621 static G4bool warned = false; 613 622 if (fVerbosity >= confirmations) { 614 G4cout << "G4VisManager::CreateViewer: new viewer created:" 615 << G4endl; 623 if (!warned) { 624 G4cout << 625 "NOTE: objects with visibility flag set to \"false\"" 626 " will not be drawn!" 627 "\n \"/vis/viewer/set/culling global false\" to Draw such objects." 628 "\n Also see other \"/vis/viewer/set\" commands." 629 << G4endl; 630 warned = true; 631 } 616 632 } 617 633 } 618 warn = true; 619 if (fVerbosity >= warnings) { 620 G4cout << 621 "WARNING: covered objects in solid mode will not be rendered!" 622 "\n \"/vis/viewer/set/culling coveredDaughters false\" to reverse this." 623 << G4endl; 634 if (vp.IsCullingCovered ()) { 635 static G4bool warned = false; 636 if (fVerbosity >= warnings) { 637 if (!warned) { 638 G4cout << 639 "WARNING: covered objects in solid mode will not be rendered!" 640 "\n \"/vis/viewer/set/culling coveredDaughters false\" to reverse this." 641 "\n Also see other \"/vis/viewer/set\" commands." 642 << G4endl; 643 warned = true; 644 } 645 } 624 646 } 625 }626 if (warn) {627 if (fVerbosity >= warnings) {628 G4cout << " Also see other \"/vis/viewer/set\" commands."629 << G4endl;630 }631 }632 }633 else {634 if (fVerbosity >= errors) {635 G4cout << "ERROR in G4VisManager::CreateViewer during "636 << fpGraphicsSystem -> GetName ()637 << " viewer creation.\n No action taken."638 << G4endl;639 647 } 640 648 } … … 893 901 894 902 // Top level basic commands... 903 RegisterMessenger(new G4VisCommandAbortReviewKeptEvents); 895 904 RegisterMessenger(new G4VisCommandEnable); 896 905 RegisterMessenger(new G4VisCommandList); … … 921 930 RegisterMessenger(new G4VisCommandGeometrySetLineWidth); 922 931 RegisterMessenger(new G4VisCommandGeometrySetForceAuxEdgeVisible); 932 RegisterMessenger(new G4VisCommandGeometrySetForceLineSegmentsPerCircle); 923 933 RegisterMessenger(new G4VisCommandGeometrySetForceSolid); 924 934 RegisterMessenger(new G4VisCommandGeometrySetForceWireframe); … … 1104 1114 void G4VisManager::BeginOfRun () 1105 1115 { 1106 G4cout << "G4VisManager::BeginOfRun" << G4endl;1116 //G4cout << "G4VisManager::BeginOfRun" << G4endl; 1107 1117 fKeptLastEvent = false; 1108 1118 fEventKeepingSuspended = false; … … 1113 1123 void G4VisManager::BeginOfEvent () 1114 1124 { 1115 G4cout << "G4VisManager::BeginOfEvent" << G4endl;1125 //G4cout << "G4VisManager::BeginOfEvent" << G4endl; 1116 1126 fTransientsDrawnThisEvent = false; 1117 1127 if (fpSceneHandler) fpSceneHandler->SetTransientsDrawnThisEvent(false); … … 1120 1130 void G4VisManager::EndOfEvent () 1121 1131 { 1122 G4cout << "G4VisManager::EndOfEvent" << G4endl;1132 //G4cout << "G4VisManager::EndOfEvent" << G4endl; 1123 1133 1124 1134 // Don't call IsValidView unless there is a scene handler. This … … 1131 1141 const G4Run* currentRun = runManager->GetCurrentRun(); 1132 1142 1133 const G4Event* currentEvent =1134 G4EventManager::GetEventManager()->GetConstCurrentEvent();1143 G4EventManager* eventManager = G4EventManager::GetEventManager(); 1144 const G4Event* currentEvent = eventManager->GetConstCurrentEvent(); 1135 1145 if (!currentEvent) return; 1136 1146 1137 1147 ClearTransientStoreIfMarked(); 1138 printf("G4VisManager::DrawEvent \n");1139 1148 fpSceneHandler->DrawEvent(currentEvent); 1140 printf("G4VisManager::DrawEvent END\n");1141 1149 1142 1150 G4int nEventsToBeProcessed = 0; … … 1160 1168 // Keep, but only if user has not kept any... 1161 1169 if (!nKeptEvents) { 1162 G4EventManager::GetEventManager()->KeepTheCurrentEvent();1170 eventManager->KeepTheCurrentEvent(); 1163 1171 fKeptLastEvent = true; 1164 1172 } … … 1182 1190 } 1183 1191 } else if (maxNumberOfKeptEvents != 0) { 1184 G4EventManager::GetEventManager()->KeepTheCurrentEvent();1192 eventManager->KeepTheCurrentEvent(); 1185 1193 } 1186 1194 } … … 1189 1197 void G4VisManager::EndOfRun () 1190 1198 { 1191 G4cout << "G4VisManager::EndOfRun" << G4endl;1199 //G4cout << "G4VisManager::EndOfRun" << G4endl; 1192 1200 1193 1201 // Don't call IsValidView unless there is a scene handler. This -
trunk/geant4/visualization/management/src/G4VisStateDependent.cc
r561 r593 26 26 // 27 27 // $Id: G4VisStateDependent.cc,v 1.6 2006/06/29 21:30:02 gunter Exp $ 28 // GEANT4 tag $Name: geant4-0 8-01-patch-01 $28 // GEANT4 tag $Name: geant4-09-00-ref-01 $ 29 29 30 30 #include "G4VisStateDependent.hh" … … 46 46 } 47 47 else if (previousState == G4State_EventProc && requestedState == G4State_GeomClosed) { 48 printf("G4VisStateDependent::EndOfEvent \n");49 48 fpVisManager -> EndOfEvent (); 50 49 }
Note: See TracChangeset
for help on using the changeset viewer.