lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 5.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 10:28:22 +02:00
parent fbd4999cf7
commit 4aea781e80
5454 changed files with 223141 additions and 67347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/FukuiRenderer/include/G4DAWNFILE.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4DAWNFILE.hh,v 1.8 2001/07/27 22:32:55 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Satoshi TANAKA
// DAWNFILE driver factory.
source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4DAWNFILESceneHandler.hh,v 1.12 2002/12/11 15:58:02 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Satoshi TANAKA
source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4DAWNFILEViewer.hh,v 1.8 2001/07/27 22:32:57 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4DAWNFILEViewer.hh,v 1.9 2003/06/16 17:13:27 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// Satoshi TANAKA
// DAWNFILE viewer - opens window, hard copy, etc.
@@ -55,7 +55,7 @@ public:
const char* GetG4PrimViewer () { return fG4PrimViewer ;}
const char* GetG4PrimViewerInvocation() { return fG4PrimViewerInvocation ;}
const char* GetPSViewer () { return fPSViewer ;}
void SendDrawingStyleToDAWNGUI( G4std::ostream& out ) ;
void SendDrawingStyleToDAWNGUI( std::ostream& out ) ;
private:
G4DAWNFILESceneHandler& fSceneHandler; // Reference to Graphics Scene for this view.
source/visualization/FukuiRenderer/include/G4FRClientServer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FRClientServer.hh,v 1.6 2001/07/11 10:08:44 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Satoshi TANAKA, Wed Jul 3 14:13:52 JST 1996
////////////////////////////////
source/visualization/FukuiRenderer/include/G4FRConst.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FRConst.hh,v 1.6 2001/07/11 10:08:44 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Satoshi TANAKA, Tue Jul 2 15:30:49 JST 1996
///////////////////////////////////
source/visualization/FukuiRenderer/include/G4FRFeatures.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FRFeatures.hh,v 1.5 2001/07/11 10:08:44 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#if !defined G4_FR_FEATURES_HH
#define G4_FR_FEATURES_HH
source/visualization/FukuiRenderer/include/G4FRSceneFunc.icc
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4FRSceneFunc.icc,v 1.2 2002/09/02 04:39:10 stanaka Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4FRSceneFunc.icc,v 1.3 2003/05/30 13:01:19 johna Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
@@ -74,7 +74,7 @@ void G4FRSCENEHANDLER::AddPrimitive (const G4Polyline& polyline)
//----- Add nurbes
void G4FRSCENEHANDLER::AddPrimitive (const G4NURBS& nurb)
void G4FRSCENEHANDLER::AddPrimitive (const G4NURBS&)
{
//-----
#if defined DEBUG_FR_SCENE
source/visualization/FukuiRenderer/include/G4FRofstream.hh
+5 -5
View File
@@ -21,10 +21,10 @@
// ********************************************************************
//
//
// $Id: G4FRofstream.hh,v 1.5 2001/07/11 10:08:44 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4FRofstream.hh,v 1.6 2003/06/16 17:13:28 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
#include"g4std/fstream"
#include <fstream>
#if !defined G4_FR_OFSTREAM_HH
#define G4_FR_OFSTREAM_HH
@@ -65,7 +65,7 @@ class G4FRofstream {
protected:
G4bool flag_file_open ;
G4std::ofstream fout ;
std::ofstream fout ;
} ;
@@ -98,7 +98,7 @@ inline G4bool G4FRofstream::DoesFileExist ( const char* filename )
{
G4bool status = false ;
G4std::ifstream fout_tmp( filename ) ;
std::ifstream fout_tmp( filename ) ;
if( fout_tmp ) { status = true ; }
fout_tmp.close();
source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FukuiRenderer.hh,v 1.7 2001/07/11 10:08:44 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Satoshi TANAKA
source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FukuiRendererSceneHandler.hh,v 1.11 2002/12/11 15:58:02 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Satoshi TANAKA, Fri Jun 28 11:19:19 JST 1996
source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FukuiRendererViewer.hh,v 1.7 2001/07/11 10:08:44 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Satoshi TANAKA, Fri Jun 28 12:10:14 JST 1996
source/visualization/FukuiRenderer/src/G4DAWNFILE.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4DAWNFILE.cc,v 1.9 2001/07/27 22:32:59 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Satoshi TANAKA
// DAWNFILE factory.
source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc
+4 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4DAWNFILESceneHandler.cc,v 1.12 2002/09/02 04:39:21 stanaka Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4DAWNFILESceneHandler.cc,v 1.13 2003/06/16 17:13:29 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// Satoshi TANAKA
// DAWNFILE scene.
@@ -33,7 +33,7 @@
// #define DEBUG_FR_SCENE
//----- header files
#include "g4std/fstream"
#include <fstream>
#include <stdlib.h>
#include <string.h>
#include "globals.hh"
@@ -170,7 +170,7 @@ void G4DAWNFILESceneHandler::SetG4PrimFileName()
}
// check validity of the file name
G4std::ifstream fin ;
std::ifstream fin ;
fin.open(fG4PrimFileName) ;
if(!fin) {
// new file
source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc
+5 -5
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4DAWNFILEViewer.cc,v 1.13 2001/07/27 22:33:01 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4DAWNFILEViewer.cc,v 1.14 2003/06/16 17:13:30 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// Satoshi TANAKA
// DAWNFILE view - opens window, hard copy, etc.
@@ -185,8 +185,8 @@ void G4DAWNFILEViewer::ShowView( void )
} // G4DAWNFILEViewer::ShowView()
//----- G4DAWNFILEViewer::SendDrawingStyleToDAWNGUI( G4std::ostream& out )
void G4DAWNFILEViewer::SendDrawingStyleToDAWNGUI( G4std::ostream& out )
//----- G4DAWNFILEViewer::SendDrawingStyleToDAWNGUI( std::ostream& out )
void G4DAWNFILEViewer::SendDrawingStyleToDAWNGUI( std::ostream& out )
{
///////////////////////
//#if defined DEBUG_FR_VIEW
@@ -271,7 +271,7 @@ void G4DAWNFILEViewer::SendViewParameters ()
//########### Generation of the file .DAWN.history for DAWN GUI
//-----
G4std::ofstream gui_out (".DAWN_1.history") ;
std::ofstream gui_out (".DAWN_1.history") ;
// ######### P1
source/visualization/FukuiRenderer/src/G4FRClientServer.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FRClientServer.cc,v 1.5 2001/07/11 10:08:45 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// Satoshi TANAKA, Wed Jul 3 14:14:29 JST 1996
////////////////////////////////
source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FukuiRenderer.cc,v 1.7 2001/07/11 10:08:46 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Satoshi TANAKA
source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4FukuiRendererSceneHandler.cc,v 1.9 2002/09/02 04:39:21 stanaka Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4FukuiRendererSceneHandler.cc,v 1.10 2003/06/16 17:13:31 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Satoshi TANAKA, Fri Jun 28 11:34:24 JST 1996
@@ -39,7 +39,7 @@
// #define DEBUG_FR_SCENE
//----- header files
#include "g4std/fstream"
#include <fstream>
//#include <strstream.h>
#include <string.h>
#include "globals.hh"
source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4FukuiRendererViewer.cc,v 1.7 2001/07/11 10:08:46 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Satoshi TANAKA, Fri Jun 28 12:09:11 JST 1996
source/visualization/HepRep/History
+13 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.25 2003/01/24 21:18:48 perl Exp $
$Id: History,v 1.25.2.2 2003/05/30 13:14:50 johna Exp $
-------------------------------------------------------------------
=========================================================
@@ -20,6 +20,18 @@ committal in the CVS repository !
History file for visualization/HepRep sub-category
---------------------------------------------------------------------------
30th May 2003 John Allison
- Eliminated pedantic warnings at head (johna-030530) and on
geant4-05-01-ref-02 (vis-V05-01-00).
29th May 2003 Mark Donszelmann and Joseph Perl (mark-joseph-050329)
- Modified G4HepRepSceneHandler (HEPREP2) to write more complete heprep, including
attributes.
- Copied new Streamer from FREEHEP library.
28th February 2003 Joseph Perl
- Modified G4HepRepFileSceneHandler to allow some volumes to be initially invisible.
24th January 2003 Joseph Perl
- Modified G4HepRepFileSceneHandler:AddThis (const G4VTrajectory& traj)
to incorporate G4Attributes into the HepRep1 file.
source/visualization/HepRep/include/G4HepRep.hh
-22
View File
@@ -21,28 +21,6 @@
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
/**
* @author Mark Donszelmann
source/visualization/HepRep/include/G4HepRepFile.hh
+2 -24
View File
@@ -21,30 +21,8 @@
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4HepRepFile.hh,v 1.5 2002/12/13 11:17:59 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4HepRepFile.hh,v 1.6 2003/06/25 10:19:50 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// John Allison 5th April 2001
source/visualization/HepRep/include/G4HepRepFileSceneHandler.hh
+2 -24
View File
@@ -21,30 +21,8 @@
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4HepRepFileSceneHandler.hh,v 1.11 2003/01/24 21:18:48 perl Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4HepRepFileSceneHandler.hh,v 1.12 2003/06/25 10:19:51 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Joseph Perl 27th January 2002
source/visualization/HepRep/include/G4HepRepFileViewer.hh
+2 -24
View File
@@ -21,30 +21,8 @@
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4HepRepFileViewer.hh,v 1.6 2002/12/13 11:17:59 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4HepRepFileViewer.hh,v 1.7 2003/06/25 10:19:52 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// John Allison 5th April 2001
source/visualization/HepRep/include/G4HepRepSceneHandler.hh
+2 -24
View File
@@ -21,28 +21,6 @@
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
/**
* @author Mark Donszelmann
@@ -52,7 +30,7 @@
#define G4HEPREPSCENEHANDLER_HH 1
#include "globals.hh"
#include "g4std/iostream"
#include <iostream>
// HepRep
#include "HEPREP/HepRep.h"
@@ -139,7 +117,7 @@ class G4HepRepSceneHandler: public G4VSceneHandler {
HEPREP::HepRepInstance* CreateInstance(HEPREP::HepRepInstance* p, HEPREP::HepRepType* altType);
bool IsEventData ();
G4std::ostream* out;
std::ostream* out;
HEPREP::HepRepFactory* heprepFactory;
HEPREP::HepRepWriter* writer;
HEPREP::HepRepInstance *parent;
source/visualization/HepRep/include/G4HepRepViewer.hh
-22
View File
@@ -21,28 +21,6 @@
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
/**
* @author Mark Donszelmann
source/visualization/HepRep/include/HepRepXMLWriter.hh
+3 -24
View File
@@ -21,30 +21,9 @@
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//--------------------------------------------------------------------------
// File and Version Information:
// $Id: HepRepXMLWriter.hh,v 1.10 2003/01/24 21:18:48 perl Exp $
// $Id: HepRepXMLWriter.hh,v 1.12 2003/06/25 10:19:56 gunter Exp $
//
// Description:
// Create a HepRep XML File (HepRep version 1).
@@ -64,7 +43,7 @@
//#define G4HEPREPFILEDEBUG // Comment this out to suppress debug code.
#include "globals.hh"
#include "g4std/fstream"
#include <fstream>
class HepRepXMLWriter
{
@@ -110,7 +89,7 @@ public:
char* prevTypeName[50];
private:
G4std::ofstream fout;
std::ofstream fout;
void init();
source/visualization/HepRep/src/G4HepRep.cc
-22
View File
@@ -21,28 +21,6 @@
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
/**
* @author Mark Donszelmann
source/visualization/HepRep/src/G4HepRepFile.cc
+2 -25
View File
@@ -20,31 +20,8 @@
// * statement, and all its terms. *
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4HepRepFile.cc,v 1.6 2002/12/13 11:18:03 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4HepRepFile.cc,v 1.7 2003/06/25 10:19:59 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Joseph Perl 1 October 2001
source/visualization/HepRep/src/G4HepRepFileSceneHandler.cc
+18 -37
View File
@@ -20,31 +20,8 @@
// * statement, and all its terms. *
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4HepRepFileSceneHandler.cc,v 1.11 2003/01/24 21:18:48 perl Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4HepRepFileSceneHandler.cc,v 1.11.2.1.2.2 2003/06/25 10:20:00 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Joseph Perl 27th January 2002
@@ -256,10 +233,10 @@ void G4HepRepFileSceneHandler::AddThis (const G4VTrajectory& traj) {
G4cout << "G4HepRepFileSceneHandler::AddThis(G4VTrajectory&) " << G4endl;
#endif
G4std::vector<G4AttValue>* attValues = traj.CreateAttValues();
G4std::vector<G4AttValue>::iterator iAttVal;
const G4std::map<G4String,G4AttDef>* attDefs = traj.GetAttDefs();
G4std::map<G4String,G4AttDef>::const_iterator iAttDef;
std::vector<G4AttValue>* attValues = traj.CreateAttValues();
std::vector<G4AttValue>::iterator iAttVal;
const std::map<G4String,G4AttDef>* attDefs = traj.GetAttDefs();
std::map<G4String,G4AttDef>::const_iterator iAttDef;
G4int i;
// Open the HepRep output file if it is not already open.
@@ -314,9 +291,9 @@ void G4HepRepFileSceneHandler::AddThis (const G4VTrajectory& traj) {
// different Types.
if (traj.GetPointEntries()>0) {
G4VTrajectoryPoint* aTrajectoryPoint = traj.GetPoint(0);
G4std::vector<G4AttValue>* pointAttValues
std::vector<G4AttValue>* pointAttValues
= aTrajectoryPoint->CreateAttValues();
const G4std::map<G4String,G4AttDef>* pointAttDefs
const std::map<G4String,G4AttDef>* pointAttDefs
= aTrajectoryPoint->GetAttDefs();
if (pointAttValues && pointAttDefs) {
for (iAttVal = pointAttValues->begin();
@@ -357,7 +334,7 @@ void G4HepRepFileSceneHandler::AddThis (const G4VTrajectory& traj) {
if (attValues && attDefs) {
for (iAttVal = attValues->begin();
iAttVal != attValues->end(); ++iAttVal) {
G4std::map<G4String,G4AttDef>::const_iterator iAttDef =
std::map<G4String,G4AttDef>::const_iterator iAttDef =
attDefs->find(iAttVal->GetName());
if (iAttDef == attDefs->end()) {
G4cout << "G4HepRepFileSceneHandler::AddThis(traj):"
@@ -403,16 +380,16 @@ void G4HepRepFileSceneHandler::AddThis (const G4VTrajectory& traj) {
hepRepXMLWriter->addInstance();
// Copy the current trajectory point's G4AttValues to HepRepAttValues.
G4std::vector<G4AttValue>* pointAttValues
std::vector<G4AttValue>* pointAttValues
= aTrajectoryPoint->CreateAttValues();
const G4std::map<G4String,G4AttDef>* pointAttDefs
const std::map<G4String,G4AttDef>* pointAttDefs
= aTrajectoryPoint->GetAttDefs();
if (pointAttValues && pointAttDefs) {
G4std::vector<G4AttValue>::iterator iAttVal;
std::vector<G4AttValue>::iterator iAttVal;
for (iAttVal = pointAttValues->begin();
iAttVal != pointAttValues->end(); ++iAttVal) {
G4std::map<G4String,G4AttDef>::const_iterator iAttDef =
std::map<G4String,G4AttDef>::const_iterator iAttDef =
pointAttDefs->find(iAttVal->GetName());
if (iAttDef == pointAttDefs->end()) {
G4cout << "\nG4VTrajectory::ShowTrajectory:"
@@ -484,7 +461,11 @@ void G4HepRepFileSceneHandler::AddPrimitive (const G4Polymarker& line) {
}
}
#ifdef G4HEPREPFILEDEBUG
void G4HepRepFileSceneHandler::AddPrimitive(const G4Text& text) {
#else
void G4HepRepFileSceneHandler::AddPrimitive(const G4Text&) {
#endif
#ifdef G4HEPREPFILEDEBUG
G4cout <<
"G4HepRepFileSceneHandler::AddPrimitive(const G4Text& text) called:"
@@ -565,7 +546,7 @@ void G4HepRepFileSceneHandler::AddPrimitive(const G4Polyhedron& polyhedron) {
} while (notLastFace);
}
void G4HepRepFileSceneHandler::AddPrimitive(const G4NURBS& nurbs) {
void G4HepRepFileSceneHandler::AddPrimitive(const G4NURBS&) {
#ifdef G4HEPREPFILEDEBUG
G4cout <<
"G4HepRepFileSceneHandler::AddPrimitive(const G4NURBS& nurbs) called."
source/visualization/HepRep/src/G4HepRepFileViewer.cc
+3 -26
View File
@@ -20,36 +20,13 @@
// * statement, and all its terms. *
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4HepRepFileViewer.cc,v 1.8 2002/12/13 11:18:03 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4HepRepFileViewer.cc,v 1.10 2003/06/25 10:20:01 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
#include "G4HepRepFileViewer.hh"
#include "G4ios.hh"
#include "g4std/strstream"
#include <strstream>
#include "G4VSceneHandler.hh"
source/visualization/HepRep/src/G4HepRepSceneHandler.cc
+8 -32
View File
@@ -20,38 +20,14 @@
// * statement, and all its terms. *
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
/**
* @author Mark Donszelmann
*/
#include "globals.hh"
#include "g4std/vector"
#include "g4std/strstream"
#include "g4std/fstream"
#include <vector>
#include <strstream>
#include <fstream>
//HepRep
#include "HEPREP/HepRep.h"
@@ -129,10 +105,10 @@ void G4HepRepSceneHandler::open() {
writer = heprepFactory->createHepRepWriter(&G4cerr);
} else {
char fname [256];
G4std::ostrstream ost(fname, 256);
ost << GetScene()->GetName() << "-" << fileNo++ << ".heprep" << G4std::ends;
std::ostrstream ost(fname, 256);
ost << GetScene()->GetName() << "-" << fileNo++ << ".heprep" << std::ends;
out = new G4std::ofstream(fname);
out = new std::ofstream(fname);
writer = heprepFactory->createHepRepWriter(out);
}
@@ -362,7 +338,7 @@ void G4HepRepSceneHandler::AddPrimitive (const G4Polyhedron& polyhedron) {
}
void G4HepRepSceneHandler::AddPrimitive (const G4Text& text) {
void G4HepRepSceneHandler::AddPrimitive (const G4Text&) {
#ifdef DEBUG
G4cout << "G4HepRepSceneHandler::AddPrimitive(G4Text&) " << G4endl;
#endif
@@ -393,7 +369,7 @@ void G4HepRepSceneHandler::AddPrimitive (const G4Square& square) {
//Method for handling G4NURBS objects for drawing solids.
//Knots and Ctrl Pnts MUST be arrays of GLfloats.
void G4HepRepSceneHandler::AddPrimitive (const G4NURBS& nurb) {
void G4HepRepSceneHandler::AddPrimitive (const G4NURBS&) {
#ifdef DEBUG
G4cout << "G4HepRepSceneHandler::AddPrimitive(G4NURBS&) " << G4endl;
#endif
source/visualization/HepRep/src/G4HepRepViewer.cc
-24
View File
@@ -20,30 +20,6 @@
// * statement, and all its terms. *
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
/**
* @author Mark Donszelmann
*/
source/visualization/HepRep/src/HepRepXMLWriter.cc
+1 -23
View File
@@ -20,31 +20,9 @@
// * statement, and all its terms. *
// ********************************************************************
//
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//--------------------------------------------------------------------------
// File and Version Information:
// $Id: HepRepXMLWriter.cc,v 1.10 2003/01/24 21:18:48 perl Exp $
// $Id: HepRepXMLWriter.cc,v 1.11 2003/06/25 10:20:07 gunter Exp $
//
// Description:
// Create a HepRep XML File (HepRep version 1).
source/visualization/HepRep/src/IndentPrintWriter.cc
+1 -1
View File
@@ -51,7 +51,7 @@ IndentPrintWriter& IndentPrintWriter::operator<< (const char* s) {
return *this;
}
IndentPrintWriter& IndentPrintWriter::operator<< (ostream& (*pf)(ostream&)) {
IndentPrintWriter& IndentPrintWriter::operator<< (ostream& (*)(ostream&)) {
*out << endl;
indented = false;
return *this;
source/visualization/HepRep/src/StreamerHepRep.cc
+18 -18
View File
@@ -33,7 +33,7 @@ StreamerHepRep::StreamerHepRep(HepRepWriter* streamer) {
StreamerHepRep::~StreamerHepRep() {
}
HepRep* StreamerHepRep::copy(HepRepSelectFilter* filter) {
HepRep* StreamerHepRep::copy(HepRepSelectFilter*) {
return NULL;
}
@@ -46,14 +46,14 @@ bool StreamerHepRep::addLayer(string layer) {
return true;
}
bool StreamerHepRep::addTypeTree(HepRepTypeTree* typeTree) {
bool StreamerHepRep::addTypeTree(HepRepTypeTree*) {
return true;
}
void StreamerHepRep::removeTypeTree(HepRepTypeTree* typeTree) {
void StreamerHepRep::removeTypeTree(HepRepTypeTree*) {
}
HepRepTypeTree* StreamerHepRep::getTypeTree(string name, string version) {
HepRepTypeTree* StreamerHepRep::getTypeTree(string, string) {
return NULL;
}
@@ -61,35 +61,35 @@ vector<HepRepTypeTree*>* StreamerHepRep::getTypeTrees() {
return NULL;
}
HepRepType* StreamerHepRep::getType(string name) {
HepRepType* StreamerHepRep::getType(string) {
return NULL;
}
bool StreamerHepRep::addInstanceTree(HepRepInstanceTree* instanceTree) {
bool StreamerHepRep::addInstanceTree(HepRepInstanceTree*) {
return true;
}
void StreamerHepRep::removeInstanceTree(HepRepInstanceTree* instanceTree) {
void StreamerHepRep::removeInstanceTree(HepRepInstanceTree*) {
}
HepRepInstanceTree* StreamerHepRep::getInstanceTreeTop(string name, string version) {
HepRepInstanceTree* StreamerHepRep::getInstanceTreeTop(string, string) {
return NULL;
}
HepRepInstanceTree* StreamerHepRep::getInstances(string name, string version,
vector<string> typeNames) {
HepRepInstanceTree* StreamerHepRep::getInstances(string, string,
vector<string>) {
return NULL;
}
HepRepInstanceTree* StreamerHepRep::getInstancesAfterAction(
string name,
string version,
vector<string> typeNames,
vector<HepRepAction*> actions,
bool getPoints,
bool getDrawAtts,
bool getNonDrawAtts,
vector<string> invertAtts) {
string,
string,
vector<string>,
vector<HepRepAction*>,
bool,
bool,
bool,
vector<string>) {
return NULL;
}
source/visualization/HepRep/src/StreamerHepRepAttribute.cc
+3 -3
View File
@@ -76,15 +76,15 @@ bool StreamerHepRepAttribute::addAttValue(string key, double red, double green,
return addAttValue(new DefaultHepRepAttValue(key, color, showLabel));
}
HepRepAttValue* StreamerHepRepAttribute::getAttValueFromNode(string lowerCaseName) {
HepRepAttValue* StreamerHepRepAttribute::getAttValueFromNode(string) {
return NULL;
}
HepRepAttValue* StreamerHepRepAttribute::removeAttValue(string key) {
HepRepAttValue* StreamerHepRepAttribute::removeAttValue(string) {
return NULL;
}
HepRepAttValue* StreamerHepRepAttribute::getAttValue(string name) {
HepRepAttValue* StreamerHepRepAttribute::getAttValue(string) {
return NULL;
}
source/visualization/HepRep/src/StreamerHepRepDefinition.cc
+2 -2
View File
@@ -49,11 +49,11 @@ bool StreamerHepRepDefinition::addAttDef(string name, string desc, string type,
return true;
}
HepRepAttDef* StreamerHepRepDefinition::getAttDefFromNode(string lowerCaseName) {
HepRepAttDef* StreamerHepRepDefinition::getAttDefFromNode(string) {
return NULL;
}
HepRepAttDef* StreamerHepRepDefinition::getAttDef(string name) {
HepRepAttDef* StreamerHepRepDefinition::getAttDef(string) {
return NULL;
}
source/visualization/HepRep/src/StreamerHepRepInstance.cc
+6 -6
View File
@@ -45,11 +45,11 @@ StreamerHepRepInstance::StreamerHepRepInstance(HepRepWriter* stream, HepRepInsta
StreamerHepRepInstance::~StreamerHepRepInstance() {
}
HepRepInstance* StreamerHepRepInstance::copy(HepRep* heprep, HepRepInstance* instance, HepRepSelectFilter* filter) {
HepRepInstance* StreamerHepRepInstance::copy(HepRep*, HepRepInstance*, HepRepSelectFilter*) {
return NULL;
}
HepRepInstance* StreamerHepRepInstance::copy(HepRep* heprep, HepRepInstanceTree* instanceTree, HepRepSelectFilter* filter) {
HepRepInstance* StreamerHepRepInstance::copy(HepRep*, HepRepInstanceTree*, HepRepSelectFilter*) {
return NULL;
}
@@ -57,7 +57,7 @@ HepRepType* StreamerHepRepInstance::getType() {
return type;
}
bool StreamerHepRepInstance::addPoint(HepRepPoint* point) {
bool StreamerHepRepInstance::addPoint(HepRepPoint*) {
return true;
}
@@ -65,17 +65,17 @@ vector<HepRepPoint*>* StreamerHepRepInstance::getPoints() {
return NULL;
}
bool StreamerHepRepInstance::addInstance(HepRepInstance* instance) {
bool StreamerHepRepInstance::addInstance(HepRepInstance*) {
return true;
}
void StreamerHepRepInstance::removeInstance(HepRepInstance* instance) {
void StreamerHepRepInstance::removeInstance(HepRepInstance*) {
}
vector<HepRepInstance*>* StreamerHepRepInstance::getInstances() {
return NULL;
}
HepRepAttValue* StreamerHepRepInstance::getAttValue(string name) {
HepRepAttValue* StreamerHepRepInstance::getAttValue(string) {
return NULL;
}
source/visualization/HepRep/src/StreamerHepRepInstanceTree.cc
+3 -3
View File
@@ -39,15 +39,15 @@ HepRepTreeID* StreamerHepRepInstanceTree::copy() {
return DefaultHepRepTreeID::copy();
}
HepRepInstanceTree* StreamerHepRepInstanceTree::copy(HepRep* heprep, HepRepSelectFilter* filter) {
HepRepInstanceTree* StreamerHepRepInstanceTree::copy(HepRep*, HepRepSelectFilter*) {
return NULL;
}
bool StreamerHepRepInstanceTree::addInstance(HepRepInstance* instance) {
bool StreamerHepRepInstanceTree::addInstance(HepRepInstance*) {
return true;
}
void StreamerHepRepInstanceTree::removeInstance(HepRepInstance* instance) {
void StreamerHepRepInstanceTree::removeInstance(HepRepInstance*) {
}
vector<HepRepInstance*>* StreamerHepRepInstanceTree::getInstances() {
source/visualization/HepRep/src/StreamerHepRepPoint.cc
+4 -4
View File
@@ -52,7 +52,7 @@ HepRepAttValue* StreamerHepRepPoint::getAttValue(string lowerCaseName) {
return (value != NULL) ? value : instance->getAttValue(lowerCaseName);
}
HepRepPoint* StreamerHepRepPoint::copy(HepRepInstance* parent) {
HepRepPoint* StreamerHepRepPoint::copy(HepRepInstance*) {
return NULL;
}
@@ -97,15 +97,15 @@ double StreamerHepRepPoint::getEta() {
return -0.5*log((1.-ct)/(1.+ct));
}
double StreamerHepRepPoint::getX(double xVertex, double yVertex, double zVertex) {
double StreamerHepRepPoint::getX(double xVertex, double, double) {
return x - xVertex;
}
double StreamerHepRepPoint::getY(double xVertex, double yVertex, double zVertex) {
double StreamerHepRepPoint::getY(double, double yVertex, double) {
return y - yVertex;
}
double StreamerHepRepPoint::getZ(double xVertex, double yVertex, double zVertex) {
double StreamerHepRepPoint::getZ(double, double, double zVertex) {
return z - zVertex;
}
source/visualization/HepRep/src/StreamerHepRepType.cc
+4 -4
View File
@@ -41,18 +41,18 @@ HepRepType* StreamerHepRepType::getSuperType() {
return parent;
}
HepRepAttDef* StreamerHepRepType::getAttDef(string key) {
HepRepAttDef* StreamerHepRepType::getAttDef(string) {
return NULL;
}
/**
* searched for a value with given name. Search up the type tree if needed.
*/
HepRepAttValue* StreamerHepRepType::getAttValue(string key) {
HepRepAttValue* StreamerHepRepType::getAttValue(string) {
return NULL;
}
HepRepType* StreamerHepRepType::copy(HepRep* heprep, HepRepType* type) {
HepRepType* StreamerHepRepType::copy(HepRep*, HepRepType*) {
return NULL;
}
@@ -76,7 +76,7 @@ void StreamerHepRepType::setInfoURL(string info) {
this->infoURL = info;
}
bool StreamerHepRepType::addType(HepRepType* type) {
bool StreamerHepRepType::addType(HepRepType*) {
return true;
}
source/visualization/HepRep/src/StreamerHepRepTypeTree.cc
+2 -2
View File
@@ -41,11 +41,11 @@ HepRepTreeID* StreamerHepRepTypeTree::copy() {
return DefaultHepRepTreeID::copy();
}
HepRepTypeTree* StreamerHepRepTypeTree::copy(HepRep* heprep) {
HepRepTypeTree* StreamerHepRepTypeTree::copy(HepRep*) {
return NULL;
}
bool StreamerHepRepTypeTree::addType(HepRepType* type) {
bool StreamerHepRepTypeTree::addType(HepRepType*) {
return true;
}
source/visualization/HepRep/src/XMLHepRepStreamer.cc
+2 -2
View File
@@ -193,11 +193,11 @@ bool XMLHepRepStreamer::write(HepRepPoint* point) {
return true;
}
bool XMLHepRepStreamer::write(HepRepAttribute* attribute) {
bool XMLHepRepStreamer::write(HepRepAttribute*) {
return true;
}
bool XMLHepRepStreamer::write(HepRepDefinition* definition) {
bool XMLHepRepStreamer::write(HepRepDefinition*) {
return true;
}
source/visualization/HepRep/src/XMLWriter.cc
+3 -3
View File
@@ -27,7 +27,7 @@
using namespace std;
XMLWriter::XMLWriter(ostream* out, string indentString, string defaultNameSpace)
XMLWriter::XMLWriter(ostream* out, string, string defaultNameSpace)
: defaultNameSpace(defaultNameSpace) {
writer = new IndentPrintWriter(out);
writer->setIndentString(" ");
@@ -94,7 +94,7 @@ void XMLWriter::closeDoc() {
}
void XMLWriter::printComment(string comment) {
if (comment.find("--") >= 0) {
if (comment.find("--") != string::npos) {
cerr << "XMLWriter::printComment '--' sequence not allowed in comment" << endl;
}
*writer << "<!--" << normalizeText(comment).c_str() << "-->" << endl;
@@ -279,7 +279,7 @@ string XMLWriter::normalizeText(string s) {
return str;
}
void XMLWriter::checkNameValid(string s) {
void XMLWriter::checkNameValid(string) {
// Could be added.
// if (!XMLCharacterProperties.validName(s)) throw new RuntimeException("Invalid name: "+s);
}
source/visualization/History
+18 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.218 2003/02/17 07:19:37 stanaka Exp $
$Id: History,v 1.224 2003/06/02 10:42:59 johna Exp $
-------------------------------------------------------------------
=========================================================
@@ -24,6 +24,23 @@ committal in the CVS repository !
History file for visualization category
---------------------------------------
2nd June 2003 John Allison (vis-V05-01-01)
- Small fix for pedantic warnings in RayTracer.
30th May 2003 John Allison (vis-V05-01-00 - does not include HepRep below)
- Improved README.built_in_commands. Removed unlikely-to-be-implemented
commands.
- Eliminated pedantic warnings.
28th February 2003 Joseph Perl
- Minor Fix to HepRep - see History file.
20th January 2003 John Allison
- Changed "/vis/scene/add/trajectories [<drawing-mode>]" so that if
the command is issued more than once on any given scene, the last
command takes effect, i.e., so that the last value of drawing-mode
takes effect.
17th February 2003 Satoshi Tanaka (vis-V05-00-01)
- A Small bug fixing of VRML2 driver
(Explicit cast from G4String to char* in G4VRML2SceneHandlerFunc.icc).
source/visualization/OPACS/include/G4GoSceneHandler.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GoSceneHandler.hh,v 1.9 2002/12/11 15:58:00 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Guy Barrand 04 November 1996
source/visualization/OPACS/include/G4Wo.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Wo.hh,v 1.6 2001/07/11 10:08:47 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Guy Barrand 04 November 1996
source/visualization/OPACS/include/G4WoViewer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4WoViewer.hh,v 1.5 2001/07/11 10:08:47 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Guy Barrand 04 November 1996
source/visualization/OPACS/include/G4Xo.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Xo.hh,v 1.6 2001/07/11 10:08:47 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Guy Barrand 04 November 1996
source/visualization/OPACS/include/G4XoViewer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4XoViewer.hh,v 1.5 2001/07/11 10:08:47 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Guy Barrand 04 November 1996
source/visualization/OPACS/src/G4GoSceneHandler.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4GoSceneHandler.cc,v 1.14 2002/12/11 15:58:01 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Guy Barrand 04 November 1996
source/visualization/OPACS/src/G4Wo.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Wo.cc,v 1.5 2001/07/11 10:08:47 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Guy Barrand 04 November 1996
source/visualization/OPACS/src/G4WoViewer.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4WoViewer.cc,v 1.7 2001/07/11 10:08:48 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Guy Barrand 04 November 1996
source/visualization/OPACS/src/G4Xo.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Xo.cc,v 1.6 2001/07/11 10:08:48 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Guy Barrand 04 November 1996
source/visualization/OPACS/src/G4XoViewer.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4XoViewer.cc,v 1.8 2001/07/11 10:08:48 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Guy Barrand 04 November 1996
source/visualization/OpenGL/History
+15 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.23 2002/11/27 12:46:55 johna Exp $
$Id: History,v 1.27 2003/06/25 09:01:32 gcosmo Exp $
-------------------------------------------------------------------
=========================================================
@@ -20,6 +20,20 @@ committal in the CVS repository !
History file for visualization/OpenGL
-------------------------------------
23rd June 2003 Guy Barrand (opengl-V05-01-02)
- Commit a first implementation of G4OpenGLWin32Viewer.
10th June 2003 Gabriele Cosmo (opengl-V05-01-01)
- More fixes for warnings in viewers classes.
- Added inclusion of <windows.h> for WIN32 platforms when GL headers
are included.
05th June 2003 Gabriele Cosmo (opengl-V05-01-00)
- Fixes for porting compilation on WIN32:
o G4OpenGLWin32Viewer[.hh.cc]: removed inclusion of <GL/glx.h>.
o G4OpenGLViewer.cc: replaced local variables near/far with pnear/pfar
since declared 'obsolete' in WIN32 platforms.
27th November 2002 John Allison (vis-V04-01-08)
- Improved algorithm of CompareForKernelVisit.
source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLImmediateSceneHandler.hh,v 1.6 2001/08/09 20:16:56 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 10th February 1997
source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLImmediateViewer.hh,v 1.7 2002/10/16 10:44:13 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 7th February 1997
source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLImmediateWin32.hh,v 1.6 2002/10/16 10:44:14 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// OpenGLImmediateWin32 graphics system factory.
source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLImmediateWin32Viewer.hh,v 1.7 2002/10/16 10:44:14 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Class G4OpenGLImmediateWin32Viewer : a class derived from
source/visualization/OpenGL/include/G4OpenGLImmediateX.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLImmediateX.hh,v 1.6 2001/07/11 10:08:48 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 10th February 1997
source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLImmediateXViewer.hh,v 1.7 2001/07/14 21:47:42 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 7th February 1997
source/visualization/OpenGL/include/G4OpenGLImmediateXm.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLImmediateXm.hh,v 1.6 2001/07/11 10:08:49 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 10th February 1997
source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLImmediateXmViewer.hh,v 1.7 2001/07/14 21:47:43 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 10th February 1997
source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh
+9 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4OpenGLSceneHandler.hh,v 1.12 2002/11/11 18:08:21 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4OpenGLSceneHandler.hh,v 1.14 2003/06/10 17:58:55 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 27th March 1996
@@ -34,12 +34,17 @@
#ifndef G4OPENGLSCENEHANDLER_HH
#define G4OPENGLSCENEHANDLER_HH
#include "G4VSceneHandler.hh"
#include "G4OpenGLViewer.hh"
#include "globals.hh"
#include "G4RotationMatrix.hh"
#ifdef WIN32
#include <windows.h>
#endif
#include <GL/gl.h>
#include <GL/glu.h>
#include "G4VSceneHandler.hh"
#include "G4OpenGLViewer.hh"
// Base class for various OpenGLScene classes.
class G4OpenGLSceneHandler: public G4VSceneHandler {
source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLSceneHandler.icc,v 1.5 2001/08/09 20:16:06 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 20th January 1998
source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh
+9 -9
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4OpenGLStoredSceneHandler.hh,v 1.13 2001/08/14 18:03:14 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4OpenGLStoredSceneHandler.hh,v 1.14 2003/06/16 17:13:38 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 10th February 1997
@@ -39,8 +39,8 @@
#include "globals.hh"
#include "G4RotationMatrix.hh"
#include "G4OpenGLSceneHandler.hh"
#include "g4std/map"
#include "g4std/vector"
#include <map>
#include <vector>
class G4OpenGLStored;
@@ -72,16 +72,16 @@ private:
// PODL = Persistent Object Display List.
GLint fTopPODL; // List which calls the other PODLs.
G4std::vector<G4int> fPODLList;
G4std::vector<G4Transform3D> fPODLTransformList;
std::vector<G4int> fPODLList;
std::vector<G4Transform3D> fPODLTransformList;
// TODL = Transient Object Display List.
G4std::vector<G4int> fTODLList;
G4std::vector<G4Transform3D> fTODLTransformList;
std::vector<G4int> fTODLList;
std::vector<G4Transform3D> fTODLTransformList;
// Stop-gap solution of structure re-use.
// A proper implementation would use geometry hierarchy.
G4std::map <const G4VSolid*, G4int, G4std::less <const G4VSolid*> > fSolidMap;
std::map <const G4VSolid*, G4int, std::less <const G4VSolid*> > fSolidMap;
};
inline G4int G4OpenGLStoredSceneHandler::GetSceneCount () {
source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLStoredViewer.hh,v 1.8 2001/08/14 18:03:15 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 7th February 1997
source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLStoredWin32.hh,v 1.6 2002/10/16 10:44:14 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// OpenGLStoredWin32 graphics system factory.
source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLStoredWin32Viewer.hh,v 1.5 2002/10/16 10:44:14 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Class G4OpenGLStoredWin32Viewer : a class derived from
source/visualization/OpenGL/include/G4OpenGLStoredX.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLStoredX.hh,v 1.6 2001/07/11 10:08:50 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 10th February 1997
source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLStoredXViewer.hh,v 1.5 2001/07/14 21:47:46 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 7th February 1997
source/visualization/OpenGL/include/G4OpenGLStoredXm.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLStoredXm.hh,v 1.5 2001/07/11 10:08:50 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 10th February 1997
source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLStoredXmViewer.hh,v 1.5 2001/07/14 21:47:47 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 10th February 1997
source/visualization/OpenGL/include/G4OpenGLTransform3D.hh
+7 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4OpenGLTransform3D.hh,v 1.4 2001/07/11 10:08:50 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4OpenGLTransform3D.hh,v 1.5 2003/06/10 17:41:04 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 24th October 1996
@@ -36,6 +36,11 @@
#include "G4Transform3D.hh"
#ifdef WIN32
#include <windows.h>
#endif
#include <GL/gl.h>
class G4OpenGLTransform3D : public G4Transform3D {
public:
G4OpenGLTransform3D (const G4Transform3D &t);
source/visualization/OpenGL/include/G4OpenGLViewer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLViewer.hh,v 1.9 2002/10/16 10:44:14 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 27th March 1996
source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh
+16 -12
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4OpenGLWin32Viewer.hh,v 1.6 2002/10/24 15:28:05 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4OpenGLWin32Viewer.hh,v 1.11 2003/06/25 09:01:08 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// G4OpenGLWin32Viewer : Class to provide WindowsNT specific
@@ -33,15 +33,10 @@
#ifndef G4OPENGLWIN32VIEWER_HH
#define G4OPENGLWIN32VIEWER_HH
#include "G4VViewer.hh"
#include "G4OpenGLSceneHandler.hh"
#include "globals.hh"
//Win32 includes?
#include <GL/gl.h>
#include <GL/glx.h>
#include <GL/glu.h>
#include "G4VViewer.hh"
#include "G4OpenGLSceneHandler.hh"
class G4OpenGLSceneHandler;
@@ -50,14 +45,23 @@ class G4OpenGLWin32Viewer: virtual public G4OpenGLViewer {
public:
G4OpenGLWin32Viewer (G4OpenGLSceneHandler& scene);
virtual ~G4OpenGLWin32Viewer ();
void SetView ();
void ShowView ();
void FinishView ();
protected:
void GetWin32Connection ();
void CreateGLWin32Context ();
virtual void CreateMainWindow ();
G4int WinSize_x, WinSize_y;
protected:
G4int WinSize_x;
G4int WinSize_y;
private:
static LRESULT CALLBACK WindowProc(HWND,UINT,WPARAM,LPARAM);
static bool SetWindowPixelFormat(HDC);
private:
HWND fWindow;
HDC fHDC;
HGLRC fHGLRC;
};
#endif
source/visualization/OpenGL/include/G4OpenGLXViewer.hh
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4OpenGLXViewer.hh,v 1.16 2002/11/11 18:12:02 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4OpenGLXViewer.hh,v 1.17 2003/06/10 17:13:32 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 7th February 1997
source/visualization/OpenGL/include/G4OpenGLXmBox.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLXmBox.hh,v 1.6 2001/07/11 10:08:51 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//Box container class
source/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLXmFourArrowButtons.hh,v 1.5 2001/07/11 10:08:51 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//Four arrow buttons class. Inherits from G4OpenGLXmVWidgetComponent
source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLXmFramedBox.hh,v 1.6 2001/07/11 10:08:51 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//Framed box container class
source/visualization/OpenGL/include/G4OpenGLXmPushButton.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLXmPushButton.hh,v 1.6 2001/07/11 10:08:51 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//Push button class. Inherits from G4OpenGLXmVWidgetComponent
source/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLXmRadioButton.hh,v 1.6 2001/07/11 10:08:51 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//Radio button class. Inherits from G4OpenGLXmVWidgetComponent
source/visualization/OpenGL/include/G4OpenGLXmResources.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLXmResources.hh,v 1.4 2001/07/11 10:08:51 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Default resources file for GEANT4 OpenGL Motif windows.
source/visualization/OpenGL/include/G4OpenGLXmSeparator.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLXmSeparator.hh,v 1.5 2001/07/11 10:08:52 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//Separator class. Inherits from G4OpenGLXmVWidgetComponent
source/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLXmSliderBar.hh,v 1.6 2001/07/11 10:08:52 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//Slider bar class. Inherits from G4OpenGLXmVWidgetComponent
source/visualization/OpenGL/include/G4OpenGLXmTextField.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLXmTextField.hh,v 1.6 2001/07/11 10:08:52 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//Text field class. Inherits from G4OpenGLXmVWidgetComponent
source/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLXmTopLevelShell.hh,v 1.5 2001/07/11 10:08:52 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//Top level shell class
source/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLXmVWidgetComponent.hh,v 1.5 2001/07/11 10:08:52 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//Base class for all Motif component widgets
source/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLXmVWidgetContainer.hh,v 1.5 2001/07/11 10:08:52 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//Base class for all Motif container widgets
source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLXmVWidgetObject.hh,v 1.5 2001/07/11 10:08:52 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//Virtual base class for all Motif widgets.
source/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLXmVWidgetShell.hh,v 1.5 2001/07/11 10:08:52 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//Base class for all Motif window widgets (shells)
source/visualization/OpenGL/include/G4OpenGLXmViewer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLXmViewer.hh,v 1.6 2001/07/11 10:08:52 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 10th February 1997
source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc
+4 -6
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.7 2002/02/24 01:47:55 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.9 2003/06/16 17:13:39 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 10th February 1997
@@ -39,8 +39,6 @@
#define CENTERLINE_CLPP /* CenterLine C++ workaround: */
// Also seems to be required for HP's CC and AIX xlC, at least.
#include <GL/gl.h>
#include "G4OpenGLSceneHandler.hh"
#include "G4OpenGLViewer.hh"
#include "G4OpenGLTransform3D.hh"
@@ -68,7 +66,7 @@ G4OpenGLImmediateSceneHandler::~G4OpenGLImmediateSceneHandler ()
fSceneCount--;
}
#include "g4std/iomanip"
#include <iomanip>
void G4OpenGLImmediateSceneHandler::BeginPrimitives
(const G4Transform3D& objectTransformation) {
@@ -81,7 +79,7 @@ void G4OpenGLImmediateSceneHandler::BeginPrimitives
G4cout << "G4OpenGLTransform3D matrix:";
for (int i = 0; i < 16; i++) {
if ((i % 4) == 0) G4cout << '\n';
G4cout << G4std::setw (15) << m[i];
G4cout << std::setw (15) << m[i];
}
G4cout << G4endl;
*****************************************/
source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLImmediateViewer.cc,v 1.6 2002/10/16 10:44:15 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 7th February 1997
source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLImmediateWin32.cc,v 1.8 2002/10/16 10:44:15 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// OpenGLImmediateWin32 graphics system factory.
source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc
+2 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4OpenGLImmediateWin32Viewer.cc,v 1.6 2002/10/16 10:44:15 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4OpenGLImmediateWin32Viewer.cc,v 1.7 2003/06/10 17:13:32 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Class G4OpenGLImmediateWin32Viewer : a class derived from G4OpenGLWin32Viewer and
@@ -32,8 +32,6 @@
#include "G4OpenGLImmediateWin32Viewer.hh"
#include <GL/gl.h>
#include "G4ios.hh"
G4OpenGLImmediateWin32Viewer::G4OpenGLImmediateWin32Viewer
source/visualization/OpenGL/src/G4OpenGLImmediateX.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLImmediateX.cc,v 1.8 2002/02/24 01:48:02 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 27th March 1996
source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc
+10 -9
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4OpenGLImmediateXViewer.cc,v 1.7 2002/02/24 01:48:04 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4OpenGLImmediateXViewer.cc,v 1.8 2003/06/10 17:13:32 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 7th February 1997
@@ -37,13 +37,14 @@
#include "G4ios.hh"
G4OpenGLImmediateXViewer::G4OpenGLImmediateXViewer (G4OpenGLImmediateSceneHandler& scene,
const G4String& name):
G4OpenGLViewer (scene),
G4OpenGLXViewer (scene),
G4OpenGLImmediateViewer (scene),
G4VViewer (scene, scene.IncrementViewCount (), name) {
G4OpenGLImmediateXViewer::
G4OpenGLImmediateXViewer (G4OpenGLImmediateSceneHandler& scene,
const G4String& name)
: G4VViewer (scene, scene.IncrementViewCount (), name),
G4OpenGLViewer (scene),
G4OpenGLXViewer (scene),
G4OpenGLImmediateViewer (scene)
{
if (fViewId < 0) return; // In case error in base class instantiation.
// ensure a suitable window was found
source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpenGLImmediateXm.cc,v 1.8 2002/02/24 01:48:05 johna Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Andrew Walkden 10th February 1997

Some files were not shown because too many files have changed in this diff Show More