Import Geant4 9.5.0 source tree
This commit is contained in:
+1
-1
@@ -7,7 +7,7 @@
|
||||
#
|
||||
# Generated on : 24/9/2010
|
||||
#
|
||||
# $Id: CMakeLists.txt,v 1.1 2010/09/29 19:13:44 bmorgan Exp $
|
||||
# $Id: CMakeLists.txt,v 1.1 2010-09-29 19:13:44 bmorgan Exp $
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
# $Id:$
|
||||
# --------------------------------------------------------------
|
||||
# GNUmakefile for externals library.
|
||||
# --------------------------------------------------------------
|
||||
|
||||
include $(G4INSTALL)/config/globlib.gmk
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#
|
||||
# Generated on : 24/9/2010
|
||||
#
|
||||
# $Id: CMakeLists.txt,v 1.1 2010/09/29 19:14:00 bmorgan Exp $
|
||||
# $Id: CMakeLists.txt,v 1.1 2010-09-29 19:14:00 bmorgan Exp $
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
|
||||
+6
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: GNUmakefile,v 1.5 2009/11/18 17:15:11 gcosmo Exp $
|
||||
# $Id: GNUmakefile,v 1.6 2010-12-23 14:18:05 lgarnier Exp $
|
||||
# -------------------------------------------------------------
|
||||
# GNUmakefile for gl2ps. Laurent Garnier, 6/2/09.
|
||||
|
||||
@@ -17,6 +17,11 @@ include $(G4INSTALL)/config/architecture.gmk
|
||||
include $(G4INSTALL)/config/G4VIS_BUILD.gmk
|
||||
include $(G4INSTALL)/config/interactivity.gmk
|
||||
|
||||
# NO need QT, then reset QTGLAGS
|
||||
QTFLAGS =
|
||||
QTLIBS =
|
||||
GLQTLIBS =
|
||||
|
||||
ifdef G4LIB_BUILD_ZLIB
|
||||
CPPFLAGS += -I$(G4BASE)/visualization/externals/zlib/include
|
||||
endif
|
||||
|
||||
+29
-1
@@ -1,4 +1,4 @@
|
||||
$Id: History,v 1.21 2010/11/13 10:37:57 allison Exp $
|
||||
$Id: History,v 1.23 2010-12-27 13:27:04 allison Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -17,6 +17,34 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
10th November 2011 Laurent Garnier (visexternal-V09-04-03)
|
||||
- G4OpenGL2PSAction : Back to old buffer size (cause sometime problems
|
||||
on Qt viewer)
|
||||
|
||||
9th November 2011 Laurent Garnier
|
||||
- G4OpenGL2PSAction : Best control on G4gl2psBeginPage
|
||||
|
||||
21st October 2011 John Allison (visexternal-V09-04-02)
|
||||
- Tagged.
|
||||
|
||||
21th October 2011 Laurent Garnier
|
||||
- G4OpenGL2PSAction : Reset fFile after use, force wb writing
|
||||
|
||||
20th October 2011 L.Garnier
|
||||
- Add methods to extend buffer size up to a limit if needed
|
||||
|
||||
27th January 2011 L.Garnier
|
||||
- Restored GNUmakefile and fix the bug introduce the 23th december
|
||||
|
||||
26th January 2011 Gabriele Cosmo (visexternal-V09-04-01)
|
||||
- Restored GNUmakefile as it was in tag "visexternal-V09-03-03", as it
|
||||
breaks compilation !
|
||||
|
||||
27th December 2010 John Allison (visexternal-V09-04-00)
|
||||
- Tagged.
|
||||
|
||||
23, December L. Garnier
|
||||
- GNUmakefile : Remove Qt stuff from Makefile
|
||||
|
||||
13th November 2010, John Allison (visexternal-V09-03-03)
|
||||
- Geant4_gl2ps.h: Added #ifdef _WIN32, #define _USE_MATH_DEFINE.
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4OpenGL2PSAction.hh,v 1.4 2010/04/26 16:28:18 lgarnier Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04-beta-01 $
|
||||
// $Id: G4OpenGL2PSAction.hh,v 1.4 2010-04-26 16:28:18 lgarnier Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
|
||||
#ifndef G4OpenGL2PSAction_h
|
||||
@@ -43,18 +43,23 @@ public:
|
||||
bool enableFileWriting();
|
||||
// return true if ok, false is an error occured
|
||||
|
||||
void disableFileWriting();
|
||||
bool disableFileWriting();
|
||||
// return true when OK, false if errror
|
||||
|
||||
bool fileWritingEnabled() const;
|
||||
void setLineWidth(int);
|
||||
void setPointSize(int);
|
||||
void setViewport(int,int,int,int);
|
||||
bool extendBufferSize();
|
||||
void resetBufferSizeParameters();
|
||||
|
||||
protected:
|
||||
void G4gl2psBegin();
|
||||
bool G4gl2psBegin();
|
||||
const char * fFileName;
|
||||
FILE* fFile;
|
||||
GLint fViewport[4];
|
||||
int fBufferSize;
|
||||
int fBufferSizeLimit;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
#
|
||||
# Generated on : 24/9/2010
|
||||
#
|
||||
# $Id: sources.cmake,v 1.5 2010/12/01 16:59:36 bmorgan Exp $
|
||||
# GEANT4 Tag $Name: geant4-09-04 $
|
||||
# $Id: sources.cmake,v 1.5 2010-12-01 16:59:36 bmorgan Exp $
|
||||
# GEANT4 Tag $Name: not supported by cvs2svn $
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
|
||||
+46
-12
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4OpenGL2PSAction.cc,v 1.6 2010/11/03 16:40:34 lgarnier Exp $
|
||||
// GEANT4 tag $Name: geant4-09-04 $
|
||||
// $Id: G4OpenGL2PSAction.cc,v 1.6 2010-11-03 16:40:34 lgarnier Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
//
|
||||
//
|
||||
|
||||
@@ -52,6 +52,19 @@ G4OpenGL2PSAction::G4OpenGL2PSAction(
|
||||
fViewport[1] = 0;
|
||||
fViewport[2] = 0;
|
||||
fViewport[3] = 0;
|
||||
fBufferSize = 1024;
|
||||
fBufferSizeLimit = 8192;
|
||||
resetBufferSizeParameters();
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
void G4OpenGL2PSAction::resetBufferSizeParameters(
|
||||
)
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
|
||||
{
|
||||
fBufferSize = 1024;
|
||||
fBufferSizeLimit = 8192;
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
@@ -105,22 +118,38 @@ bool G4OpenGL2PSAction::enableFileWriting(
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
|
||||
{
|
||||
fFile = ::fopen(fFileName,"w");
|
||||
fFile = ::fopen(fFileName,"wb");
|
||||
if(!fFile) {
|
||||
return false;
|
||||
}
|
||||
G4gl2psBegin();
|
||||
return true;
|
||||
return G4gl2psBegin();
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
void G4OpenGL2PSAction::disableFileWriting(
|
||||
bool G4OpenGL2PSAction::disableFileWriting(
|
||||
)
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
|
||||
{
|
||||
gl2psEndPage();
|
||||
int state = gl2psEndPage();
|
||||
::fclose(fFile);
|
||||
if (state == GL2PS_OVERFLOW) {
|
||||
return false;
|
||||
}
|
||||
fFile = 0;
|
||||
return true;
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
bool G4OpenGL2PSAction::extendBufferSize(
|
||||
)
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
|
||||
{
|
||||
// extend buffer size *2
|
||||
if (fBufferSize*2 <= fBufferSizeLimit) {
|
||||
fBufferSize = fBufferSize*2;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
bool G4OpenGL2PSAction::fileWritingEnabled(
|
||||
@@ -131,24 +160,24 @@ bool G4OpenGL2PSAction::fileWritingEnabled(
|
||||
return (fFile?true:false);
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
void G4OpenGL2PSAction::G4gl2psBegin(
|
||||
bool G4OpenGL2PSAction::G4gl2psBegin(
|
||||
)
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
|
||||
{
|
||||
if(!fFile) return;
|
||||
if(!fFile) return false;
|
||||
int options = GL2PS_OCCLUSION_CULL |
|
||||
GL2PS_BEST_ROOT | GL2PS_SILENT | GL2PS_DRAW_BACKGROUND | GL2PS_USE_CURRENT_VIEWPORT;
|
||||
// int options = GL2PS_OCCLUSION_CULL |
|
||||
// GL2PS_BEST_ROOT | GL2PS_SILENT | GL2PS_DRAW_BACKGROUND;
|
||||
int sort = GL2PS_BSP_SORT;
|
||||
//int sort = GL2PS_SIMPLE_SORT;
|
||||
// int sort = GL2PS_SIMPLE_SORT;
|
||||
GLint buffsize = 0;
|
||||
buffsize += 1024*1024;
|
||||
buffsize += fBufferSize*fBufferSize;
|
||||
|
||||
glGetIntegerv(GL_VIEWPORT,fViewport);
|
||||
|
||||
gl2psBeginPage("title","HEPVis::G4OpenGL2PSAction",
|
||||
GLint res = gl2psBeginPage("title","HEPVis::G4OpenGL2PSAction",
|
||||
fViewport,
|
||||
GL2PS_EPS,
|
||||
sort,
|
||||
@@ -156,6 +185,11 @@ void G4OpenGL2PSAction::G4gl2psBegin(
|
||||
GL_RGBA,0, NULL,0,0,0,
|
||||
buffsize,
|
||||
fFile,fFileName);
|
||||
if (res == GL2PS_ERROR) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#
|
||||
# Generated on : 24/9/2010
|
||||
#
|
||||
# $Id: CMakeLists.txt,v 1.2 2010/09/30 13:56:02 bmorgan Exp $
|
||||
# $Id: CMakeLists.txt,v 1.2 2010-09-30 13:56:02 bmorgan Exp $
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: GNUmakefile,v 1.1 2005/05/12 19:39:31 allison Exp $
|
||||
# $Id: GNUmakefile,v 1.1 2005-05-12 19:39:31 allison Exp $
|
||||
# -------------------------------------------------------------
|
||||
# GNUmakefile for zlib. John Allison, 5/5/05.
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
.$Id: History,v 1.1 2005/05/25 23:18:52 duns Exp $
|
||||
.$Id: History,v 1.1 2005-05-25 23:18:52 duns Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
subject to change. Applications should only use zlib.h.
|
||||
*/
|
||||
|
||||
/* @(#) $Id: deflate.h,v 1.1 2005/05/12 21:04:53 duns Exp $ */
|
||||
/* @(#) $Id: deflate.h,v 1.1 2005-05-12 21:04:53 duns Exp $ */
|
||||
|
||||
#ifndef DEFLATE_H
|
||||
#define DEFLATE_H
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||
*/
|
||||
|
||||
/* @(#) $Id: zconf.h,v 1.1 2005/05/12 21:04:53 duns Exp $ */
|
||||
/* @(#) $Id: zconf.h,v 1.1 2005-05-12 21:04:53 duns Exp $ */
|
||||
|
||||
#ifndef _ZCONF_H
|
||||
#define _ZCONF_H
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
subject to change. Applications should only use zlib.h.
|
||||
*/
|
||||
|
||||
/* @(#) $Id: zutil.h,v 1.1 2005/05/12 21:04:53 duns Exp $ */
|
||||
/* @(#) $Id: zutil.h,v 1.1 2005-05-12 21:04:53 duns Exp $ */
|
||||
|
||||
#ifndef _ZUTIL_H
|
||||
#define _ZUTIL_H
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#
|
||||
# Generated on : 24/9/2010
|
||||
#
|
||||
# $Id: sources.cmake,v 1.1 2010/09/29 19:14:24 bmorgan Exp $
|
||||
# $Id: sources.cmake,v 1.1 2010-09-29 19:14:24 bmorgan Exp $
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||
*/
|
||||
|
||||
/* @(#) $Id: adler32.cc,v 1.1 2005/05/12 21:04:53 duns Exp $ */
|
||||
/* @(#) $Id: adler32.cc,v 1.1 2005-05-12 21:04:53 duns Exp $ */
|
||||
|
||||
#define ZLIB_INTERNAL
|
||||
#include "zlib.h"
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||
*/
|
||||
|
||||
/* @(#) $Id: compress.cc,v 1.1 2005/05/12 21:04:53 duns Exp $ */
|
||||
/* @(#) $Id: compress.cc,v 1.1 2005-05-12 21:04:53 duns Exp $ */
|
||||
|
||||
#define ZLIB_INTERNAL
|
||||
#include "zlib.h"
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
* of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
|
||||
*/
|
||||
|
||||
/* @(#) $Id: crc32.cc,v 1.1 2005/05/12 21:04:53 duns Exp $ */
|
||||
/* @(#) $Id: crc32.cc,v 1.1 2005-05-12 21:04:53 duns Exp $ */
|
||||
|
||||
/*
|
||||
Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
|
||||
|
||||
+1
-1
@@ -47,7 +47,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/* @(#) $Id: deflate.cc,v 1.1 2005/05/12 21:04:53 duns Exp $ */
|
||||
/* @(#) $Id: deflate.cc,v 1.1 2005-05-12 21:04:53 duns Exp $ */
|
||||
|
||||
#include "deflate.h"
|
||||
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@
|
||||
* Addison-Wesley, 1983. ISBN 0-201-06672-6.
|
||||
*/
|
||||
|
||||
/* @(#) $Id: trees.cc,v 1.1 2005/05/12 21:04:53 duns Exp $ */
|
||||
/* @(#) $Id: trees.cc,v 1.1 2005-05-12 21:04:53 duns Exp $ */
|
||||
|
||||
/* #define GEN_TREES_H */
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||
*/
|
||||
|
||||
/* @(#) $Id: zutil.cc,v 1.1 2005/05/12 21:04:53 duns Exp $ */
|
||||
/* @(#) $Id: zutil.cc,v 1.1 2005-05-12 21:04:53 duns Exp $ */
|
||||
|
||||
#include "zutil.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user