Import Geant4 11.0.0 source tree
This commit is contained in:
committed by
Ben Morgan
parent
6399a014b6
commit
80e2389dd8
@@ -37,6 +37,54 @@ CPPFLAGS += -I$(G4BASE)/global/HEPRandom/include
|
||||
CPPFLAGS += -I$(G4BASE)/tracking/include
|
||||
CPPFLAGS += -I$(G4BASE)/digits_hits/hits/include
|
||||
|
||||
# Locally adjust source list before including common.gmk
|
||||
sources := $(addprefix src/, \
|
||||
G4OpenInventor.cc \
|
||||
G4OpenInventorSceneHandler.cc \
|
||||
G4OpenInventorTransform3D.cc \
|
||||
G4OpenInventorViewer.cc \
|
||||
G4VisFeaturesOfOpenInventor.cc \
|
||||
SbPainter.cc \
|
||||
SbPainterPS.cc \
|
||||
SoAlternateRepAction.cc \
|
||||
SoBox.cc \
|
||||
SoCons.cc \
|
||||
SoCounterAction.cc \
|
||||
SoDetectorTreeKit.cc \
|
||||
SoGL2PSAction.cc \
|
||||
SoImageWriter.cc \
|
||||
SoMarkerSet.cc \
|
||||
SoPolyhedron.cc \
|
||||
SoStyleCache.cc \
|
||||
SoTrap.cc \
|
||||
SoTrd.cc \
|
||||
SoTubs.cc)
|
||||
|
||||
ifdef G4VIS_BUILD_OIX_DRIVER
|
||||
sources += $(addprefix src/, \
|
||||
G4OpenInventorXt.cc \
|
||||
G4OpenInventorXtExaminerViewer.cc \
|
||||
G4OpenInventorXtExaminerViewerMessenger.cc \
|
||||
G4OpenInventorXtExtended.cc \
|
||||
G4OpenInventorXtExtendedViewer.cc \
|
||||
G4OpenInventorXtViewer.cc \
|
||||
wheelmouse.cc)
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_OIQT_DRIVER
|
||||
sources += $(addprefix src/, \
|
||||
G4OpenInventorQt.cc \
|
||||
G4OpenInventorQtExaminerViewer.cc \
|
||||
G4OpenInventorQtViewer.cc \
|
||||
G4SoQt.cc)
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_OIWIN32_DRIVER
|
||||
sources += $(addprefix src/, \
|
||||
G4OpenInventorWin.cc \
|
||||
G4OpenInventorWinViewer.cc)
|
||||
endif
|
||||
|
||||
include $(G4INSTALL)/config/common.gmk
|
||||
|
||||
debug:
|
||||
|
||||
@@ -18,6 +18,13 @@ committal in the CVS repository !
|
||||
|
||||
History file for visualization/OpenInventor
|
||||
-------------------------------------------
|
||||
12 November 2021 - Ben Morgan (openinventor-V10-07-06)
|
||||
- Retire G4VIS_... preprocessor symbols in toolkit build, only required
|
||||
by obsolete GNUmake system
|
||||
|
||||
8 November 2021 - Ben Morgan (openinventor-V10-07-05)
|
||||
- Retire G4UI/G4INTY_... preprocessor symbols in toolkit build, only required
|
||||
by obsolete GNUmake system
|
||||
|
||||
07 June 2021 John Allison (openinventor-v10-07-04)
|
||||
- Requires greps-V10-07-07 (new method AddCompound (const G4Mesh&)).
|
||||
|
||||
@@ -1,186 +0,0 @@
|
||||
Extended OI Xt viewer
|
||||
=====================
|
||||
INCOMPLETE DRAFT
|
||||
|
||||
G4OpenInventorXtExaminerViewer is based on and is
|
||||
a plug-in replacement for SoXtExaminerViewer which
|
||||
is a base class viewer provided by the SoXt (Coin3d)
|
||||
library. SoXtExaminerViewer is the normal viewer
|
||||
that you get when doing /vis/open OIX.
|
||||
These viewers depend on X, Xt and Xm and so are
|
||||
limited to UNIX/MAC and will not run on native
|
||||
Windows.
|
||||
|
||||
The SoXtExaminerViewer is instantiated by
|
||||
G4OpenInventorXtViewer. This has been temporarily
|
||||
disabled and has been replaced by an instantiation
|
||||
of G4OpenInventorXtExaminerViewer, together with
|
||||
some additional configuration. The intention
|
||||
is to find a suitable mechanism to allow a choice
|
||||
of viewer (standard or extended) at run time.
|
||||
|
||||
No modifications to user code or to any other
|
||||
Geant4 categories are required to use the extended
|
||||
viewer. Many of the implemented features are made
|
||||
possible by the SCENE GRAPH technology in Open
|
||||
Inventor which stores the scene elements and
|
||||
associated information in a structured way.
|
||||
|
||||
Features
|
||||
========
|
||||
|
||||
Reference Path navigation
|
||||
-------------------------
|
||||
|
||||
Most of the new features are concerned with navigation
|
||||
along a "reference path" which is a piecewise
|
||||
linear path through the world. The reference path
|
||||
can be any particle trajectory, chosen as follows:
|
||||
|
||||
The application can attach a "reference trajectory"
|
||||
attribute to a particular trajectory.
|
||||
|
||||
If there is no such designated trajectory, the viewer
|
||||
chooses the longest trajectory as the initial reference
|
||||
path.
|
||||
|
||||
Any other trajectory can be selected as the reference
|
||||
by selecting it with the mouse.
|
||||
|
||||
Elements are assigned a "distance" along the reference
|
||||
path, based on the perpendicular from the element's
|
||||
placement coordinates to the path. Elements are then
|
||||
sorted by distance and the list is displayed in an
|
||||
auxiliary window of the viewer. NOTE: at present
|
||||
the path is not extrapolated at the ends, so elements
|
||||
"before" or "after" the path are assigned distances
|
||||
of 0 or the total path length respectively. This
|
||||
will be generalized in future.
|
||||
|
||||
Reference path navigation controls:
|
||||
|
||||
Select an element from the list: navigate along the
|
||||
path to the element's "location" (distance along
|
||||
the path.
|
||||
|
||||
L,R,U,D refer to the arrow keys.
|
||||
|
||||
Shift-L and Shift-R: navigate to the previous or next
|
||||
element on the path (with wraparound).
|
||||
|
||||
L and R: rotate 90 degrees around the vertical axis
|
||||
|
||||
U and D: rotate 90 degrees around the path
|
||||
|
||||
Ctrl-L and Ctrl-R: rotate 90 degrees around the horizontal axis
|
||||
|
||||
All these keys have a "repeat" function for continuous motion.
|
||||
|
||||
The rotation keys put the camera in a definite orientation.
|
||||
The Shift-L and Shift-R keys can be used to "fly" along the
|
||||
path in whatever orientation is in effect.
|
||||
NOTE: if this appears to be "stuck", try switching from
|
||||
orthonormal camera to perspective camera ("cube" viewer button).
|
||||
|
||||
Tools / Go to start of reference path: useful if you get lost
|
||||
|
||||
Tools / Invert reference path: flips the direction of travel
|
||||
and the distance readout
|
||||
|
||||
|
||||
Reference path animation
|
||||
|
||||
This is a special mode which flys the camera steadily along the
|
||||
path, without wraparound. Special controls are:
|
||||
|
||||
Tools / Animate Ref Particle: start animation mode
|
||||
|
||||
Page-Up: increase speed
|
||||
Page-Down: decrease speed
|
||||
U: raise camera
|
||||
D: lower camera
|
||||
ESC: exit animation mode
|
||||
|
||||
For suitable geometries the U and D keys can be used to
|
||||
get "Star Wars" style fly-over and fly-under effects.
|
||||
|
||||
Bookmarks
|
||||
|
||||
At any time, the viewpoint and other camera parameters can
|
||||
be saved in a file as a labelled "bookmark".
|
||||
The view can then be restored later in the current run or
|
||||
in another run.
|
||||
|
||||
The default name for the bookmark file is ".bookmarkFile"
|
||||
The first time a viewpoint is saved, this file will be
|
||||
created if it does not already exist. When the viewer
|
||||
is first opened, it will automatically read this file
|
||||
if present and load the viewpoints into the left-hand
|
||||
panel of the viewer's auxiliary window.
|
||||
|
||||
Controls:
|
||||
|
||||
Select viewpoint from list: restore this view
|
||||
|
||||
Right-arrow VIEWER button: go to next viewpoint
|
||||
Left-arrow VIEWER button: go to next viewpoint
|
||||
|
||||
"Floppy Disk" button: save current view.
|
||||
The user can type in a label for the view,
|
||||
or use the default label provided.
|
||||
|
||||
File / Open Viewpoint File: loads an existing bookmark file
|
||||
File / New Viewpoint File: creates a new bookmark file for
|
||||
saving subsequent views
|
||||
|
||||
|
||||
Special Picking Modes
|
||||
|
||||
"Console" VIEWER button: enable brief trajectory picking and
|
||||
mouse-over element readout
|
||||
For trajectories, the list of all trajectory points is
|
||||
replaced by the first and last point only, allowing easier
|
||||
identification of the particle without scrolling back.
|
||||
Passing the mouse over an element will give a readout
|
||||
of the volume name, material, and position on the
|
||||
reference path.
|
||||
|
||||
"Star" VIEWER button: select new reference path
|
||||
The cursor will change to a small cross (+)
|
||||
after which a trajectory can be selected to become
|
||||
the new reference path.
|
||||
|
||||
Convenience feature
|
||||
|
||||
Escape from viewer without using the mouse:
|
||||
In addition to the File / Escape menu item, pressing the "e"
|
||||
key on the keyboard will exit from the viewer's X event loop.
|
||||
The viewer becomes inactive and control returns to the
|
||||
Geant4 UI prompt.
|
||||
|
||||
Prototype only:
|
||||
|
||||
File / Save-Load Ref Coords: status to be determined
|
||||
|
||||
File / Save-Load Scene Graph: this saves the current scene graph,
|
||||
(whatever is being viewed and navigated in the viewer)
|
||||
including the geometry, camera, lighting information, into a
|
||||
file which can be read back, thus returning to a previous
|
||||
viewing "experience". This only partially works and some
|
||||
or all of the geometry may be missing. Geant4-specific
|
||||
scene elements may be lacking a "save" method.
|
||||
|
||||
Known problems:
|
||||
|
||||
Viewer occasionally hangs in an unknown state.
|
||||
Usually can be "cleared" by trying various viewer buttons
|
||||
or menu items. Last resort: escape to the G4 prompt and
|
||||
run more events. Viewer will usually be o.k. afterwards.
|
||||
|
||||
Unpredictable mode-switching behaviour: switching between
|
||||
orthonormal and perspective camera may give wierd results.
|
||||
Navigation may appear "stuck" with orthonormal camera.
|
||||
|
||||
Both the standard and extended viewers can crash the
|
||||
executable or even the X server if they are pushed
|
||||
too far (e.g. by excessive zooming).
|
||||
@@ -29,8 +29,6 @@
|
||||
#ifndef G4OPENINVENTORQT_HH
|
||||
#define G4OPENINVENTORQT_HH
|
||||
|
||||
#if defined (G4VIS_BUILD_OIQT_DRIVER) || defined (G4VIS_USE_OIQT)
|
||||
|
||||
#include "G4OpenInventor.hh"
|
||||
|
||||
class G4OpenInventorQt: public G4OpenInventor {
|
||||
@@ -45,5 +43,3 @@ private:
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -30,9 +30,6 @@
|
||||
#ifndef G4OPENINVENTORQTEXAMINERVIEWER_HH
|
||||
#define G4OPENINVENTORQTEXAMINERVIEWER_HH
|
||||
|
||||
#if defined (G4VIS_BUILD_OIQT_DRIVER) || defined (G4VIS_USE_OIQT)
|
||||
|
||||
|
||||
// Set up notification of event processing
|
||||
|
||||
#include "G4VStateDependent.hh"
|
||||
@@ -466,6 +463,4 @@ protected:
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* G4OPENINVENTORQTEXAMINERVIEWER_HH */
|
||||
|
||||
@@ -29,8 +29,6 @@
|
||||
#ifndef G4OPENINVENTORQTVIEWER_HH
|
||||
#define G4OPENINVENTORQTVIEWER_HH
|
||||
|
||||
#if defined (G4VIS_BUILD_OIQT_DRIVER) || defined (G4VIS_USE_OIQT)
|
||||
|
||||
// Inheritance :
|
||||
#include "G4OpenInventorViewer.hh"
|
||||
|
||||
@@ -117,5 +115,3 @@ protected:
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -33,8 +33,6 @@
|
||||
#ifndef G4OPENINVENTORSCENEHANDLER_HH
|
||||
#define G4OPENINVENTORSCENEHANDLER_HH
|
||||
|
||||
#if defined (G4VIS_BUILD_OI_DRIVER) || defined (G4VIS_USE_OI)
|
||||
|
||||
// Inheritance :
|
||||
#include "G4VSceneHandler.hh"
|
||||
|
||||
@@ -99,5 +97,3 @@ private:
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -33,8 +33,6 @@
|
||||
#ifndef G4OPENINVENTORTRANSFORM3D_HH
|
||||
#define G4OPENINVENTORTRANSFORM3D_HH
|
||||
|
||||
#if defined (G4VIS_BUILD_OI_DRIVER) || defined (G4VIS_USE_OI)
|
||||
|
||||
#include "G4Transform3D.hh"
|
||||
|
||||
class SbMatrix;
|
||||
@@ -48,5 +46,3 @@ private:
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -28,8 +28,6 @@
|
||||
#ifndef G4OPENINVENTORVIEWER_HH
|
||||
#define G4OPENINVENTORVIEWER_HH
|
||||
|
||||
#if defined (G4VIS_BUILD_OI_DRIVER) || defined (G4VIS_USE_OI)
|
||||
|
||||
// Inheritance :
|
||||
#include "G4VViewer.hh"
|
||||
|
||||
@@ -104,5 +102,3 @@ protected:
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -32,8 +32,6 @@
|
||||
#ifndef G4OPENINVENTORWINVIEWER_HH
|
||||
#define G4OPENINVENTORWINVIEWER_HH
|
||||
|
||||
#if defined (G4VIS_BUILD_OI_DRIVER) || defined (G4VIS_USE_OI)
|
||||
|
||||
// Inheritance :
|
||||
#include "G4OpenInventorViewer.hh"
|
||||
|
||||
@@ -62,5 +60,3 @@ private:
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -23,8 +23,6 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
|
||||
#if defined (G4VIS_BUILD_OIX_DRIVER) || defined (G4VIS_USE_OIX)
|
||||
|
||||
#ifndef G4OPENINVENTORXTEXAMINERVIEWERMESSENGER_HH
|
||||
#define G4OPENINVENTORXTEXAMINERVIEWERMESSENGER_HH
|
||||
|
||||
@@ -50,5 +48,3 @@ private:
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -32,8 +32,6 @@
|
||||
#ifndef G4OPENINVENTORXTEXTENDEDVIEWER_HH
|
||||
#define G4OPENINVENTORXTEXTENDEDVIEWER_HH
|
||||
|
||||
#if defined (G4VIS_BUILD_OI_DRIVER) || defined (G4VIS_USE_OI)
|
||||
|
||||
// Inheritance :
|
||||
#include "G4OpenInventorViewer.hh"
|
||||
|
||||
@@ -86,5 +84,3 @@ private:
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -32,8 +32,6 @@
|
||||
#ifndef G4OPENINVENTORXTVIEWER_HH
|
||||
#define G4OPENINVENTORXTVIEWER_HH
|
||||
|
||||
#if defined (G4VIS_BUILD_OI_DRIVER) || defined (G4VIS_USE_OI)
|
||||
|
||||
// Inheritance :
|
||||
#include "G4OpenInventorViewer.hh"
|
||||
|
||||
@@ -79,5 +77,3 @@ protected:
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -29,8 +29,6 @@
|
||||
#ifndef G4SOQT_HH
|
||||
#define G4SOQT_HH
|
||||
|
||||
#if defined (G4VIS_BUILD_OIQT_DRIVER) || defined (G4VIS_USE_OIQT)
|
||||
|
||||
#include "G4VInteractorManager.hh"
|
||||
|
||||
class QWidget;
|
||||
@@ -71,5 +69,3 @@ private:
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -33,6 +33,8 @@
|
||||
// Needs setting based on choice of driver
|
||||
// Apple system for SoQt on Apple
|
||||
// Native otherwise (Apple Framework)
|
||||
// NOTE: This header is private to the OI category, and the OI lib can only be built in one mode
|
||||
// so rhis can be simplified....
|
||||
#if defined(__APPLE__) && (!defined(G4VIS_BUILD_OIX_DRIVER) || !defined(G4VIS_USE_OIX_DRIVER))
|
||||
#include <OpenGL/gl.h>
|
||||
#include <OpenGL/glu.h>
|
||||
|
||||
@@ -39,7 +39,6 @@ set(G4VIS_MODULE_OPENINVENTOR_SOURCES
|
||||
)
|
||||
|
||||
set(G4VIS_MODULE_OPENINVENTOR_LINK_LIBRARIES Coin::Coin)
|
||||
add_definitions(-DG4VIS_BUILD_OI_DRIVER)
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# UNIX Only (Xt) sources
|
||||
@@ -72,7 +71,6 @@ if(GEANT4_USE_INVENTOR_XT)
|
||||
wheelmouse.cc)
|
||||
|
||||
# Add the definitions for SoXt
|
||||
add_definitions(-DG4INTY_BUILD_XT)
|
||||
add_definitions(-DG4VIS_BUILD_OIX_DRIVER)
|
||||
|
||||
# SoXt Library and others
|
||||
@@ -101,12 +99,6 @@ if(GEANT4_USE_INVENTOR_QT)
|
||||
G4OpenInventorQtViewer.cc
|
||||
G4SoQt.cc)
|
||||
|
||||
# Add the definitions
|
||||
# Argh.. Have to remember about INTY and UI because of their use...
|
||||
add_definitions(-DG4VIS_BUILD_OIQT_DRIVER)
|
||||
add_definitions(-DG4INTY_BUILD_QT)
|
||||
add_definitions(-DG4UI_BUILD_QT_SESSION)
|
||||
|
||||
# Add libraries
|
||||
list(APPEND G4VIS_MODULE_OPENINVENTOR_LINK_LIBRARIES
|
||||
SoQt::SoQt
|
||||
@@ -132,10 +124,6 @@ if(GEANT4_USE_INVENTOR_WIN)
|
||||
G4OpenInventorWinViewer.cc
|
||||
)
|
||||
|
||||
# Add the definitions for SoWin
|
||||
add_definitions(-DG4INTY_BUILD_WIN32)
|
||||
add_definitions(-DG4VIS_BUILD_OIWIN32_DRIVER)
|
||||
|
||||
# SoWin Library
|
||||
list(APPEND G4VIS_MODULE_OPENINVENTOR_LINK_LIBRARIES SoWin::SoWin OpenGL::GL)
|
||||
endif()
|
||||
|
||||
@@ -25,8 +25,6 @@
|
||||
//
|
||||
//
|
||||
//
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
// this :
|
||||
#include "G4OpenInventor.hh"
|
||||
|
||||
@@ -115,5 +113,3 @@ G4bool G4OpenInventor::IsUISessionCompatible () const
|
||||
|
||||
return isCompatible;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -26,8 +26,6 @@
|
||||
//
|
||||
// Frederick Jones TRIUMF 30 NOV 2017
|
||||
|
||||
#ifdef G4VIS_BUILD_OIQT_DRIVER
|
||||
|
||||
// this :
|
||||
#include "G4OpenInventorQt.hh"
|
||||
|
||||
@@ -99,5 +97,3 @@ G4VViewer* G4OpenInventorQt::CreateViewer(G4VSceneHandler& scene,
|
||||
|
||||
return pView;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -26,8 +26,6 @@
|
||||
|
||||
// Frederick Jones TRIUMF 07 January 2018
|
||||
|
||||
#ifdef G4VIS_BUILD_OIQT_DRIVER
|
||||
|
||||
#include "G4OpenInventorQtExaminerViewer.hh"
|
||||
|
||||
#include "ui_OIQtListsDialog.h"
|
||||
@@ -2651,13 +2649,6 @@ G4OpenInventorQtExaminerViewer::FileOpenBookmarkCB()
|
||||
QStringList filenameinlist = filedialog.selectedFiles();
|
||||
QString filenamein = filenameinlist[0];
|
||||
|
||||
// Note null string and empty string are different
|
||||
// if (filenamein.isNull()) {
|
||||
// G4cout << "Input file name is NULL" << G4endl;
|
||||
// return;
|
||||
// }
|
||||
// G4cout << "Input file name is " << qPrintable(filenamein) << G4endl;
|
||||
|
||||
char* filename = new char[filenamein.size()+1];
|
||||
filename = strdup(qPrintable(filenamein));
|
||||
// G4cout << "char[] file name is " << filename << G4endl;
|
||||
@@ -4122,6 +4113,3 @@ G4bool HookEventProcState::Notify(G4ApplicationState requestedState)
|
||||
if (requestedState == G4State_EventProc) viewer->newEvents = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@@ -25,8 +25,6 @@
|
||||
|
||||
// Frederick Jones TRIUMF 07 November 2017
|
||||
|
||||
#ifdef G4VIS_BUILD_OIQT_DRIVER
|
||||
|
||||
// this :
|
||||
#include "G4OpenInventorQtViewer.hh"
|
||||
|
||||
@@ -405,6 +403,3 @@ void G4OpenInventorQtViewer::EtcSceneGraphStatsCB()
|
||||
// G4cout << "G4OIQtViewer: Etc: Scene Graph Stats CALLBACK" << G4endl;
|
||||
SceneGraphStatistics();
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
//
|
||||
// Jeff Kallenbach 01 Aug 1996
|
||||
// OpenInventor stored scene - creates OpenInventor display lists.
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
// this :
|
||||
#include "G4OpenInventorSceneHandler.hh"
|
||||
@@ -838,4 +837,3 @@ void G4OpenInventorSceneHandler::AddTransform(const G4Point3D& translation)
|
||||
delete sbMatrix;
|
||||
fCurrentSeparator->addChild(matrixTransform);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -31,8 +31,6 @@
|
||||
// from G4Transform3D.
|
||||
// gb 22 Nov 2004 : use SbMatrix instead of SoSFMatrix.
|
||||
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
// this :
|
||||
#include "G4OpenInventorTransform3D.hh"
|
||||
|
||||
@@ -67,5 +65,3 @@ SbMatrix* G4OpenInventorTransform3D::GetSbMatrix () const {
|
||||
m[12],m[13],m[14],m[15]);
|
||||
return tm;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -29,8 +29,6 @@
|
||||
// can update the view parameters, irrespective of any changes to the
|
||||
// camera type.
|
||||
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
// this :
|
||||
#include "G4OpenInventorViewer.hh"
|
||||
|
||||
@@ -790,5 +788,3 @@ Controls on an Inventor examiner viewer are :\n\
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -27,8 +27,6 @@
|
||||
//
|
||||
// OpenInventor graphics system factory.
|
||||
|
||||
#ifdef G4VIS_BUILD_OIWIN32_DRIVER
|
||||
|
||||
// this :
|
||||
#include "G4OpenInventorWin.hh"
|
||||
|
||||
@@ -68,6 +66,3 @@ G4VViewer* G4OpenInventorWin::CreateViewer (G4VSceneHandler& scene, const G4Stri
|
||||
G4OpenInventorSceneHandler* pScene = (G4OpenInventorSceneHandler*)&scene;
|
||||
return new G4OpenInventorWinViewer (*pScene, name);
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@@ -34,8 +34,6 @@
|
||||
* gb 14 November 2004 : inherit G4OpenInventorViewer.
|
||||
*/
|
||||
|
||||
#ifdef G4VIS_BUILD_OIWIN32_DRIVER
|
||||
|
||||
// this :
|
||||
#include "G4OpenInventorWinViewer.hh"
|
||||
|
||||
@@ -323,5 +321,3 @@ LRESULT CALLBACK G4OpenInventorWinViewer::WindowProc (
|
||||
return (::DefWindowProc(aWindow,aMessage,aWParam,aLParam));
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -29,8 +29,6 @@
|
||||
// Jeff Kallenbach 01 Aug 1996
|
||||
// OpenInventor graphics system factory.
|
||||
|
||||
#ifdef G4VIS_BUILD_OIX_DRIVER
|
||||
|
||||
// this :
|
||||
#include "G4OpenInventorXt.hh"
|
||||
|
||||
@@ -101,6 +99,3 @@ G4VViewer* G4OpenInventorXt::CreateViewer (G4VSceneHandler& scene, const G4Strin
|
||||
G4OpenInventorSceneHandler* pScene = (G4OpenInventorSceneHandler*)&scene;
|
||||
return new G4OpenInventorXtViewer (*pScene, name);
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@@ -27,8 +27,6 @@
|
||||
// Open Inventor Xt Extended Viewer - 30 Oct 2012
|
||||
// Rastislav Ondrasek, Pierre-Luc Gagnon, Frederick Jones TRIUMF
|
||||
|
||||
#ifdef G4VIS_BUILD_OIX_DRIVER
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <string>
|
||||
@@ -4940,5 +4938,3 @@ G4bool HookEventProcState::Notify(G4ApplicationState requiredState)
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
#endif // G4VIS_BUILD_OIX_DRIVER
|
||||
|
||||
@@ -23,8 +23,6 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
|
||||
#ifdef G4VIS_BUILD_OIX_DRIVER
|
||||
|
||||
#include "G4OpenInventorXtExaminerViewerMessenger.hh"
|
||||
#include "G4OpenInventorXtExaminerViewer.hh"
|
||||
|
||||
@@ -101,5 +99,3 @@ void G4OpenInventorXtExaminerViewerMessenger::
|
||||
if (lookahead > 0) pViewer->pathLookahead = lookahead;
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -32,8 +32,6 @@
|
||||
// Extended driver based on G4OpenInventorXt.hh
|
||||
// Uses G4OpenInventorXtExaminerViewer.
|
||||
|
||||
#ifdef G4VIS_BUILD_OIX_DRIVER
|
||||
|
||||
// this :
|
||||
#include "G4OpenInventorXtExtended.hh"
|
||||
|
||||
@@ -110,6 +108,3 @@ G4VViewer* G4OpenInventorXtExtended::CreateViewer (G4VSceneHandler& scene, const
|
||||
G4OpenInventorSceneHandler* pScene = (G4OpenInventorSceneHandler*)&scene;
|
||||
return new G4OpenInventorXtExtendedViewer (*pScene, name);
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@@ -37,8 +37,6 @@
|
||||
* gb 14 November 2004 : inherit G4OpenInventorViewer.
|
||||
*/
|
||||
|
||||
#ifdef G4VIS_BUILD_OIX_DRIVER
|
||||
|
||||
// this :
|
||||
#include "G4OpenInventorXtExtendedViewer.hh"
|
||||
|
||||
@@ -426,5 +424,3 @@ void G4OpenInventorXtExtendedViewer::HelpCbk(
|
||||
XtManageChild(This->fHelpForm);
|
||||
XmTextSetString(This->fHelpText,(char*)This->Help().c_str());
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -37,8 +37,6 @@
|
||||
* gb 14 November 2004 : inherit G4OpenInventorViewer.
|
||||
*/
|
||||
|
||||
#ifdef G4VIS_BUILD_OIX_DRIVER
|
||||
|
||||
// this :
|
||||
#include "G4OpenInventorXtViewer.hh"
|
||||
|
||||
@@ -373,5 +371,3 @@ void G4OpenInventorXtViewer::HelpCbk(
|
||||
XtManageChild(This->fHelpForm);
|
||||
XmTextSetString(This->fHelpText,(char*)This->Help().c_str());
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -26,8 +26,6 @@
|
||||
//
|
||||
// F.W. Jones 05012018
|
||||
|
||||
#ifdef G4VIS_BUILD_OIQT_DRIVER
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
@@ -166,5 +164,3 @@ bool G4SoQt::IsExternalApp()
|
||||
{
|
||||
return externalApp;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
/*----------------------------HEPVis----------------------------------------*/
|
||||
/* */
|
||||
@@ -75,5 +74,3 @@ void SbPainter::enableEdges(
|
||||
{
|
||||
fEdges = aValue;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -23,8 +23,6 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
/*----------------------------HEPVis----------------------------------------*/
|
||||
/* */
|
||||
/* Node: SbPainterPS */
|
||||
@@ -1051,5 +1049,3 @@ double ConvertRGB_ToGrey(
|
||||
{
|
||||
return (0.30 * a_red + 0.59 * a_green + 0.11 * a_blue);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -23,8 +23,6 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
|
||||
// this :
|
||||
#include <HEPVis/actions/SoAlternateRepAction.h>
|
||||
@@ -149,5 +147,3 @@ void SoAlternateRepAction::nodeAction(
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -34,8 +34,6 @@
|
||||
/* */
|
||||
/*--------------------------------------------------------------------------*/
|
||||
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
// this :
|
||||
#include "HEPVis/nodes/SoBox.h"
|
||||
|
||||
@@ -280,5 +278,3 @@ void SoBox::generateAlternateRep() {
|
||||
void SoBox::clearAlternateRep() {
|
||||
alternateRep.setValue(NULL);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -34,8 +34,6 @@
|
||||
/* */
|
||||
/*--------------------------------------------------------------------------*/
|
||||
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
// this :
|
||||
#include "HEPVis/nodes/SoCons.h"
|
||||
|
||||
@@ -444,5 +442,3 @@ void SoCons::generateAlternateRep() {
|
||||
void SoCons::clearAlternateRep() {
|
||||
alternateRep.setValue(NULL);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
/*----------------------------HEPVis----------------------------------------*/
|
||||
/* */
|
||||
@@ -105,5 +104,3 @@ void SoCounterAction::setType(const SoType aType,SbBool aCheckDerived) {
|
||||
int SoCounterAction::getCount() const {
|
||||
return fCount;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -34,8 +34,6 @@
|
||||
/* */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
// this :
|
||||
#include "HEPVis/nodekits/SoDetectorTreeKit.h"
|
||||
|
||||
@@ -241,5 +239,3 @@ void SoDetectorTreeKit::doAction(
|
||||
SO_ALTERNATEREP_DO_ACTION(aAction)
|
||||
SoBaseKit::doAction(aAction);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
/*----------------------------HEPVis----------------------------------------*/
|
||||
/* */
|
||||
@@ -163,5 +162,3 @@ void SoGL2PSAction::beginTraversal(
|
||||
SoGLRenderAction::beginTraversal(aNode);
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
/*----------------------------HEPVis----------------------------------------*/
|
||||
/* */
|
||||
@@ -346,5 +345,3 @@ int getRGB(
|
||||
aBlue = *pimag;pimag++;
|
||||
return 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
/*----------------------------HEPVis----------------------------------------*/
|
||||
/* */
|
||||
@@ -791,5 +790,3 @@ GLubyte* getBitmap(
|
||||
}
|
||||
return bitmap;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -23,8 +23,6 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
/*----------------------------HEPVis----------------------------------------*/
|
||||
/* */
|
||||
/* Node: SoPolyhedron */
|
||||
@@ -555,5 +553,3 @@ void Geant4_SoPolyhedron::doAction(
|
||||
SO_ALTERNATEREP_DO_ACTION(aAction)
|
||||
SoShape::doAction(aAction);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -23,8 +23,6 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
/*----------------------------HEPVis----------------------------------------*/
|
||||
/* */
|
||||
/* Node: SoStyleCache */
|
||||
@@ -208,5 +206,3 @@ SoResetTransform* SoStyleCache::getResetTransform(
|
||||
{
|
||||
return fResetTransform;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -35,8 +35,6 @@
|
||||
/* */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
// this :
|
||||
#include "HEPVis/nodes/SoTrap.h"
|
||||
|
||||
@@ -411,5 +409,3 @@ void SoTrap::generateAlternateRep() {
|
||||
void SoTrap::clearAlternateRep() {
|
||||
alternateRep.setValue(NULL);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -34,8 +34,6 @@
|
||||
/* */
|
||||
/*--------------------------------------------------------------------------*/
|
||||
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
#include <assert.h>
|
||||
#include <cmath>
|
||||
|
||||
@@ -345,5 +343,3 @@ void SoTrd::generateAlternateRep() {
|
||||
void SoTrd::clearAlternateRep() {
|
||||
alternateRep.setValue(NULL);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -34,8 +34,6 @@
|
||||
/* */
|
||||
/*--------------------------------------------------------------------------*/
|
||||
|
||||
#ifdef G4VIS_BUILD_OI_DRIVER
|
||||
|
||||
// this :
|
||||
#include "HEPVis/nodes/SoTubs.h"
|
||||
|
||||
@@ -471,5 +469,3 @@ void SoTubs::generateAlternateRep() {
|
||||
void SoTubs::clearAlternateRep() {
|
||||
alternateRep.setValue(NULL);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -22,8 +22,6 @@
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifdef G4VIS_BUILD_OIX_DRIVER
|
||||
|
||||
#include <X11/Intrinsic.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <Xm/Xm.h>
|
||||
@@ -143,5 +141,3 @@ void xmAddMouseEventHandler(Widget w)
|
||||
#if defined(__cplusplus) || defined(c_plusplus)
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // G4VIS_BUILD_OIX_DRIVER
|
||||
|
||||
Reference in New Issue
Block a user