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

Import Geant4 11.2.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2023-06-30 09:09:57 +02:00
parent aef78ca386
commit dd1f179cda
3780 changed files with 212808 additions and 142780 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/OpenInventor/GNUmakefile
-91
View File
@@ -1,91 +0,0 @@
name := G4OpenInventor
ifndef G4INSTALL
G4INSTALL = ../../..
endif
GLOBLIBS = libG4vis_management.lib libG4modeling.lib libG4tools.lib
ifdef G4LIB_BUILD_ZLIB
GLOBLIBS += libG4zlib.lib
endif
GLOBLIBS += libG4interfaces.lib libG4run.lib libG4event.lib
GLOBLIBS += libG4tracking.lib libG4processes.lib libG4digits_hits.lib
GLOBLIBS += libG4track.lib libG4particles.lib libG4geometry.lib
GLOBLIBS += libG4materials.lib libG4graphics_reps.lib
GLOBLIBS += libG4intercoms.lib libG4global.lib
include $(G4INSTALL)/config/architecture.gmk
include $(G4INSTALL)/config/G4VIS_BUILD.gmk
include $(G4INSTALL)/config/G4UI_BUILD.gmk
include $(G4INSTALL)/config/interactivity.gmk
CPPFLAGS += -I$(G4BASE)/visualization/management/include
CPPFLAGS += -I$(G4BASE)/visualization/modeling/include
CPPFLAGS += -I$(G4BASE)/externals/g4tools/include
CPPFLAGS += -I$(G4BASE)/global/management/include
CPPFLAGS += -I$(G4BASE)/global/HEPGeometry/include
CPPFLAGS += -I$(G4BASE)/geometry/solids/CSG/include
CPPFLAGS += -I$(G4BASE)/geometry/solids/specific/include
CPPFLAGS += -I$(G4BASE)/graphics_reps/include
CPPFLAGS += -I$(G4BASE)/geometry/management/include
CPPFLAGS += -I$(G4BASE)/interfaces/basic/include
CPPFLAGS += -I$(G4BASE)/interfaces/common/include
CPPFLAGS += -I$(G4BASE)/intercoms/include
CPPFLAGS += -I$(G4BASE)/materials/include
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:
@echo $(CPPFLAGS)
source/visualization/OpenInventor/History
+32
View File
@@ -6,6 +6,38 @@ It must **not** be used as a substitute for writing good git commit messages!
-------------------------------------------------------------------------------
## 2023-04-27 Ben Morgan (openinventor-V11-01-05)
- Support compilation against Qt5 and Qt6.
## 2023-04-14 John Allison (openinventor-V11-01-04)
- Co-working: visman-V11-01-04, greps-V11-01-03, interfaces-V11-01-11,
opengl-V11-01-06, vis_toolssg-V11-01-05.
- New Scene Tree Phase 2 - first implementation of a no-frills GUI-side
- See visualization/management/History for full description.
- Revert earlier changes for the new scene tree.
- After the introduction of virtual G4VInteractiveSession::UpdateSceneTree
they are no loner necessary.
## 2023-04-02 Ben Morgan (openinventor-V11-01-03)
- No longer link to QtPrintSupport, which is not used in the toolkit.
## 2023-03-28 John Allison (openinventor-V11-01-02)
- Add code for scene tree.
- G4OpenInventorViewer:
- Call UpdateGUISceneTree in DrawView.
- G4OpenInventorQtExaminerViewer:
- Add GetUIQt.
- G4OpenInventorQtViewer:
- Implement virtual void UpdateGUISceneTree() {
- if (fUIQt) fUIQt->UpdateSceneTree(fSceneTree);
## 2023-03-22 Ben Morgan (openinventor-V11-01-01)
- Export public compile definitions to indicate availablity of specific drivers. Moves to
"use on link" model.
## 2023-01-30 Ben Morgan (openinventor-V11-01-00)
- Link to new G4UIcore/UIimplementation modules in place of former G4UIbasic/UIcommon
## 2022-11-25 Gabriele Cosmo (openinventor-V11-00-18)
- Fixed compilation warnings for implicit type conversions on macOS/XCode 14.1.
source/visualization/OpenInventor/include/G4OpenInventorQtExaminerViewer.hh
+2
View File
@@ -194,6 +194,8 @@ public:
~G4OpenInventorQtExaminerViewer();
G4UIQt* GetUIQt() {return uiQt;}
template <class T> void parseString(T &t, const std::string &s, bool &error);
// In case the viewer is embedded and then detached:
source/visualization/OpenInventor/include/ui_OIQtListsDialog.h
+13 -13
View File
@@ -9,19 +9,19 @@
#ifndef OIQTLISTSDIALOGWS1786_H
#define OIQTLISTSDIALOGWS1786_H
#include <QtCore/QVariant>
#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QDialog>
#include <QtWidgets/QFormLayout>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QListWidget>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QWidget>
#include <QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QDialog>
#include <QFormLayout>
#include <QHBoxLayout>
#include <QHeaderView>
#include <QLabel>
#include <QLineEdit>
#include <QListWidget>
#include <QPushButton>
#include <QWidget>
QT_BEGIN_NAMESPACE
source/visualization/OpenInventor/sources.cmake
+14 -4
View File
@@ -33,9 +33,12 @@ geant4_add_module(G4OpenInventor
SoTrd.cc
SoTubs.cc )
# Needed by G4VisExecutive...
geant4_module_compile_definitions(G4OpenInventor PUBLIC G4VIS_USE_OI)
geant4_module_link_libraries(G4OpenInventor
PUBLIC
G4UIcommon
G4UIcore
G4globman
G4graphics_reps
G4hepgeometry
@@ -44,7 +47,7 @@ geant4_module_link_libraries(G4OpenInventor
G4vis_management
Coin::Coin
PRIVATE
G4UIbasic
G4UIimplementation
G4csg
G4geometrymng
G4tools
@@ -79,7 +82,10 @@ if(GEANT4_USE_INVENTOR_XT)
G4OpenInventorXtViewer.cc
wheelmouse.cc )
geant4_module_compile_definitions(G4OpenInventor PRIVATE G4VIS_BUILD_OIX_DRIVER)
geant4_module_compile_definitions(G4OpenInventor
PUBLIC G4VIS_USE_OIX
PRIVATE G4VIS_BUILD_OIX_DRIVER)
geant4_module_link_libraries(G4OpenInventor PUBLIC SoXt::SoXt Motif::Xm)
if(APPLE)
geant4_module_link_libraries(G4OpenInventor PUBLIC XQuartzGL::GL)
@@ -103,7 +109,9 @@ if(GEANT4_USE_INVENTOR_QT)
G4OpenInventorQtViewer.cc
G4SoQt.cc )
geant4_module_link_libraries(G4OpenInventor PUBLIC SoQt::SoQt OpenGL::GL Qt${QT_VERSION_MAJOR}::OpenGL Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::PrintSupport Qt${QT_VERSION_MAJOR}::Widgets)
geant4_module_compile_definitions(G4OpenInventor PUBLIC G4VIS_USE_OIQT)
geant4_module_link_libraries(G4OpenInventor PUBLIC SoQt::SoQt OpenGL::GL Qt${QT_VERSION_MAJOR}::OpenGL Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Widgets)
endif()
# - WIN32 Only (Win32) sources
@@ -117,5 +125,7 @@ if(GEANT4_USE_INVENTOR_WIN)
G4OpenInventorWin.cc
G4OpenInventorWinViewer.cc)
geant4_module_compile_definitions(G4OpenInventor PUBLIC G4VIS_USE_OIWIN32)
geant4_module_link_libraries(G4OpenInventor PUBLIC SoWin::SoWin OpenGL::GL)
endif()