Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/visualization/Vtk/src/G4Vtk.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /visualization/Vtk/src/G4Vtk.cc (Version 11.3.0) and /visualization/Vtk/src/G4Vtk.cc (Version 11.1.3)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                         3 // * License and Disclaimer                                           *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th      5 // * The  Geant4 software  is  copyright of the Copyright Holders  of *
  6 // * the Geant4 Collaboration.  It is provided      6 // * the Geant4 Collaboration.  It is provided  under  the terms  and *
  7 // * conditions of the Geant4 Software License      7 // * conditions of the Geant4 Software License,  included in the file *
  8 // * LICENSE and available at  http://cern.ch/      8 // * LICENSE and available at  http://cern.ch/geant4/license .  These *
  9 // * include a list of copyright holders.           9 // * include a list of copyright holders.                             *
 10 // *                                               10 // *                                                                  *
 11 // * Neither the authors of this software syst     11 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     12 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     13 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     14 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file      15 // * use.  Please see the license in the file  LICENSE  and URL above *
 16 // * for the full disclaimer and the limitatio     16 // * for the full disclaimer and the limitation of liability.         *
 17 // *                                               17 // *                                                                  *
 18 // * This  code  implementation is the result      18 // * This  code  implementation is the result of  the  scientific and *
 19 // * technical work of the GEANT4 collaboratio     19 // * technical work of the GEANT4 collaboration.                      *
 20 // * By using,  copying,  modifying or  distri     20 // * By using,  copying,  modifying or  distributing the software (or *
 21 // * any work based  on the software)  you  ag     21 // * any work based  on the software)  you  agree  to acknowledge its *
 22 // * use  in  resulting  scientific  publicati     22 // * use  in  resulting  scientific  publications,  and indicate your *
 23 // * acceptance of all terms of the Geant4 Sof     23 // * acceptance of all terms of the Geant4 Software license.          *
 24 // *******************************************     24 // ********************************************************************
 25 //                                                 25 //
 26 //                                                 26 //
 27 //                                                 27 //
 28 //                                             <<  28 // 
 29 // John Allison  5th April 2001                    29 // John Allison  5th April 2001
 30 // A template for a simplest possible graphics     30 // A template for a simplest possible graphics driver.
 31 //?? Lines or sections marked like this requir     31 //?? Lines or sections marked like this require specialisation for your driver.
 32                                                    32 
 33 #include "G4Vtk.hh"                                33 #include "G4Vtk.hh"
 34                                                << 
 35 #include "G4VtkMessenger.hh"                   << 
 36 #include "G4VtkSceneHandler.hh"                    34 #include "G4VtkSceneHandler.hh"
 37 #include "G4VtkViewer.hh"                          35 #include "G4VtkViewer.hh"
                                                   >>  36 #include "G4VtkMessenger.hh"
 38                                                    37 
 39 G4Vtk::G4Vtk()                                 <<  38 G4Vtk::G4Vtk(): G4VGraphicsSystem("VtkNative","VTKN","Vtk with native windowing",
 40   : G4VGraphicsSystem("VtkNative", "VTKN", "Vt <<  39                                   G4VGraphicsSystem::noFunctionality)
 41                       G4VGraphicsSystem::noFun << 
 42 {                                                  40 {
 43   G4VtkMessenger::GetInstance();                   41   G4VtkMessenger::GetInstance();
 44 }                                                  42 }
 45                                                    43 
 46 G4VSceneHandler* G4Vtk::CreateSceneHandler(con <<  44 G4Vtk::~G4Vtk() {}
 47 {                                              <<  45 
 48   return new G4VtkSceneHandler(*this, name);   <<  46 G4VSceneHandler* G4Vtk::CreateSceneHandler(const G4String& name) {
                                                   >>  47   G4VSceneHandler* pScene = new G4VtkSceneHandler(*this, name);
                                                   >>  48   return pScene;
 49 }                                                  49 }
 50                                                    50 
 51 G4VViewer* G4Vtk::CreateViewer(G4VSceneHandler <<  51 G4VViewer* G4Vtk::CreateViewer(G4VSceneHandler& scene,
 52 {                                              <<  52                                const G4String& name) {
 53   G4VViewer* pView = new G4VtkViewer((G4VtkSce <<  53   G4VViewer* pView = new G4VtkViewer((G4VtkSceneHandler&) scene, name);
 54   if (pView->GetViewId() < 0) {                <<  54   if (pView) {
 55     G4cerr << "G4Vtk::CreateViewer: ERROR flag <<  55     if (pView->GetViewId() < 0) {
 56               " view id in G4VtkViewer creatio <<  56       G4cerr << "G4Vtk::CreateViewer: ERROR flagged by negative"
 57               "\n Destroying view and returnin <<  57                 " view id in G4VtkViewer creation."
 58            << G4endl;                          <<  58                 "\n Destroying view and returning null pointer."
 59     delete pView;                              <<  59                 << G4endl;
 60     pView = nullptr;                           <<  60       delete pView;
                                                   >>  61       pView = 0;
                                                   >>  62     }
                                                   >>  63   }
                                                   >>  64   else {
                                                   >>  65     G4cerr << "G4Vtk::CreateViewer: ERROR: null pointer on new G4VtkViewer." << G4endl;
 61   }                                                66   }
 62   return pView;                                    67   return pView;
 63 }                                                  68 }
 64                                                    69