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

Import Geant4 11.1.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2022-07-01 10:44:02 +02:00
parent b3bf75a2a1
commit c07cea1fe0
2172 changed files with 183300 additions and 123938 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/ToolsSG/src/G4ToolsSGQtGLES.cc
+26 -25
View File
@@ -27,16 +27,17 @@
#include "G4ToolsSGQtGLES.hh"
//
#define G4TOOLSSG_QT_VIEWER_IN_TAB
#ifdef G4TOOLSSG_QT_VIEWER_IN_TAB
#include "G4ToolsSGQtViewer.hh"
#else
#include "G4ToolsSGViewer.hh"
#include <tools/Qt/sg_viewer>
#include <toolx/Qt/sg_viewer>
#endif
#include "G4UIbatch.hh"
#include <tools/argcv>
G4ToolsSGQtGLES::G4ToolsSGQtGLES():
@@ -59,7 +60,7 @@ void G4ToolsSGQtGLES::Initialise() {
char** argv = nullptr;
std::vector<std::string> args;args.push_back("");
tools::new_argcv(args,*argc,argv);
fSGSession = new tools::Qt::session(G4cout,*argc,argv);
fSGSession = new toolx::Qt::session(G4cout,*argc,argv);
if(!fSGSession->is_valid()) {
G4cerr << "G4ToolsSGQtGLES::Initialise : session::is_valid() failed." << G4endl;
delete fSGSession;
@@ -80,7 +81,7 @@ G4VViewer* G4ToolsSGQtGLES::CreateViewer(G4VSceneHandler& a_scene,const G4String
#ifdef G4TOOLSSG_QT_VIEWER_IN_TAB
new G4ToolsSGQtViewer(*fSGSession,(G4ToolsSGSceneHandler&)a_scene,a_name);
#else
new G4ToolsSGViewer<tools::Qt::session,tools::Qt::sg_viewer>(*fSGSession,(G4ToolsSGSceneHandler&)a_scene,a_name);
new G4ToolsSGViewer<toolx::Qt::session,toolx::Qt::sg_viewer>(*fSGSession,(G4ToolsSGSceneHandler&)a_scene,a_name);
#endif
if (pView) {
if (pView->GetViewId() < 0) {
@@ -101,27 +102,27 @@ G4VViewer* G4ToolsSGQtGLES::CreateViewer(G4VSceneHandler& a_scene,const G4String
G4bool G4ToolsSGQtGLES::IsUISessionCompatible () const
{
G4bool isCompatible = false;
// G4UImanager* ui = G4UImanager::GetUIpointer();
// G4UIsession* session = ui->GetSession();
//
// // If session is a batch session, it may be:
// // a) this is a batch job (the user has not instantiated any UI session);
// // b) we are currently processing a UI command, in which case the UI
// // manager creates a temporary batch session and to find out if there is
// // a genuine UI session that the user has instantiated we must drill
// // down through previous sessions to a possible non-batch session.
// while (G4UIbatch* batch = dynamic_cast<G4UIbatch*>(session)) {
// session = batch->GetPreviousSession();
// }
//
// // Qt windows are only appropriate in a Qt session.
// if (session) {
// // If non-zero, this is the originating non-batch session
// // The user has instantiated a UI session...
// if (dynamic_cast<G4UIQt*>(session)) {
// // ...and it's a G4UIQt session, which is OK.
G4UImanager* ui = G4UImanager::GetUIpointer();
G4UIsession* session = ui->GetSession();
// If session is a batch session, it may be:
// a) this is a batch job (the user has not instantiated any UI session);
// b) we are currently processing a UI command, in which case the UI
// manager creates a temporary batch session and to find out if there is
// a genuine UI session that the user has instantiated we must drill
// down through previous sessions to a possible non-batch session.
while (G4UIbatch* batch = dynamic_cast<G4UIbatch*>(session)) {
session = batch->GetPreviousSession();
}
// Qt windows are only appropriate in a Qt session.
if (session) {
// If non-zero, this is the originating non-batch session
// The user has instantiated a UI session...
if (dynamic_cast<G4UIQt*>(session)) {
// ...and it's a G4UIQt session, which is OK.
isCompatible = true;
// }
// }
}
}
return isCompatible;
}