Ignore:
Timestamp:
Jun 18, 2010, 11:42:07 AM (14 years ago)
Author:
garnier
Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

Location:
trunk/source/visualization/management
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/management/History

    r1288 r1315  
    1 $Id: History,v 1.150 2010/06/01 16:14:10 allison Exp $
     1$Id: History,v 1.152 2010/06/15 16:34:43 allison Exp $
    22
    33-------------------------------------------------------------------
    … …  
    2626History file for visualization management sub-category
    2727------------------------------------------------------
     28
     2915th June 2010  John Allison  (visman-V09-03-10)
     30- G4VisCommandsGeometrySet.hh: Added virtual destructors to fix
     31  compilation warnings.
     32- G4VisCommandsGeometrySet.cc: Changed "/vis/viewer/rebuild" to
     33  "/vis/scene/notifyHandlers", the command to be executed after a
     34  "/vis/geometry/..." command.  "/vis/scene/notifyHandlers" causes
     35  rebuild if viewer is "auto-refresh", otherwiae a message advises a
     36  rebuild.  This prevents over-enthusiatic rebuildin.
     37
     383rd June 2010  John Allison  (visman-V09-03-09)
     39- G4VisManager.cc: Checked valid view in DispatchToModel.
     40- Changed /vis/scene/add/digiti[sz]ations to /vis/scene/add/digis.
    2841
    29421st June 2010  John Allison  (visman-V09-03-07)

  • trunk/source/visualization/management/include/G4VisCommandsGeometrySet.hh

    r954 r1315  
    2525//
    2626//
    27 // $Id: G4VisCommandsGeometrySet.hh,v 1.3 2007/01/05 16:24:19 allison Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4VisCommandsGeometrySet.hh,v 1.4 2010/06/15 16:33:55 allison Exp $
     28// GEANT4 tag $Name: vis-V09-03-08 $
    2929
    3030// /vis/geometry commands - John Allison  31st January 2006
    … …  
    4040class G4VVisCommandGeometrySetFunction {
    4141public:
     42  virtual ~G4VVisCommandGeometrySetFunction() {}
    4243  virtual void operator()(G4VisAttributes*) const = 0;
    4344};
    … …  
    4647  public G4VVisCommandGeometrySetFunction {
    4748public:
     49  virtual ~G4VisCommandGeometrySetColourFunction() {}
    4850  G4VisCommandGeometrySetColourFunction
    4951  (const G4Colour& colour):
    … …  
    5961  public G4VVisCommandGeometrySetFunction {
    6062public:
     63  virtual ~G4VisCommandGeometrySetDaughtersInvisibleFunction() {}
    6164  G4VisCommandGeometrySetDaughtersInvisibleFunction
    6265  (G4bool daughtersInvisible):
    … …  
    7275  public G4VVisCommandGeometrySetFunction {
    7376public:
     77  virtual ~G4VisCommandGeometrySetForceAuxEdgeVisibleFunction() {}
    7478  G4VisCommandGeometrySetForceAuxEdgeVisibleFunction
    7579  (G4bool forceAuxEdgeVisible):
    … …  
    8589  public G4VVisCommandGeometrySetFunction {
    8690public:
     91  virtual ~G4VisCommandGeometrySetForceLineSegmentsPerCircleFunction() {}
    8792  G4VisCommandGeometrySetForceLineSegmentsPerCircleFunction
    8893  (G4int lineSegmentsPerCircle):
    … …  
    98103  public G4VVisCommandGeometrySetFunction {
    99104public:
     105  virtual ~G4VisCommandGeometrySetForceSolidFunction() {}
    100106  G4VisCommandGeometrySetForceSolidFunction
    101107  (G4bool forceSolid):
    … …  
    111117  public G4VVisCommandGeometrySetFunction {
    112118public:
     119  virtual ~G4VisCommandGeometrySetForceWireframeFunction() {}
    113120  G4VisCommandGeometrySetForceWireframeFunction
    114121  (G4bool forceWireframe):
    … …  
    124131  public G4VVisCommandGeometrySetFunction {
    125132public:
     133  virtual ~G4VisCommandGeometrySetLineStyleFunction() {}
    126134  G4VisCommandGeometrySetLineStyleFunction
    127135  (G4VisAttributes::LineStyle lineStyle):
    … …  
    137145  public G4VVisCommandGeometrySetFunction {
    138146public:
     147  virtual ~G4VisCommandGeometrySetLineWidthFunction() {}
    139148  G4VisCommandGeometrySetLineWidthFunction
    140149  (G4double lineWidth):
    … …  
    150159  public G4VVisCommandGeometrySetFunction {
    151160public:
     161  virtual ~G4VisCommandGeometrySetVisibilityFunction() {}
    152162  G4VisCommandGeometrySetVisibilityFunction
    153163  (G4bool visibility):

  • trunk/source/visualization/management/include/G4VisCommandsSceneAdd.hh

    r1288 r1315  
    2525//
    2626//
    27 // $Id: G4VisCommandsSceneAdd.hh,v 1.20 2010/05/30 11:30:49 allison Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4VisCommandsSceneAdd.hh,v 1.21 2010/06/03 10:17:44 allison Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2929
    3030// /vis/scene commands - John Allison  9th August 1998
    … …  
    6363  G4VisCommandSceneAddDigis& operator = (const G4VisCommandSceneAddDigis&);
    6464  G4UIcmdWithoutParameter* fpCommand;
    65   G4UIcmdWithoutParameter* fpCommandUS;
    6665};
    6766

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

    r954 r1315  
    2525//
    2626//
    27 // $Id: G4VisCommandsGeometrySet.cc,v 1.7 2007/01/05 16:24:19 allison Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4VisCommandsGeometrySet.cc,v 1.8 2010/06/15 16:34:30 allison Exp $
     28// GEANT4 tag $Name: vis-V09-03-08 $
    2929
    3030// /vis/geometry commands - John Allison  31st January 2006
    … …  
    6464  }
    6565  if (fpVisManager->GetCurrentViewer()) {
    66     G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/rebuild");
     66    G4UImanager::GetUIpointer()->ApplyCommand("/vis/scene/notifyHandlers");
    6767  }
    6868}

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

    r1288 r1315  
    2525//
    2626//
    27 // $Id: G4VisCommandsSceneAdd.cc,v 1.81 2010/06/01 16:08:15 allison Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4VisCommandsSceneAdd.cc,v 1.82 2010/06/03 10:17:44 allison Exp $
     28// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2929// /vis/scene commands - John Allison  9th August 1998
    3030
    … …  
    162162
    163163G4VisCommandSceneAddDigis::G4VisCommandSceneAddDigis () {
    164   fpCommand = new G4UIcmdWithoutParameter ("/vis/scene/add/digitisations", this);
     164  fpCommand = new G4UIcmdWithoutParameter ("/vis/scene/add/digis", this);
    165165  fpCommand -> SetGuidance ("Adds digis to current scene.");
    166166  fpCommand -> SetGuidance
    167167    ("Digis are drawn at end of event when the scene in which"
    168168     "\nthey are added is current.");
    169 
    170   fpCommandUS = new G4UIcmdWithoutParameter ("/vis/scene/add/digitizations", this);
    171   fpCommandUS -> SetGuidance ("Adds digis to current scene.");
    172   fpCommandUS -> SetGuidance
    173     ("Digis are drawn at end of event when the scene in which"
    174      "\nthey are added is current.");
    175169}
    176170
    177171G4VisCommandSceneAddDigis::~G4VisCommandSceneAddDigis () {
    178   delete fpCommandUS;
    179172  delete fpCommand;
    180173}

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

    r1292 r1315  
    2424// ********************************************************************
    2525//
    26 // $Id: G4VisManager.cc,v 1.128 2010/06/01 16:08:15 allison Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4VisManager.cc,v 1.129 2010/06/03 10:16:11 allison Exp $
     27// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
    2828//
    2929//
    … …  
    940940  assert (0 != trajectoryModel); // Should exist
    941941
    942   G4TrajectoriesModel* trajectoriesModel =
    943     dynamic_cast<G4TrajectoriesModel*>(fpSceneHandler->GetModel());
    944   if (trajectoriesModel) {
    945     if (trajectoriesModel->IsDrawingModeSet()) {
     942  if (IsValidView()) {
     943    G4TrajectoriesModel* trajectoriesModel =
     944      dynamic_cast<G4TrajectoriesModel*>(fpSceneHandler->GetModel());
     945    if (trajectoriesModel) {
     946      if (trajectoriesModel->IsDrawingModeSet()) {
     947        trajectoryModel->Draw(trajectory, i_mode, visible);
     948      } else {
     949        trajectoryModel->Draw(trajectory, visible);
     950      }
     951    } else {
     952      // Just draw at user's request
    946953      trajectoryModel->Draw(trajectory, i_mode, visible);
    947     } else {
    948       trajectoryModel->Draw(trajectory, visible);
    949     }
    950   } else {
    951     // Just draw at user's request
    952     trajectoryModel->Draw(trajectory, i_mode, visible);
     954    }
    953955  }
    954956}
    … …  
    13611363    if (eventID < nEventsToBeProcessed - 1) {
    13621364      fpViewer->ShowView();
     1365      fpViewer->DrawView();
    13631366      fpSceneHandler->SetMarkForClearingTransientStore(true);
    13641367    } else {  // Last event...
Note: See TracChangeset for help on using the changeset viewer.