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

Import Geant4 10.5.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2018-06-29 10:58:11 +02:00
parent fe81a77428
commit 6aa23be517
1581 changed files with 124288 additions and 83758 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/OpenInventor/src/G4OpenInventorViewer.cc
+8 -1
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4OpenInventorViewer.cc 102233 2017-01-13 15:59:06Z gcosmo $
// $Id: G4OpenInventorViewer.cc 109520 2018-04-26 16:01:14Z gcosmo $
#ifdef G4VIS_BUILD_OI_DRIVER
@@ -164,6 +164,8 @@ G4bool G4OpenInventorViewer::CompareForKernelVisit(G4ViewParameters& vp) {
(vp.IsCullingInvisible () != fVP.IsCullingInvisible ()) ||
(vp.IsDensityCulling () != fVP.IsDensityCulling ()) ||
(vp.IsCullingCovered () != fVP.IsCullingCovered ()) ||
(vp.GetCBDAlgorithmNumber() !=
fVP.GetCBDAlgorithmNumber()) ||
(vp.IsSection () != fVP.IsSection ()) ||
(vp.IsCutaway () != fVP.IsCutaway ()) ||
// This assumes use of generic clipping (sectioning, slicing,
@@ -196,6 +198,11 @@ G4bool G4OpenInventorViewer::CompareForKernelVisit(G4ViewParameters& vp) {
(vp.GetVisibleDensity () != fVP.GetVisibleDensity ()))
return true;
if (vp.GetCBDAlgorithmNumber() > 0) {
if (vp.GetCBDParameters().size() != fVP.GetCBDParameters().size()) return true;
else if (vp.GetCBDParameters() != fVP.GetCBDParameters()) return true;
}
if (vp.IsSection () &&
(vp.GetSectionPlane () != fVP.GetSectionPlane ()))
return true;
source/visualization/OpenInventor/src/G4OpenInventorXt.cc
+12 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4OpenInventorXt.cc 66373 2012-12-18 09:41:34Z gcosmo $
// $Id: G4OpenInventorXt.cc 110811 2018-06-15 07:09:36Z gcosmo $
//
//
// Jeff Kallenbach 01 Aug 1996
@@ -41,6 +41,11 @@
#include "G4OpenInventorSceneHandler.hh"
#include "G4OpenInventorXtViewer.hh"
// Work around for gcc8 Coverity cast warning
inline bool soxt_dispatch_event(void* a_event) {
return SoXt::dispatchEvent((XEvent*)a_event);
}
G4OpenInventorXt::G4OpenInventorXt ()
:G4OpenInventor("OpenInventorXt","OIX",G4VGraphicsSystem::threeD)
,fInited(false)
@@ -53,9 +58,13 @@ void G4OpenInventorXt::Initialize()
SetInteractorManager (G4Xt::getInstance ());
GetInteractorManager () ->
RemoveDispatcher((G4DispatchFunction)XtDispatchEvent);
RemoveDispatcher(G4Xt::xt_dispatch_event);
// Coverity gcc8 cast warning
// RemoveDispatcher((G4DispatchFunction)XtDispatchEvent);
GetInteractorManager () ->
AddDispatcher ((G4DispatchFunction)SoXt::dispatchEvent);
AddDispatcher(soxt_dispatch_event);
// Coverity gcc8 cast warning
// AddDispatcher ((G4DispatchFunction)SoXt::dispatchEvent);
Widget top = (Widget)GetInteractorManager()->GetMainInteractor();
source/visualization/OpenInventor/src/G4OpenInventorXtExtended.cc
+12 -3
View File
@@ -45,11 +45,16 @@
#include "G4OpenInventorXtExtendedViewer.hh"
#include "G4OpenInventorXtExaminerViewerMessenger.hh"
// Work around for gcc8 Coverity cast warning
inline bool soxt_dispatch_event(void* a_event) {
return SoXt::dispatchEvent((XEvent*)a_event);
}
G4OpenInventorXtExtended::G4OpenInventorXtExtended ()
:G4OpenInventor("OpenInventorXtExtended","OIXE",G4VGraphicsSystem::threeD)
,fInited(false)
{
G4OpenInventorXtExaminerViewerMessenger(getInstance());
G4OpenInventorXtExaminerViewerMessenger::GetInstance();
}
void G4OpenInventorXtExtended::Initialize()
@@ -59,9 +64,13 @@ void G4OpenInventorXtExtended::Initialize()
SetInteractorManager (G4Xt::getInstance ());
GetInteractorManager () ->
RemoveDispatcher((G4DispatchFunction)XtDispatchEvent);
RemoveDispatcher(G4Xt::xt_dispatch_event);
// Coverity gcc8 cast warning
// RemoveDispatcher((G4DispatchFunction)XtDispatchEvent);
GetInteractorManager () ->
AddDispatcher ((G4DispatchFunction)SoXt::dispatchEvent);
AddDispatcher(soxt_dispatch_event);
// Coverity gcc8 cast warning
// AddDispatcher ((G4DispatchFunction)SoXt::dispatchEvent);
Widget top = (Widget)GetInteractorManager()->GetMainInteractor();
G4cout << "TOP LEVEL WIDGET FOR SoXt::init() = " << top << G4endl;
source/visualization/OpenInventor/src/SoGL2PSAction.cc
+1 -1
View File
@@ -73,7 +73,7 @@ bool SoGL2PSAction::enableFileWriting(
fFile = ::fopen(fFileName,"w");
if(!fFile) {
SoDebugError::post("SoGL2PSAction::enableFileWriting",
"Cannot open file %s",fFileName);
"Cannot open file %s",fFileName.c_str());
return false;
}
#ifdef __COIN__
source/visualization/OpenInventor/src/wheelmouse.cc
+2 -1
View File
@@ -54,7 +54,8 @@ extern "C" {
/* */
/*******************************************************************/
static void mouseScroll(Widget, XtPointer client_data, XEvent *event)
static void mouseScroll(Widget, XtPointer client_data, XEvent* event, Boolean*)
//static void mouseScroll(Widget, XtPointer client_data, XEvent *event)
{
Widget sb = (Widget)client_data;
int value_return = 0;