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

Import Geant4 11.0.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2021-06-25 16:12:29 +02:00
parent c968e26a39
commit 6399a014b6
4200 changed files with 207479 additions and 237366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/interfaces/basic/include/G4UIExecutive.hh
+1 -1
View File
@@ -71,7 +71,7 @@ public:
void SessionStart();
private:
enum SessionType { kNone, kQt, kXm, kWin32, kWt, kGag, kTcsh, kCsh };
enum SessionType { kNone, kQt, kXm, kWin32, kGag, kTcsh, kCsh };
SessionType selected;
G4UIsession* session;
source/interfaces/basic/include/G4UIQt.hh
+6
View File
@@ -153,6 +153,12 @@ public: // With description
// Second argument is the style (fixed proportional)
// Third argument highlights commands if "highlight" (and if /control/verbose > 0)
void NativeMenu(bool aVal);
// Enable/Disable the native Menu Bar in Qt
void ClearMenu();
// Clear Menu Bar, remove all actions
void DefaultIcons(bool aVal);
// Enable/Disable the default icon ToolBar in Qt
source/interfaces/basic/include/G4UIWin32.hh
+141 -66
View File
@@ -23,13 +23,62 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// G4UIWin32
//
// Class description :
//
// G4UIWin32 is a class to handle a Windows interactive session.
// It is the Windows version of G4UIterminal.
//
// A command box is at disposal for entering/recalling Geant4 commands.
// A menubar could be customized through the AddMenu, AddButton methods.
// Note that there are corresponding Geant4 commands to add a
// menu in the menubar and add buttons in a menu.
// Ex :
// /gui/addMenu test Test
// /gui/addButton test Init /run/initialize
// /gui/addButton test "Set gun" "/control/execute gun.g4m"
// /gui/addButton test "Run one event" "/run/beamOn 1"
//
// Command completion, by typing "tab" key, is available on the
// command line.
// Original author: G.Barrand, 1998
// Revised: O.Pena-Rodriguez, March 2021
// -------------------------------------------------------------------
#ifndef G4UIWin32_h
#define G4UIWin32_h
#define G4UIWin32_h
#if defined(G4UI_BUILD_WIN32_SESSION) || defined(G4UI_USE_WIN32)
#define ID_EXIT_APP 40001
#define ID_OPEN_MACRO 40002
#define ID_SAVE_VIEWER_STATE 40003
#define ID_RUN_BEAMON 40004
#define ID_RUN_CMD 40005
#define ID_VIEW_SOLID 40006
#define ID_VIEW_WIREFRAME 40007
#define ID_PROJ_ORTHOGRAPHIC 40008
#define ID_PROJ_PERSPECTIVE 40009
#define ID_ZOOM_IN 40010
#define ID_ZOOM_OUT 40011
#define ID_ORIENTATION_XY 40012
#define ID_ORIENTATION_XZ 40013
#define ID_ORIENTATION_YZ 40014
#define ID_ORIENTATION_OBLIQUE 40015
#define ID_HELP_ABOUT 40016
#define ID_LOG_CLEAN 40017
#define ID_LOG_SAVE 40018
#define NUM_BUTTONS 12
#define MAX_HISTORY_ITEMS 10
#define IDC_MAIN_EDIT 101
#define IDC_MAIN_TOOL 102
#define IDC_MAIN_TREE_VIEW 104
#define IDC_MAIN_COMBO 105
#define IDC_MAIN_STATUS 106
#include <map>
#include <vector>
@@ -37,77 +86,103 @@
#include "G4VInteractiveSession.hh"
#include "G4Win32.hh"
#include <CommCtrl.h>
class G4VInteractorManager;
// Class description :
//
// G4UIWin32 : class to handle a Windows interactive session.
// G4UIWin32 is the Windows version of G4UIterminal.
//
// A command box is at disposal for entering/recalling Geant4 commands.
// A menubar could be customized through the AddMenu, AddButton methods.
// Note that there are corresponding Geant4 commands to add a
// menus in the menubar and add buttons in a menu.
// Ex :
// /gui/addMenu test Test
// /gui/addButton test Init /run/initialize
// /gui/addButton test "Set gun" "/control/execute gun.g4m"
// /gui/addButton test "Run one event" "/run/beamOn 1"
//
// Command completion, by typing "tab" key, is available on the
// command line.
//
// Class description - end :
class G4UIWin32 : public G4VBasicShell, public G4VInteractiveSession
{
public:
G4UIWin32();
~G4UIWin32() override;
class G4UIWin32 : public G4VBasicShell, public G4VInteractiveSession {
public: // With description
G4UIWin32();
// The WinMain arguments have to be given.
G4UIsession* SessionStart ();
// To enter interactive Win32 loop ; waiting/executing command,...
void AddMenu (const char*,const char*);
// To add a pulldown menu in the menu bar.
// First argument is the name of the menu.
// Second argument is the label of the cascade button.
// Ex : AddMenu("my_menu","My menu")
void AddButton (const char*,const char*,const char*);
// To add a push button in a pulldown menu.
// First argument is the name of the menu.
// Second argument is the label of the button.
// Third argument is the Geant4 command executed when the button is fired.
// Ex : AddButton("my_menu","Run","/run/beamOn 1");
public:
~G4UIWin32 ();
void Prompt (const G4String&);
void SessionTerminate ();
void PauseSessionStart (const G4String&);
G4int ReceiveG4cout(const G4String&);
G4int ReceiveG4cerr(const G4String&);
G4String GetCommand (int);
void TextAppendString(char*);
private:
void SecondaryLoop (const G4String&);
G4bool GetHelpChoice(G4int&);
void ExitHelp() const;
private:
G4VInteractorManager* interactorManager;
HWND mainWindow;
HWND textWindow,editWindow;
HMENU menuBar,defaultMenu;
std::map<int,G4String, std::less<int> > commands;
void* textBuffer;
int textRows,textCols;
static LRESULT CALLBACK MainWindowProc(HWND,UINT,WPARAM,LPARAM);
static LRESULT CALLBACK TextWindowProc(HWND,UINT,WPARAM,LPARAM);
static LRESULT CALLBACK EditWindowProc(HWND,UINT,WPARAM,LPARAM);
G4bool fHelp;
G4int fHelpChoice;
std::vector<G4String> fHistory;
int fHistoryPos;
// To enter interactive Win32 loop ; waiting/executing command,...
G4UIsession* SessionStart() override;
// To add a pulldown menu in the menu bar.
// First argument is the name of the menu.
// Second argument is the label of the cascade button.
// Ex : AddMenu("my_menu","My menu")
void AddMenu(const char*, const char*) override;
// To add a push button in a pulldown menu.
// First argument is the name of the menu.
// Second argument is the label of the button.
// Third argument is the Geant4 command executed when the button is fired.
// Ex : AddButton("my_menu","Run","/run/beamOn 1");
void AddButton(const char*, const char*, const char*) override;
void Prompt(const G4String&);
void SessionTerminate();
void PauseSessionStart(const G4String&) override;
G4int ReceiveG4cout(const G4String&) override;
G4int ReceiveG4cerr(const G4String&) override;
G4String GetCommand(G4int);
//void TextAppendString(char*);
private:
void SecondaryLoop(const G4String&);
G4bool GetHelpChoice(G4int&) override;
void ExitHelp() const override;
G4bool CreateComponents(HWND);
G4bool ResizeComponents(HWND);
void ProcessTabKey();
void ProcessEscKey();
void ProcessEnterKey();
void ProcessUpKey();
void ProcessDownKey();
G4bool ProcessDefaultCommands(G4int);
static G4String GetToolTips(G4int);
G4String GetHelpTreeToolTips(HTREEITEM);
static G4String ConvertNewLines(G4String);
void HelpTreeDoubleClick(HTREEITEM);
G4bool SaveLogFile(LPCTSTR);
void AddText(LPSTR);
void DoOpenMacro(HWND);
void DoSaveViewer(HWND);
void DoSaveLog(HWND);
G4bool InitHelpTreeItems();
HTREEITEM AddItemToHelpTree(LPTSTR, HTREEITEM = TVI_ROOT);
static G4String GetShortCommandPath(G4String);
LPSTR GetItemPath(HTREEITEM);
void CreateHelpTree(HTREEITEM, G4UIcommandTree*);
private:
HWND fHWndMainWindow;
HWND fHWndEditor;
HWND fHWndToolBar;
HWND fHWndComboBox;
HWND fHWndComboEditor;
HWND fHWndHelpTree;
HWND fHWndStatus;
G4VInteractorManager* interactorManager;
HMENU menuBar;
std::map<G4int, G4String, std::less<G4int> > commands;
static LRESULT CALLBACK MainWindowProc(HWND, UINT, WPARAM, LPARAM);
// New wndproc for the combo box
static LRESULT CALLBACK ComboEditorWindowProc(HWND, UINT, WPARAM, LPARAM);
G4bool fHelp;
G4int fHelpChoice;
std::vector<G4String> fHistory;
G4int fHistoryPos;
};
#endif
#endif
source/interfaces/basic/include/G4UIWt.hh
-262
View File
@@ -1,262 +0,0 @@
//
// ********************************************************************
// * License and Disclaimer *
// * *
// * The Geant4 software is copyright of the Copyright Holders of *
// * the Geant4 Collaboration. It is provided under the terms and *
// * conditions of the Geant4 Software License, included in the file *
// * LICENSE and available at http://cern.ch/geant4/license . These *
// * include a list of copyright holders. *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. Please see the license in the file LICENSE and URL above *
// * for the full disclaimer and the limitation of liability. *
// * *
// * This code implementation is the result of the scientific and *
// * technical work of the GEANT4 collaboration. *
// * By using, copying, modifying or distributing the software (or *
// * any work based on the software) you agree to acknowledge its *
// * use in resulting scientific publications, and indicate your *
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
//
//
#ifndef G4UIWt_h
#define G4UIWt_h
#if defined(G4UI_BUILD_WT_SESSION) || defined(G4UI_USE_WT)
#include <map>
#include "G4VBasicShell.hh"
#include "G4VInteractiveSession.hh"
#include <Wt/WObject>
#include <Wt/WWidget>
#include <Wt/WPushButton>
#include <Wt/WTree>
#include <Wt/WTreeNode>
#include <Wt/WMenu>
#include <Wt/WTabWidget>
#include <Wt/WStringListModel>
class G4UIsession;
// Class description :
//
// G4UIWt : class to handle a Wt interactive session.
// G4UIWt is the Wt version of G4UIterminal.
//
// A command box is at disposal for entering/recalling Geant4 commands.
// A menubar could be customized through the AddMenu, AddButton, AddIcon methods.
// Note that there are corresponding Geant4 commands to add a
// menus in the menubar and add buttons in a menu.
// Ex :
// /gui/addMenu test Test
// /gui/addButton test Init /run/initialize
// /gui/addButton test "Set gun" "/control/execute gun.g4m"
// /gui/addButton test "Run one event" "/run/beamOn 1"
//
// Command completion, by typing "tab" key, is available on the
// command line.
//
// Class description - end :
class G4WTabWidget : public Wt::WTabWidget {
public :
G4WTabWidget();
G4WTabWidget(Wt::WContainerWidget*&);
inline void setTabSelected(bool a) { tabSelected = a; };
inline void setLastTabCreated(int a) { lastCreated = a; };
inline bool isTabSelected() { return tabSelected; };
bool tabSelected;
int lastCreated;
int incTabPaint;
};
class G4UIWt : public Wt::WObject, public G4VBasicShell, public G4VInteractiveSession {
public: // With description
G4UIWt(int,char**);
// (argv, argc) or (0, NULL) had to be given.
G4UIsession* SessionStart();
// To enter interactive Wt loop ; waiting/executing command,...
void AddMenu(const char*,const char*);
// To add a pulldown menu in the menu bar.
// First argument is the name of the menu.
// Second argument is the label of the cascade button.
// Ex : AddMenu("my_menu","My menu")
void AddButton(const char*,const char*,const char*);
// To add a push button in a pulldown menu.
// First argument is the name of the menu.
// Second argument is the label of the button.
// Third argument is the Geant4 command executed when the button is fired.
// Ex : AddButton("my_menu","Run","/run/beamOn 1");
void AddIcon(const char* userLabel, const char* iconFile, const char* command, const char* file_name="");
// To add a icon in the toolbar
// First argument is the label of the icon.
// Second argument is the selected icon type (open save move rotate pick zoom_in zoom_out wireframe solid hidden_line_removal hidden_line_and_surface_removal perspective ortho user_icon).
// Third argument is the Geant4 command executed when the button is fired.
// Fourth argument is the path to the icon file if "user_icon" selected
// Ex : AddButton("change background color","../background.xpm"," /vis/viewer/set/background");
bool AddTabWidget( Wt::WWidget*, Wt::WString,int,int);
// To add a tab for vis openGL Qt driver
Wt::WTabWidget* GetSceneTreeComponentsTBWidget();
// Get the viewComponent
bool IsSplitterReleased();
inline bool IsIconMoveSelected() {
return fMoveSelected;
};
inline bool IsIconRotateSelected() {
return fRotateSelected;
};
inline bool IsIconPickSelected() {
return fPickSelected;
};
inline bool IsIconZoomInSelected() {
return fZoomInSelected;
};
inline bool IsIconZoomOutSelected() {
return fZoomOutSelected;
};
/* void SetIconMoveSelected();
void SetIconRotateSelected();
void SetIconPickSelected();
void SetIconZoomInSelected();
void SetIconZoomOutSelected();
void SetIconHLHSRSelected();
void SetIconHLRSelected();
void SetIconSolidSelected();
void SetIconWireframeSelected();
void SetIconPerspectiveSelected();
void SetIconOrthoSelected();
*/
inline Wt::WContainerWidget * GetMainWindow() {
return fMainWindow;
};
public:
~G4UIWt();
void Prompt(G4String);
void SessionTerminate();
virtual void PauseSessionStart(const G4String&);
virtual G4int ReceiveG4cout(const G4String&);
virtual G4int ReceiveG4cerr(const G4String&);
// G4String GetCommand(Widget);
private:
void SecondaryLoop(G4String); // a VIRER
void CreateHelpWidget();
void InitHelpTreeAndVisParametersWidget();
void FillHelpTree();
virtual void ExitHelp() const;
void CreateHelpTree( Wt::WTreeNode*,G4UIcommandTree*);
Wt::WTreeNode* FindTreeItem( Wt::WTreeNode *,const std::string&);
Wt::WString GetCommandList(const G4UIcommand*);
virtual G4bool GetHelpChoice(G4int&);// have to be implemeted because we heritate from G4VBasicShell
bool eventFilter(Wt::WObject*,Wt::WEvent*);
void ActivateCommand(G4String);
// QMap<int,Wt::WString> LookForHelpStringInChildTree(G4UIcommandTree *,const Wt::WString&);
Wt::WContainerWidget* CreateVisParametersTBWidget();
Wt::WWidget* CreateHelpTBWidget();
Wt::WWidget* CreateCoutTBWidget();
Wt::WWidget* CreateHistoryTBWidget();
Wt::WWidget* CreateUITabWidget();
Wt::WWidget* CreateSceneTreeComponentsTBWidget();
Wt::WContainerWidget* CreateRightSplitterWidget();
Wt::WContainerWidget* CreateLeftSplitterWidget();
void OpenHelpTreeOnCommand(const Wt::WString &);
Wt::WString GetShortCommandPath(const std::string & );
Wt::WString GetLongCommandPath( Wt::WTreeNode*);
G4bool IsGUICommand(const G4UIcommand*);
bool CreateVisCommandGroupAndToolBox(G4UIcommand*, Wt::WWidget*, int, bool isDialog);
bool CreateCommandWidget(G4UIcommand* command, Wt::WContainerWidget* parent, bool isDialog);
private:
Wt::WContainerWidget * fMainWindow;
Wt::WLabel *fCommandLabel;
Wt::WLineEdit * fCommandArea;
Wt::WTextArea *fCoutTBTextArea;
Wt::WTextArea *fHelpArea;
Wt::WTabWidget* fUITabWidget;
Wt::WStringListModel fG4cout;
Wt::WLineEdit * fCoutFilter;
Wt::WSelectionBox *fHistoryTBTableList;
Wt::WTree *fHelpTreeWidget;
Wt::WPanel* fHelpTBWidget;
Wt::WPanel* fHistoryTBWidget;
Wt::WPanel* fCoutTBWidget;
Wt::WTabWidget* fSceneTreeComponentsTBWidget;
Wt::WLineEdit* fHelpLine;
G4WTabWidget* fViewerTabWidget;
Wt::WString fCoutText;
Wt::WLabel *fEmptyViewerTabLabel;
Wt::WContainerWidget* fMainSplitterWidget;
Wt::WContainerWidget* fRightSplitterWidget;
Wt::WContainerWidget* fLeftSplitterWidget;
Wt::WContainerWidget* fHelpVSplitter;
Wt::WToolBar *fToolbarApp;
Wt::WToolBar *fToolbarUser;
Wt::WString fStringSeparator;
G4String fLastErrMessage;
Wt::WString fLastOpenPath;
bool fMoveSelected;
bool fRotateSelected;
bool fPickSelected;
bool fZoomInSelected;
bool fZoomOutSelected;
G4bool fExitSession;
G4bool fExitPause;
private :
void ExitSession();
void ClearButtonCallback();
void CommandEnteredCallback();
void CommandEditedCallback(const Wt::WString & text);
void ButtonCallback(const char*);
void HelpTreeClicCallback();
void HelpTreeDoubleClicCallback();
void ShowHelpCallback();
void CommandHistoryCallback();
void LookForHelpStringCallback();
void CurrentChangedTabWidgetCallback(int);
void CoutFilterCallback(const Wt::WString&);
void TabCloseCallback(int);
void ToolBoxActivated(int);
void VisParameterCallback(Wt::WContainerWidget*);
void ChangeColorCallback(Wt::WContainerWidget*);
void ChangeCursorStyle(const Wt::WString&);
void ChangeSurfaceStyle(const Wt::WString&);
void OpenIconCallback(const Wt::WString&);
void SaveIconCallback(const Wt::WString&);
void ChangePerspectiveOrthoCallback(const Wt::WString&);
};
#endif
#endif
source/interfaces/basic/sources.cmake
+22 -39
View File
@@ -1,11 +1,6 @@
#------------------------------------------------------------------------------
# Module : G4UIbasic
# Package: Geant4.src.G4interfaces.G4UIbasic
#------------------------------------------------------------------------------
# - G4UIbasic module build definition
#
# Module has optional sources
#
# List those always built
set(G4INTERFACES_BASIC_MODULE_HEADERS
@@ -24,11 +19,12 @@ set(G4INTERFACES_BASIC_MODULE_SOURCES
set(G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES )
set(G4INTERFACES_BASIC_MODULE_COMPILE_DEFINITIONS )
# Tcsh only on UNIX style systems, but always built here
if(UNIX)
list(APPEND G4INTERFACES_BASIC_MODULE_HEADERS G4UItcsh.hh)
list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES G4UItcsh.cc)
list(APPEND G4INTERFACES_BASIC_MODULE_HEADERS G4UItcsh.hh)
list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES G4UItcsh.cc)
endif()
# Win32 terminal only for MSVC builds, but always built here
@@ -36,7 +32,7 @@ if(MSVC)
list(APPEND G4INTERFACES_BASIC_MODULE_HEADERS G4UIWin32.hh)
list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES G4UIWin32.cc)
add_definitions(-DG4UI_BUILD_WIN32_SESSION -DG4INTY_BUILD_WIN32)
list(APPEND G4INTERFACES_BASIC_MODULE_COMPILE_DEFINITIONS G4UI_BUILD_WIN32_SESSION G4INTY_BUILD_WIN32)
endif()
# Qt only if selected.
@@ -46,35 +42,19 @@ if(GEANT4_USE_QT)
# Add the definitions
# We have to also add in G4INTY_BUILD_QT 'cause G4QT header needs that...
add_definitions(-DG4UI_BUILD_QT_SESSION -DG4INTY_BUILD_QT)
list(APPEND G4INTERFACES_BASIC_MODULE_COMPILE_DEFINITIONS G4UI_BUILD_QT_SESSION G4INTY_BUILD_QT)
# Add the extra libraries
list(APPEND G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::Core)
endif()
#
# Wt (deprecated, left in case it is revived)
#
#if(GEANT4_USE_WT)
# list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES G4UIWt.cc)
# list(APPEND G4INTERFACES_BASIC_MODULE_HEADERS G4UIWt.hh)
#
# # We have to also add in G4INTY_BUILD_Wt 'cause G4Wt header needs that...
# GEANT4_ADD_COMPILE_DEFINITIONS(SOURCES G4UIWt.cc G4UIExecutive.cc
# COMPILE_DEFINITIONS G4UI_BUILD_WT_SESSION;G4INTY_BUILD_WT)
#
# # Add the extra libraries
# list(APPEND G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES Wt::Wt Wt::HTTP)
#endif()
# Xm and only on UNIX and if selected
if(UNIX AND GEANT4_USE_XM)
list(APPEND G4INTERFACES_BASIC_MODULE_HEADERS G4UIXm.hh)
list(APPEND G4INTERFACES_BASIC_MODULE_SOURCES G4UIXm.cc)
# Add the compile definitions - also need INTY versions
add_definitions(-DG4UI_BUILD_XM_SESSION -DG4INTY_BUILD_XT)
list(APPEND G4INTERFACES_BASIC_MODULE_COMPILE_DEFINITIONS G4UI_BUILD_XM_SESSION G4INTY_BUILD_XT)
# Need the X11 and Motif libraries
list(APPEND G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES
@@ -83,24 +63,27 @@ if(UNIX AND GEANT4_USE_XM)
)
endif()
#
# Define the Geant4 Module.
#
geant4_define_module(NAME G4UIbasic
HEADERS
geant4_add_module(G4UIbasic
PUBLIC_HEADERS
${G4INTERFACES_BASIC_MODULE_HEADERS}
SOURCES
${G4INTERFACES_BASIC_MODULE_SOURCES}
GRANULAR_DEPENDENCIES
${G4INTERFACES_BASIC_MODULE_SOURCES})
geant4_module_compile_definitions(G4UIbasic PRIVATE ${G4INTERFACES_BASIC_MODULE_COMPILE_DEFINITIONS})
geant4_module_link_libraries(G4UIbasic
PUBLIC
G4UIcommon
G4intercoms
G4globman
G4intercoms
GLOBAL_DEPENDENCIES
G4global
G4intercoms
LINK_LIBRARIES
${G4INTERFACES_BASIC_MODULE_LINK_LIBRARIES}
${timemory_LIBRARIES}
)
PRIVATE
G4UIGAG)
# List any source specific properties here
if(MSVC)
# Ensure that the CommCtrl library is loaded in Windows
geant4_module_link_libraries(G4UIbasic PUBLIC COMCTL32)
endif()
source/interfaces/basic/src/G4UIExecutive.cc
+2 -15
View File
@@ -32,11 +32,6 @@
#include "G4Qt.hh"
#endif
#if defined(G4UI_BUILD_WT_SESSION)
#include "G4UIWt.hh"
#include "G4Wt.hh"
#endif
#if defined(G4UI_BUILD_XM_SESSION)
#include "G4UIXm.hh"
#endif
@@ -144,12 +139,6 @@ G4UIExecutive::G4UIExecutive(G4int argc, char** argv, const G4String& type)
DISCARD_PARAMETER(argv);
session = new G4UIWin32();
isGUI = true;
#endif
break;
case kWt:
#if defined(G4UI_BUILD_WT_SESSION)
session = new G4UIWt(argc, argv);
isGUI = true;
#endif
break;
case kGag:
@@ -197,7 +186,7 @@ G4UIExecutive::G4UIExecutive(G4int argc, char** argv, const G4String& type)
// --------------------------------------------------------------------------
G4UIExecutive::~G4UIExecutive()
{
if ( selected != kWt ) delete session;
delete session;
}
// --------------------------------------------------------------------------
@@ -206,7 +195,6 @@ void G4UIExecutive::SelectSessionByArg(const G4String& stype)
if ( qt_build && stype == "qt" ) selected = kQt;
else if ( xm_build && stype == "xm" ) selected = kXm;
else if ( win32_build && stype == "win32" ) selected = kWin32;
else if ( wt_build && stype == "wt" ) selected = kWt;
else if ( stype == "gag" ) selected = kGag;
else if ( tcsh_build && stype == "tcsh" ) selected = kTcsh;
else if ( stype == "csh" ) selected = kCsh;
@@ -218,7 +206,6 @@ void G4UIExecutive::SelectSessionByEnv()
if ( qt_build && std::getenv("G4UI_USE_QT") ) selected = kQt;
else if ( xm_build && std::getenv("G4UI_USE_XM") ) selected = kXm;
else if ( win32_build && std::getenv("G4UI_USE_WIN32") ) selected = kWin32;
else if ( wt_build && std::getenv("G4UI_USE_WT") ) selected = kWt;
else if ( std::getenv("G4UI_USE_GAG") ) selected = kGag;
else if ( tcsh_build && std::getenv("G4UI_USE_TCSH") ) selected = kTcsh;
}
@@ -276,7 +263,6 @@ void G4UIExecutive::SelectSessionByFile(const G4String& appname)
if ( qt_build && stype == "qt" ) selected = kQt;
else if ( xm_build && stype == "xm" ) selected = kXm;
else if ( win32_build && stype == "win32" ) selected = kWin32;
//else if ( wt_build && stype == "wt" ) selected = kWt;
else if ( stype == "gag" ) selected = kGag;
else if ( tcsh_build && stype == "tcsh" ) selected = kTcsh;
else if ( stype == "csh" ) selected = kCsh;
@@ -286,6 +272,7 @@ void G4UIExecutive::SelectSessionByFile(const G4String& appname)
void G4UIExecutive::SelectSessionByBestGuess()
{
if ( qt_build ) selected = kQt;
else if ( win32_build ) selected = kWin32;
else if ( tcsh_build ) selected = kTcsh;
else if ( xm_build ) selected = kXm;
}
source/interfaces/basic/src/G4UIQt.cc
+19
View File
@@ -2588,6 +2588,19 @@ void G4UIQt::OutputStyle (const char* destination,const char* style,const char*
}
}
void G4UIQt::NativeMenu(bool aVal)
{
if ( fMainWindow->menuBar()->isNativeMenuBar() == aVal )
return; // already in this state
// Menu become empty when goin from Qt to Native Bar
fMainWindow->menuBar()->setNativeMenuBar(aVal);
}
void G4UIQt::ClearMenu()
{
fMainWindow->menuBar()->clear();
}
void G4UIQt::ActivateCommand(
G4String newCommand
@@ -4637,6 +4650,8 @@ void G4UIQt::CreatePickInfosDialog() {
void G4UIQt::CreateEmptyViewerPropertiesWidget() {
if(!fViewerPropertiesWidget) return;
if(!fViewerPropertiesWidget->layout()) return;
QLayoutItem * wItem;
if (fViewerPropertiesWidget->layout()->count()) {
while ((wItem = fViewerPropertiesWidget->layout()->takeAt(0)) != 0) {
@@ -4648,6 +4663,9 @@ void G4UIQt::CreateEmptyViewerPropertiesWidget() {
QLabel* label = new QLabel("No viewer - Please open a viewer first");
fViewerPropertiesWidget->layout()->addWidget(label);
fViewerPropertiesDialog->setWindowTitle("No viewer");
fViewerPropertiesDialog->show();
fViewerPropertiesDialog->raise();
fViewerPropertiesDialog->activateWindow();
}
@@ -5054,6 +5072,7 @@ void G4UIQt::TabCloseCallback(int a){
}
if (lastTab) {
CreateViewerPropertiesDialog();
CreateEmptyViewerPropertiesWidget();
}
// delete the widget
source/interfaces/basic/src/G4UIWin32.cc
+1244 -645
View File
File diff suppressed because it is too large Load Diff
source/interfaces/basic/src/G4UIWt.cc
-3618
View File
File diff suppressed because it is too large Load Diff