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

Import Geant4 10.4.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2017-06-30 10:49:55 +02:00
parent 3a5407696b
commit 1a1316fea4
2180 changed files with 237880 additions and 59109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/OpenInventor/History
+13 -3
View File
@@ -1,4 +1,4 @@
$Id: History 102573 2017-02-09 08:50:23Z gcosmo $
$Id: History 103926 2017-05-03 13:43:27Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -20,13 +20,23 @@ committal in the CVS repository !
History file for visualization/OpenInventor
-------------------------------------------
10 January 2017 Fred Jones (openinventor-V10-02-04)
13 January 2017 Frederick Jones
- G4OpenInventorXtExaminerViewer:
In lookAtSceneElementCB disabled default height setting for
ortho camera prior to moveCamera().
In moveCamera removed unnecessary distance calculation
for ortho camera and fixed incorrect camera position
setting to preserve the focal distance.
Restored focal distance setting to maintain correct
target point (center of rotation) for perspective camera.
10 January 2017 Fred Jones (openinventor-V10-03-00)
- G4OpenInventorXtExtendedViewer:
Added viewer button for Wireframe/Solid switching.
Added workaround to prevent empty second page in
PS and PDF output (due to superimposed scene).
01 June 2016 John Allison (openinventor-V10-02-03)
01 June 2016 Fred Jones (openinventor-V10-02-03)
- G4OpenInventorXtExtendedViewer.hh:
Removed fPDFButton - not used. Fixes Coverity warning.
source/visualization/OpenInventor/sources.cmake
+1 -1
View File
@@ -11,7 +11,7 @@
#
# Generated on : 24/9/2010
#
# $Id: sources.cmake 102573 2017-02-09 08:50:23Z gcosmo $
# $Id: sources.cmake 102233 2017-01-13 15:59:06Z gcosmo $
#
#------------------------------------------------------------------------------
source/visualization/OpenInventor/src/G4OpenInventorViewer.cc
+1 -1
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4OpenInventorViewer.cc 102573 2017-02-09 08:50:23Z gcosmo $
// $Id: G4OpenInventorViewer.cc 102233 2017-01-13 15:59:06Z gcosmo $
#ifdef G4VIS_BUILD_OI_DRIVER
source/visualization/OpenInventor/src/G4OpenInventorXtExaminerViewer.cc
+27 -22
View File
@@ -842,16 +842,14 @@ void G4OpenInventorXtExaminerViewer::afterRealizeHook()
fileOut.open(fileName.c_str(), std::ios::in);
fileOut.seekp(0, std::ios::end); // For appending new data to the end
constructListsDialog(getParentWidget(), this, NULL); // Pop up listsDialog
if (viewPtList.size()) {
// FWJ disabled auto-selection of first viewpoint.
// Initial view should be user-controllable & not forced
// setViewPt();
// setViewPt();
XtSetSensitive(nextViewPtButton, True);
XtSetSensitive(prevViewPtButton, True);
}
}
fileIn.close();
} else {
// Creates a new default bookmark file
@@ -999,12 +997,13 @@ void G4OpenInventorXtExaminerViewer::moveCamera(float dist, bool lookdown)
distance = dist;
}
if (cam->isOfType(SoOrthographicCamera::getClassTypeId())) {
if (!dist)
distance = (prevPt - cam->position.getValue()).length();
else
distance = dist;
}
// FWJ distance not relevant -- use focalDistance
// if (cam->isOfType(SoOrthographicCamera::getClassTypeId())) {
// if (!dist)
// distance = (prevPt - cam->position.getValue()).length();
// else
// distance = dist;
// }
float x,y,z;
@@ -1015,14 +1014,14 @@ void G4OpenInventorXtExaminerViewer::moveCamera(float dist, bool lookdown)
camPosNew = p2 - (camDir*distance);
}
if (cam->isOfType(SoOrthographicCamera::getClassTypeId())) {
camPosNew = p2 - (camDir);
// FWJ maintain focal distance
camPosNew = p2 - (camDir*cam->focalDistance.getValue());
// camPosNew = p2 - (camDir);
}
cam->position = camPosNew;
cam->pointAt(p2, camUpVec);
// FWJ Disabled: zooms out the Persp camera much too far
// and can't recover by zooming in!
// cam->focalDistance = (p2 - camPosNew).length();
cam->focalDistance = (p2 - camPosNew).length();
p2.getValue(x,y,z);
camPosNew.getValue(x,y,z);
@@ -2834,18 +2833,24 @@ void G4OpenInventorXtExaminerViewer::lookAtSceneElementCB(Widget,
SbVec3f p1, pN;
This->currentState = BEAMLINE;
This->prevParticleDir = SbVec3f(0,0,0); //so that moveCamera() knows sets default parameters
p1 = This->prevPt = This->refParticleTrajectory[0];
pN = This->refParticleTrajectory[This->refParticleTrajectory.size() - 1];
This->distance = (pN - p1).length() / 10;
// FWJ Restore the default height instead of hard-wired value
if (cam->isOfType(SoOrthographicCamera::getClassTypeId()))
((SoOrthographicCamera *) cam)->height.setValue(This->defaultHeight);
// ((SoOrthographicCamera *) cam)->height.setValue(10000.0f);
else if (cam->isOfType(SoPerspectiveCamera::getClassTypeId()))
((SoPerspectiveCamera *) cam)->heightAngle.setValue(
This->defaultHeightAngle);
// FWJ Rather than switching to a default height, it is more flexible
// to keep the same height(magnification) while moving the camera.
// if (cam->isOfType(SoOrthographicCamera::getClassTypeId())) {
// ((SoOrthographicCamera *) cam)->height.setValue(This->defaultHeight);
// // FWJ Restore the default height instead of hard-wired value
// // ((SoOrthographicCamera *) cam)->height.setValue(10000.0f);
// }
// else if (cam->isOfType(SoPerspectiveCamera::getClassTypeId()))
// FWJ required to avoid extreme perspective after camera move:
if (cam->isOfType(SoPerspectiveCamera::getClassTypeId()))
((SoPerspectiveCamera*)cam)->heightAngle.setValue(This->defaultHeightAngle);
} else {
if (cam->isOfType(SoPerspectiveCamera::getClassTypeId()))
This->distance = (This->prevPt - cam->position.getValue()).length();
@@ -2864,11 +2869,11 @@ void G4OpenInventorXtExaminerViewer::lookAtSceneElementCB(Widget,
XtFree(value);
}
else{
This->offsetFromCenter.setValue(0, 0, 1);
This->distance = 50;// small number since using viewAll() for default zoom
This->upVector.setValue(0, 1, 0);
This->moveCamera(This->distance);
cam->viewAll(path, This->getViewportRegion());
}