Ignore:
Timestamp:
May 27, 2010, 10:36:45 AM (16 years ago)
Author:
garnier
Message:

update...

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

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/management/History

    r1258 r1274  
    1 $Id: History,v 1.142 2010/05/11 12:17:40 allison Exp $
     1$Id: History,v 1.143 2010/05/20 07:56:21 allison Exp $
    22
    33-------------------------------------------------------------------
    … …  
    2626History file for visualization management sub-category
    2727------------------------------------------------------
     28
     2920th May 2010  John Allison  (visman-V09-03-01)
     30- G4VisCommandsCompound.cc: Restore previous viewer after /vis/drawTree.
     31- G4VisManager.hh: Cosmetic.
     32- G4VGraphicsSystem: Add Set methods.
    2833
    293411th May 2010  John Allison  (visman-V09-03-00)

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

    r954 r1274  
    2525//
    2626//
    27 // $Id: G4VGraphicsSystem.hh,v 1.11 2006/06/29 21:28:04 gunter Exp $
     27// $Id: G4VGraphicsSystem.hh,v 1.12 2010/05/20 07:55:47 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    8080  const G4String& GetDescription   () const;
    8181  Functionality   GetFunctionality () const;
     82  void SetName          (const G4String&);
     83  void SetNickName      (const G4String&);
     84  void SetDescription   (const G4String&);
     85  void SetFunctionality (Functionality);
    8286
    8387protected:
    84   const G4String fName;
    85   const G4String fNickname;
    86   const G4String fDescription;
     88  G4String fName;
     89  G4String fNickname;
     90  G4String fDescription;
    8791  Functionality  fFunctionality;
    8892};

  • trunk/source/visualization/management/include/G4VGraphicsSystem.icc

    r954 r1274  
    2525//
    2626//
    27 // $Id: G4VGraphicsSystem.icc,v 1.7 2006/06/29 21:28:06 gunter Exp $
     27// $Id: G4VGraphicsSystem.icc,v 1.8 2010/05/20 07:55:47 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    4848  return fFunctionality;
    4949}
     50
     51inline void G4VGraphicsSystem::SetName (const G4String& name) {
     52  fName = name;
     53}
     54
     55inline void G4VGraphicsSystem::SetNickName (const G4String& nickname) {
     56  fNickname = nickname;
     57}
     58
     59inline void G4VGraphicsSystem::SetDescription (const G4String& description) {
     60  fDescription = description;
     61}
     62
     63inline void G4VGraphicsSystem::SetFunctionality (Functionality f) {
     64  fFunctionality = f;
     65}

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

    r933 r1274  
    2525//
    2626//
    27 // $Id: G4VisManager.hh,v 1.70 2009/02/25 18:28:00 lgarnier Exp $
     27// $Id: G4VisManager.hh,v 1.71 2010/05/20 07:54:31 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    366366                      const G4VisExtent& = G4VisExtent::NullExtent);
    367367  void SetUserActionExtent (const G4VisExtent&);
    368   void              SetCurrentGraphicsSystem    (G4VGraphicsSystem* pSystem);
     368  void              SetCurrentGraphicsSystem    (G4VGraphicsSystem*);
    369369  void              SetCurrentScene             (G4Scene*);
    370   void              SetCurrentSceneHandler      (G4VSceneHandler* pScene);
    371   void              SetCurrentViewer            (G4VViewer* pView);
     370  void              SetCurrentSceneHandler      (G4VSceneHandler*);
     371  void              SetCurrentViewer            (G4VViewer*);
    372372  G4SceneHandlerList& SetAvailableSceneHandlers ();  // Returns lvalue.
    373373  G4SceneList&      SetSceneList                ();  // Returns lvalue.

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

    r954 r1274  
    2525//
    2626//
    27 // $Id: G4VisCommandsCompound.cc,v 1.39 2007/11/16 20:29:04 perl Exp $
     27// $Id: G4VisCommandsCompound.cc,v 1.40 2010/05/20 07:54:01 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929
    … …  
    6666  is >> pvname >> system;
    6767
     68  G4VGraphicsSystem* keepSystem = fpVisManager->GetCurrentGraphicsSystem();
     69  G4Scene* keepScene = fpVisManager->GetCurrentScene();
     70  G4VSceneHandler* keepSceneHandler = fpVisManager->GetCurrentSceneHandler();
     71  G4VViewer* keepViewer = fpVisManager->GetCurrentViewer();
     72
    6873  G4UImanager* UImanager = G4UImanager::GetUIpointer();
    6974  G4int keepVerbose = UImanager->GetVerboseLevel();
    … …  
    7782  UImanager->ApplyCommand("/vis/viewer/flush");
    7883  UImanager->SetVerboseLevel(keepVerbose);
     84
     85  if (keepViewer) {
     86    if (fpVisManager->GetVerbosity() >= G4VisManager::warnings) {
     87      G4cout << "Reverting to " << keepViewer->GetName() << G4endl;
     88    }
     89    fpVisManager->SetCurrentGraphicsSystem(keepSystem);
     90    fpVisManager->SetCurrentScene(keepScene);
     91    fpVisManager->SetCurrentSceneHandler(keepSceneHandler);
     92    fpVisManager->SetCurrentViewer(keepViewer);
     93  }
    7994}
    8095
Note: See TracChangeset for help on using the changeset viewer.