- Timestamp:
- Nov 15, 2007, 11:56:03 AM (17 years ago)
- Location:
- trunk/geant4
- Files:
-
- 1 deleted
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/config/History
r593 r606 1 $Id: History,v 1.30 0 2007/08/16 09:34:51gcosmo Exp $1 $Id: History,v 1.303 2007/11/02 15:58:08 gcosmo Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 17 17 ---------------------------------------------------------- 18 18 19 2nd November 2007 Gabriele Cosmo (config-V09-00-06) 20 - Introduced G4LIB_BUILD_GDML/G4LIB_USE_GDML flags to trigger compilation 21 of the new persistency/gdml sub-module. Added setup for XERCESC. 22 Required path XERCESCROOT to XERCESC installation if G4LIB_BUILD_GDML 23 is set. Added "persistency/gdml" include path to binmake.gmk 24 - Added setup for QT in UI scripts, and specific QT paths and setup in 25 Darwin-g++.gmk. (L.Garnier) 26 27 10th October 2007 Gunter Folger (config-V09-00-05) 28 - Added "incl" (Liege cascade) hadronic model module to binmake.gmk. 29 19 30 16th August 2007 Gabriele Cosmo (config-V09-00-04) 20 31 - Corrected definition of OUT internal variable to allow for proper -
trunk/geant4/config/architecture.gmk
r593 r606 1 # $Id: architecture.gmk,v 1.11 0 2007/06/28 14:16:55gcosmo Exp $1 # $Id: architecture.gmk,v 1.112 2007/11/02 16:29:06 gcosmo Exp $ 2 2 # ------------------------------------------------------------------------ 3 3 # GEANT 4 - Architecture configuration script for GNU Make … … 241 241 # If the user does not set his/her own values, system-dependent values 242 242 # are set below. Most system-dependent code assumes OGLHOME is set. 243 # 243 244 244 # ------------- OpenInventor ----------------- 245 245 # The path to the installation of OpenInventor must be specified … … 255 255 ifndef OIVLIBS 256 256 OIVLIBS := -L$(OIVHOME)/lib -lInventorXt -lInventor 257 endif 258 259 # ----------------- GDML --------------------- 260 # Setup path to XERCESC library if GDML plugin build is specified 261 # 262 ifneq ($(G4LIB_BUILD_GDML),) 263 G4LIB_USE_GDML = 1 264 ifndef XERCESCROOT 265 XERCESCROOT := /usr/local/xercesc 266 endif 267 ifndef GDMLFLAGS 268 GDMLFLAGS := -DG4LIB_USE_GDML -I$(XERCESCROOT)/include 269 endif 270 ifndef GDMLLIBS 271 GDMLLIBS := -L$(XERCESCROOT)/lib -lxerces-depdom -lxerces-c 272 endif 273 CPPFLAGS += $(GDMLFLAGS) 257 274 endif 258 275 -
trunk/geant4/config/binmake.gmk
r593 r606 1 # $Id: binmake.gmk,v 1.1 29 2007/08/16 09:46:02 gcosmo Exp $1 # $Id: binmake.gmk,v 1.133 2007/11/02 15:57:52 gcosmo Exp $ 2 2 # ---------------------------------------------------------- 3 3 # Script defining rules and paths for making binaries. … … 52 52 -I$(G4BASE)/run/include \ 53 53 -I$(G4BASE)/materials/include \ 54 -I$(G4BASE)/parameterisations/trd_clusters/include \55 54 -I$(G4BASE)/parameterisations/gflash/include \ 56 55 -I$(G4BASE)/particles/management/include \ … … 102 101 -I$(G4BASE)/processes/hadronic/models/high_energy/include \ 103 102 -I$(G4BASE)/processes/hadronic/models/im_r_matrix/include \ 103 -I$(G4BASE)/processes/hadronic/models/incl/include \ 104 104 -I$(G4BASE)/processes/hadronic/models/inucl/include \ 105 105 -I$(G4BASE)/processes/hadronic/models/isotope_production/include \ … … 143 143 -I$(G4BASE)/digits_hits/scorer/include \ 144 144 -I$(G4BASE)/digits_hits/utils/include \ 145 -I$(G4BASE)/persistency/include \ 145 -I$(G4BASE)/persistency/gdml/include \ 146 -I$(G4BASE)/persistency/mctruth/include \ 146 147 -I$(G4BASE)/readout/include \ 147 148 -I$(G4BASE)/event/include \ … … 260 261 # LDLIBS3 contains the first set of low level libraries... 261 262 # 263 ifdef G4LIB_BUILD_GDML 264 LDLIBS3 += $(GDMLLIBS) 265 endif 262 266 LDLIBS3 += $(INTYLIBS) 263 267 LDLIBS3 += $(ANALYSISLIBS) -
trunk/geant4/config/scripts/env.csh.SH
r593 r606 40 40 unsetenv G4NEUTRONHPDATA 41 41 unsetenv G4RADIOACTIVEDATA 42 unsetenv G4ABLADATA 42 43 43 44 unsetenv G4LIB … … 46 47 unsetenv G4LIB_BUILD_STATIC 47 48 unsetenv G4LIB_BUILD_ZLIB 49 unsetenv G4LIB_BUILD_GDML 48 50 unsetenv G4LIB_USE_G3TOG4 49 51 unsetenv G4LIB_USE_GRANULAR … … 146 148 147 149 #+ 150 if ( X$g4abladata != X ) then 151 setenv G4ABLADATA "$g4abladata" 152 echo "On this machine the G4ABLADATA=\$G4ABLADATA" 153 endif 154 155 156 #+ 148 157 #if ( X$g4elasticdata != X ) then 149 158 #setenv G4ELASTICDATA "$g4elasticdata" … … 380 389 echo "On this machine the XAWLIBS=\$XAWLIBS" 381 390 endif 391 392 393 394 # 395 # Use GDML module 396 # 397 #+ 398 if ( X$g4lib_build_gdml == Xy ) then 399 setenv G4LIB_BUILD_GDML 1 400 echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML" 401 endif 402 403 if ( X$g4lib_build_gdml == Xy ) then 404 setenv XERCESCROOT "$g4gdml_xercesc_root" 405 echo "On this machine the XERCESCROOT=\$XERCESCROOT" 406 endif 407 408 409 382 410 383 411 # … … 489 517 setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM} 490 518 setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib 519 520 if ( ${?G4LIB_BUILD_GDML} ) then 521 setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${XERCESCROOT}/lib 522 endif 523 491 524 else 492 525 setenv LD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM} 493 526 setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib 527 528 if ( ${?G4LIB_BUILD_GDML} ) then 529 setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${XERCESCROOT}/lib 530 endif 531 494 532 endif 495 533 endif … … 504 542 setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM} 505 543 setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib 544 545 if ( ${?G4LIB_BUILD_GDML} ) then 546 setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib 547 endif 548 506 549 else 507 550 setenv DYLD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM} 508 551 setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib 552 553 if ( ${?G4LIB_BUILD_GDML} ) then 554 setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib 555 endif 556 509 557 endif 510 558 endif -
trunk/geant4/config/scripts/env.sh.SH
r593 r606 40 40 unset G4NEUTRONHPDATA 41 41 unset G4RADIOACTIVEDATA 42 unset G4ABLADATA 42 43 43 44 unset G4LIB … … 46 47 unset G4LIB_BUILD_STATIC 47 48 unset G4LIB_BUILD_ZLIB 49 unset G4LIB_BUILD_GDML 48 50 unset G4LIB_USE_G3TOG4 49 51 unset G4LIB_USE_GRANULAR … … 172 174 173 175 #+ 176 if [ X$g4abladata != X ] ; then 177 G4ABLADATA="$g4abladata" 178 export G4ABLADATA 179 if [ X\$g4non_display = X ] ; then 180 echo "On this machine the G4ABLADATA=\$G4ABLADATA" 181 fi 182 fi 183 184 185 186 187 #+ 174 188 #if [ X$g4elasticdata != X ] ; then 175 189 #G4ELASTICDATA="$g4elasticdata" … … 517 531 fi 518 532 fi 533 534 535 # 536 # Use GDML module 537 # 538 #+ 539 if [ X$g4lib_build_gdml = Xy ] ; then 540 G4LIB_BUILD_GDML=1 541 export G4LIB_BUILD_GDML 542 echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML" 543 fi 544 545 if [ X$g4lib_build_gdml = Xy ] ; then 546 XERCESCROOT=$g4gdml_xercesc_root 547 export XERCESCROOT 548 echo "On this machine the XERCESCROOT=\$XERCESCROOT" 549 fi 550 551 519 552 520 553 # … … 670 703 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM} 671 704 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib 705 706 if [ $G4LIB_BUILD_GDML ] ; then 707 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${XERCESCROOT}/lib 708 fi 672 709 export LD_LIBRARY_PATH 710 673 711 else 674 712 LD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM} 675 713 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib 714 715 if [ $G4LIB_BUILD_GDML ] ; then 716 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${XERCESCROOT}/lib 717 fi 718 676 719 export LD_LIBRARY_PATH 677 720 fi … … 687 730 DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM} 688 731 DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib 732 733 if [ $G4LIB_BUILD_GDML ] ; then 734 DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib 735 fi 736 689 737 export DYLD_LIBRARY_PATH 690 738 else 691 739 DYLD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM} 692 740 DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib 741 742 if [ $G4LIB_BUILD_GDML ] ; then 743 DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib 744 fi 745 693 746 export DYLD_LIBRARY_PATH 694 747 fi -
trunk/geant4/config/scripts/install.sh.SH
r593 r606 40 40 unset G4NEUTRONHPDATA 41 41 unset G4RADIOACTIVEDATA 42 unset G4ABLADATA 42 43 43 44 unset G4LIB … … 46 47 unset G4LIB_BUILD_STATIC 47 48 unset G4LIB_BUILD_ZLIB 49 unset G4LIB_BUILD_GDML 48 50 unset G4LIB_USE_G3TOG4 49 51 unset G4LIB_USE_GRANULAR … … 151 153 152 154 #+ 155 if [ X$g4abladata != X ] ; then 156 G4ABLADATA="$g4abladata" 157 export G4ABLADATA 158 echo "On this machine the G4ABLADATA=\$G4ABLADATA" 159 fi 160 161 162 163 164 #+ 153 165 #if [ X$g4elasticdata != X ] ; then 154 166 #G4ELASTICDATA="$g4elasticdata" … … 442 454 fi 443 455 fi 456 457 458 # 459 # Use GDML module 460 # 461 #+ 462 if [ X$g4lib_build_gdml = Xy ] ; then 463 G4LIB_BUILD_GDML=1 464 export G4LIB_BUILD_GDML 465 echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML" 466 fi 467 468 if [ X$g4lib_build_gdml = Xy ] ; then 469 XERCESCROOT=$g4gdml_xercesc_root 470 export XERCESCROOT 471 echo "On this machine the XERCESCROOT=\$XERCESCROOT" 472 fi 473 444 474 445 475 # -
trunk/geant4/config/scripts/move.sh.SH
r593 r606 96 96 97 97 #+ 98 if [ X$g4abladata != X ] ; then 99 G4ABLADATA="$g4abladata" 100 export G4ABLADATA 101 echo "On this machine the G4ABLADATA=\$G4ABLADATA" 102 fi 103 104 105 106 #+ 98 107 #if [ X$g4elasticdata != X ] ; then 99 108 #G4ELASTICDATA="$g4elasticdata" … … 305 314 fi 306 315 316 317 # 318 # Use GDML module 319 # 320 #+ 321 if [ X$g4lib_build_gdml = Xy ] ; then 322 G4LIB_BUILD_GDML=1 323 export G4LIB_BUILD_GDML 324 echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML" 325 fi 326 327 if [ X$g4lib_build_gdml = Xy ] ; then 328 XERCESCROOT=$g4gdml_xercesc_root 329 export XERCESCROOT 330 echo "On this machine the XERCESCROOT=\$XERCESCROOT" 331 fi 332 333 334 307 335 # 308 336 # Use G3TOG4 module -
trunk/geant4/config/sys/Darwin-g++.gmk
r593 r606 51 51 endif 52 52 ifndef QTFLAGS 53 QTFLAGS := -I$(QTHOME)/include 54 QTFLAGS += -I$(QTHOME)/lib/QtCore.framework/Versions/Current/Headers 55 QTFLAFS += -I$(QTHOME)/lib/QtGui.framework/Versions/Current/Headers 56 QTFLAGS += -I$(QTHOME)/lib/QtOpenGL.framework/Versions/Current/Headers 57 QTFLAGS += -I$(QTHOME)/lib/QtSql.framework/Versions/Current/Headers 58 QTFLAGS += -I$(QTHOME)/lib/QtXml.framework/Versions/Current/Headers 53 QTFLAGS := -I$(QTHOME)/include/Qt -I$(QTHOME)/include 59 54 MOC := $(QTHOME)/bin/moc 60 55 endif 61 56 ifndef QTLIBS 62 QTLIBS := -F$(QTHOME)/lib -framework QtCore -framework QtGui 63 QTLIBS += -framework QtOpenGL -framework QtSql -framework QtXml 57 QT3LIBS := -L$(QTHOME)/lib -lqt-mt -lqui 58 QT4LIBS := -F$(QTHOME)/lib -framework QtCore -framework QtGui 59 QT4LIBS += -framework QtOpenGL -framework QtSql -framework QtXml 60 QTLIBS := $(shell test -f $(QTHOME)/lib/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS)) 64 61 endif 65 62 ifndef XAWFLAGS -
trunk/geant4/config/sys/Linux-g++.gmk
r472 r606 55 55 XMLIBS := -lXm -lXpm 56 56 endif 57 ifndef QTHOME 58 QTHOME := /usr/local/Qt 59 endif 60 ifndef QTFLAGS 61 QTFLAGS := -I$(QTHOME)/include/Qt 62 QTFLAGS += -I$(QTHOME)/include 63 MOC := $(QTHOME)/bin/moc 64 endif 65 ifndef QTLIBS 66 QT3LIBS := -L$(QTHOME)/lib -lqt-mt 67 QT4LIBS := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtOpenGL -lQtSql -lQtXml 68 QTLIBS := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo $(QT4LIBS) || echo $(QT3LIBS)) 69 endif 57 70 ifndef XAWFLAGS 58 71 XAWFLAGS := -I/usr/X11R6/include -
trunk/geant4/interfaces/.gdb_history
r562 r606 1 1 run 2 2 where 3 exit4 3 quit -
trunk/geant4/interfaces/basic/include/G4UIQt.hh
r603 r606 25 25 // 26 26 // 27 // $Id: G4UIQt.hh,v 1. 3 2007/11/09 15:03:21 lgarnier Exp $27 // $Id: G4UIQt.hh,v 1.4 2007/11/13 17:48:51 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 148 148 void ButtonCallback(const QString&); 149 149 void HelpTreeClicCallback(); 150 #if QT_VERSION < 0x040000 151 void HelpTreeDoubleClicCallback( QListViewItem*, int); 152 #else 150 153 void HelpTreeDoubleClicCallback( QTreeWidgetItem*, int); 154 #endif 151 155 void ShowHelpCallback(); 152 156 void CommandHistoryCallback(); -
trunk/geant4/interfaces/basic/src/G4UIQt_moc.cc
r593 r606 1 /**************************************************************************** 2 ** G4UIQt meta object code from reading C++ file 'G4UIQt.hh' 3 ** 4 ** Created: Tue Nov 13 18:13:09 2007 5 ** by: The Qt MOC ($Id: G4UIQt_moc.cc,v 1.6 2007/11/14 10:38:49 lgarnier Exp $) 6 ** 7 ** WARNING! All changes made in this file will be lost! 8 *****************************************************************************/ 9 10 #ifdef G4UI_BUILD_QT_SESSION 11 12 #undef QT_NO_COMPAT 13 #include "../include/G4UIQt.hh" 14 #include <qmetaobject.h> 15 #include <qapplication.h> 16 17 #if QT_VERSION < 0x040000 18 19 #include <private/qucomextra_p.h> 20 #if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != 26) 21 #error "This file was generated using the moc from 3.3.5. It" 22 #error "cannot be used with the include files from this version of Qt." 23 #error "(The moc has changed too much.)" 24 #endif 25 26 const char *G4UIQt::className() const 27 { 28 return "G4UIQt"; 29 } 30 31 QMetaObject *G4UIQt::metaObj = 0; 32 static QMetaObjectCleanUp cleanUp_G4UIQt( "G4UIQt", &G4UIQt::staticMetaObject ); 33 34 #ifndef QT_NO_TRANSLATION 35 QString G4UIQt::tr( const char *s, const char *c ) 36 { 37 if ( qApp ) 38 return qApp->translate( "G4UIQt", s, c, QApplication::DefaultCodec ); 39 else 40 return QString::fromLatin1( s ); 41 } 42 #ifndef QT_NO_TRANSLATION_UTF8 43 QString G4UIQt::trUtf8( const char *s, const char *c ) 44 { 45 if ( qApp ) 46 return qApp->translate( "G4UIQt", s, c, QApplication::UnicodeUTF8 ); 47 else 48 return QString::fromUtf8( s ); 49 } 50 #endif // QT_NO_TRANSLATION_UTF8 51 52 #endif // QT_NO_TRANSLATION 53 54 QMetaObject* G4UIQt::staticMetaObject() 55 { 56 if ( metaObj ) 57 return metaObj; 58 QMetaObject* parentObject = QObject::staticMetaObject(); 59 static const QUMethod slot_0 = {"ClearButtonCallback", 0, 0 }; 60 static const QUMethod slot_1 = {"CommandEnteredCallback", 0, 0 }; 61 static const QUParameter param_slot_2[] = { 62 { 0, &static_QUType_QString, 0, QUParameter::In } 63 }; 64 static const QUMethod slot_2 = {"ButtonCallback", 1, param_slot_2 }; 65 static const QUMethod slot_3 = {"HelpTreeClicCallback", 0, 0 }; 66 static const QUParameter param_slot_4[] = { 67 { 0, &static_QUType_ptr, "QTreeWidgetItem", QUParameter::In }, 68 { 0, &static_QUType_int, 0, QUParameter::In } 69 }; 70 static const QUMethod slot_4 = {"HelpTreeDoubleClicCallback", 2, param_slot_4 }; 71 static const QUMethod slot_5 = {"ShowHelpCallback", 0, 0 }; 72 static const QUMethod slot_6 = {"CommandHistoryCallback", 0, 0 }; 73 static const QMetaData slot_tbl[] = { 74 { "ClearButtonCallback()", &slot_0, QMetaData::Private }, 75 { "CommandEnteredCallback()", &slot_1, QMetaData::Private }, 76 { "ButtonCallback(const QString&)", &slot_2, QMetaData::Private }, 77 { "HelpTreeClicCallback()", &slot_3, QMetaData::Private }, 78 { "HelpTreeDoubleClicCallback(QTreeWidgetItem*,int)", &slot_4, QMetaData::Private }, 79 { "ShowHelpCallback()", &slot_5, QMetaData::Private }, 80 { "CommandHistoryCallback()", &slot_6, QMetaData::Private } 81 }; 82 static const QUParameter param_signal_0[] = { 83 { "text", &static_QUType_QString, 0, QUParameter::In } 84 }; 85 static const QUMethod signal_0 = {"myClicked", 1, param_signal_0 }; 86 static const QMetaData signal_tbl[] = { 87 { "myClicked(const QString&)", &signal_0, QMetaData::Private } 88 }; 89 metaObj = QMetaObject::new_metaobject( 90 "G4UIQt", parentObject, 91 slot_tbl, 7, 92 signal_tbl, 1, 93 #ifndef QT_NO_PROPERTIES 94 0, 0, 95 0, 0, 96 #endif // QT_NO_PROPERTIES 97 0, 0 ); 98 cleanUp_G4UIQt.setMetaObject( metaObj ); 99 return metaObj; 100 } 101 102 void* G4UIQt::qt_cast( const char* clname ) 103 { 104 if ( !qstrcmp( clname, "G4UIQt" ) ) 105 return this; 106 if ( !qstrcmp( clname, "G4VBasicShell" ) ) 107 return (G4VBasicShell*)this; 108 if ( !qstrcmp( clname, "G4VInteractiveSession" ) ) 109 return (G4VInteractiveSession*)this; 110 return QObject::qt_cast( clname ); 111 } 112 113 // SIGNAL myClicked 114 void G4UIQt::myClicked( const QString& t0 ) 115 { 116 activate_signal( staticMetaObject()->signalOffset() + 0, t0 ); 117 } 118 119 bool G4UIQt::qt_invoke( int _id, QUObject* _o ) 120 { 121 switch ( _id - staticMetaObject()->slotOffset() ) { 122 case 0: ClearButtonCallback(); break; 123 case 1: CommandEnteredCallback(); break; 124 case 2: ButtonCallback((const QString&)static_QUType_QString.get(_o+1)); break; 125 case 3: HelpTreeClicCallback(); break; 126 #if QT_VERSION < 0x040000 127 case 4: HelpTreeDoubleClicCallback((QListViewItem*)static_QUType_ptr.get(_o+1),(int)static_QUType_int.get(_o+2)); break; 128 #else 129 case 4: HelpTreeDoubleClicCallback((QTreeWidgetItem*)static_QUType_ptr.get(_o+1),(int)static_QUType_int.get(_o+2)); break; 130 #endif 131 case 5: ShowHelpCallback(); break; 132 case 6: CommandHistoryCallback(); break; 133 default: 134 return QObject::qt_invoke( _id, _o ); 135 } 136 return TRUE; 137 } 138 139 bool G4UIQt::qt_emit( int _id, QUObject* _o ) 140 { 141 switch ( _id - staticMetaObject()->signalOffset() ) { 142 case 0: myClicked((const QString&)static_QUType_QString.get(_o+1)); break; 143 default: 144 return QObject::qt_emit(_id,_o); 145 } 146 return TRUE; 147 } 148 #ifndef QT_NO_PROPERTIES 149 150 bool G4UIQt::qt_property( int id, int f, QVariant* v) 151 { 152 return QObject::qt_property( id, f, v); 153 } 154 155 bool G4UIQt::qt_static_property( QObject* , int , int , QVariant* ){ return FALSE; } 156 #endif // QT_NO_PROPERTIES 157 158 #endif 159 #endif 160 161 1 162 /**************************************************************************** 2 163 ** Meta object code from reading C++ file 'G4UIQt.hh' … … 7 168 ** WARNING! All changes made in this file will be lost! 8 169 *****************************************************************************/ 170 171 #if QT_VERSION >= 0x040000 9 172 10 173 #ifdef G4UI_BUILD_QT_SESSION … … 103 266 104 267 #endif 268 269 #endif -
trunk/geant4/interfaces/common/src/G4Qt.cc
r602 r606 25 25 // 26 26 // 27 // $Id: G4Qt.cc,v 1. 4 2007/11/09 15:03:21lgarnier Exp $27 // $Id: G4Qt.cc,v 1.5 2007/11/15 10:10:02 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 91 91 if(QtInited==FALSE) { //Qt should be Inited once ! 92 92 printf("G4Qt::G4Qt inited Qt\n"); 93 93 #if QT_VERSION < 0x040000 94 qApp = new QApplication (a_argn, a_args); 95 // QApplication qApp(a_argn, a_args); 96 #else 94 97 new QApplication (a_argn, a_args); 98 #endif 95 99 96 100 if(qApp==NULL) { 97 101 G4cout << "G4Qt : Unable to init Qt." << G4endl; 102 } else { 103 QtInited = TRUE; 104 SetMainInteractor (qApp); 105 SetArguments (a_argn,a_args); 106 printf("G4Qt::G4Qt inited Qt END\n"); 98 107 } 99 QtInited = TRUE;100 SetMainInteractor (qApp);101 108 } 102 SetArguments (a_argn,a_args); 109 if (qApp) 110 printf("G4Qt::qApp exist\n"); 111 else 112 printf("G4Qt::qApp not exist\n"); 103 113 // AddDispatcher ((G4DispatchFunction)XtDispatchEvent); 104 114 } -
trunk/geant4/visualization/OpenGL/include/G4OpenGLQtViewer.hh
r600 r606 25 25 // 26 26 // 27 // $Id: G4OpenGLQtViewer.hh,v 1. 3 2007/11/09 15:03:21 lgarnier Exp $27 // $Id: G4OpenGLQtViewer.hh,v 1.4 2007/11/13 17:48:51 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/geant4/visualization/OpenGL/include/G4OpenGLViewer.hh
r593 r606 25 25 // 26 26 // 27 // $Id: G4OpenGLViewer.hh,v 1.2 0 2007/05/08 11:04:11 allison Exp $28 // GEANT4 tag $Name: geant4-09-00-ref-01$27 // $Id: G4OpenGLViewer.hh,v 1.21 2007/11/10 14:50:01 allison Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // … … 48 48 friend class G4OpenGLImmediateSceneHandler; 49 49 friend class G4OpenGLStoredSceneHandler; 50 friend class G4OpenGLFileSceneHandler; 50 51 friend class G4OpenGLViewerMessenger; 51 52 … … 79 80 G4OpenGLSceneHandler& fOpenGLSceneHandler; 80 81 G4Colour background; //the OpenGL clear colour 82 unsigned int WinSize_x, WinSize_y; 81 83 G4bool 82 84 transparency_enabled, //is alpha blending enabled? -
trunk/geant4/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh
r593 r606 25 25 // 26 26 // 27 // $Id: G4OpenGLWin32Viewer.hh,v 1.1 3 2006/06/29 21:18:20 gunterExp $28 // GEANT4 tag $Name: geant4-09-00-ref-01$27 // $Id: G4OpenGLWin32Viewer.hh,v 1.14 2007/11/10 14:50:01 allison Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // … … 55 55 void CreateGLWin32Context (); 56 56 virtual void CreateMainWindow (); 57 protected:58 G4int WinSize_x;59 G4int WinSize_y;60 57 HDC fHDC; 61 58 private: -
trunk/geant4/visualization/OpenGL/include/G4OpenGLXViewer.hh
r593 r606 25 25 // 26 26 // 27 // $Id: G4OpenGLXViewer.hh,v 1.2 7 2007/05/08 11:04:11 allison Exp $28 // GEANT4 tag $Name: geant4-09-00-ref-01$27 // $Id: G4OpenGLXViewer.hh,v 1.28 2007/11/10 14:50:01 allison Exp $ 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // … … 105 105 Pixmap icon_pixmap; 106 106 XSizeHints *size_hints; 107 unsigned int WinSize_x,108 WinSize_y;109 107 Atom Xatom; 110 108 XTextProperty windowName, -
trunk/geant4/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc
r599 r606 25 25 // 26 26 // 27 // $Id: G4OpenGLImmediateQtViewer.cc,v 1. 1 2007/09/28 14:44:13lgarnier Exp $27 // $Id: G4OpenGLImmediateQtViewer.cc,v 1.2 2007/11/13 17:48:51 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/geant4/visualization/OpenGL/src/G4OpenGLQtExportDialog.cc
r599 r606 25 25 // 26 26 // 27 // $Id: G4OpenGLQtExportDialog.cc,v 1. 3 2007/11/09 15:03:21 lgarnier Exp $27 // $Id: G4OpenGLQtExportDialog.cc,v 1.4 2007/11/13 17:48:51 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // -
trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r602 r606 25 25 // 26 26 // 27 // $Id: G4OpenGLQtViewer.cc,v 1. 4 2007/11/09 15:03:22lgarnier Exp $27 // $Id: G4OpenGLQtViewer.cc,v 1.6 2007/11/14 11:49:00 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 1344 1344 1345 1345 if (aFilename.endsWith(".ps")) { 1346 #if QT_VERSION > 0x040200 1346 1347 printer.setOutputFormat(QPrinter::PostScriptFormat); 1347 } else { 1348 #endif 1349 } else { 1350 #if QT_VERSION > 0x040100 1348 1351 printer.setOutputFormat(QPrinter::PdfFormat); 1349 } 1352 #endif 1353 } 1354 #if QT_VERSION > 0x040100 1350 1355 printer.setOutputFileName(aFilename); 1356 #endif 1351 1357 // printer.setFullPage ( true); 1352 1358 QPainter paint(&printer); -
trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc
r601 r606 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredQtViewer.cc,v 1. 3 2007/11/09 15:03:22lgarnier Exp $27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.5 2007/11/14 18:58:59 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 256 256 void G4OpenGLStoredQtViewer::mouseMoveEvent(QMouseEvent *event) 257 257 { 258 printf("G4OpenGLStoredQtViewer::mouseMoveEvent\n"); 259 #if QT_VERSION < 0x040000 258 260 G4MouseMoveEvent(event->x(),event->y(),event->button()); 261 #else 262 G4MouseMoveEvent(event->x(),event->y(),event->buttons()); 263 #endif 259 264 // DrawView(); 260 265 } -
trunk/geant4/visualization/management/src/G4VisCommandsScene.cc
r593 r606 25 25 // 26 26 // 27 // $Id: G4VisCommandsScene.cc,v 1.6 6 2007/05/25 10:49:55allison Exp $28 // GEANT4 tag $Name: geant4-09-00-ref-01$27 // $Id: G4VisCommandsScene.cc,v 1.67 2007/11/10 15:03:56 allison Exp $ 28 // GEANT4 tag $Name: $ 29 29 30 30 // /vis/scene commands - John Allison 9th August 1998 … … 34 34 #include "G4VisManager.hh" 35 35 #include "G4TransportationManager.hh" 36 #include "G4RunManager.hh" 37 #include "G4Run.hh" 36 38 #include "G4PhysicalVolumeModel.hh" 37 39 #include "G4ApplicationState.hh" … … 202 204 fpVisManager->ResetTransientsDrawnFlags(); 203 205 206 // Are there any events currently kept... 207 size_t nCurrentlyKept = 0; 208 G4RunManager* runManager = G4RunManager::GetRunManager(); 209 if (runManager) { 210 const G4Run* currentRun = runManager->GetCurrentRun(); 211 if (currentRun) { 212 const std::vector<const G4Event*>* events = 213 currentRun->GetEventVector(); 214 if (events) nCurrentlyKept = events->size(); 215 } 216 } 217 204 218 if (verbosity >= G4VisManager::confirmations) { 205 219 G4cout << "End of event action set to "; … … 211 225 << " (unlimited if negative)." 212 226 "\n This may be changed with, e.g., " 213 "\"/vis/scene/endOfEventAction accumulate 100\"." 214 << G4endl; 215 } 216 } 227 "\"/vis/scene/endOfEventAction accumulate 1000\"."; 228 } 229 G4cout << G4endl; 230 } 231 217 232 if (!pScene->GetRefreshAtEndOfEvent() && 218 233 maxNumberOfKeptEvents != 0 && 219 234 verbosity >= G4VisManager::warnings) { 220 G4cout << "WARNING: The vis manager will keep "; 221 if (maxNumberOfKeptEvents < 0) G4cout << "an unlimited number of"; 222 else G4cout << "up to " << maxNumberOfKeptEvents; 223 G4cout << " events."; 224 if (maxNumberOfKeptEvents > 1 || maxNumberOfKeptEvents < 0) 225 G4cout << "\n This may use a lot of memory."; 235 G4cout << "WARNING: "; 236 if (nCurrentlyKept) { 237 G4cout << 238 "\n There are currently " << nCurrentlyKept 239 << " events kept for refreshing and/or reviewing."; 240 } else { 241 G4cout << "The vis manager will keep "; 242 if (maxNumberOfKeptEvents < 0) G4cout << "an unlimited number of"; 243 else G4cout << "up to " << maxNumberOfKeptEvents; 244 G4cout << " events."; 245 if (maxNumberOfKeptEvents > 1 || maxNumberOfKeptEvents < 0) 246 G4cout << "\n This may use a lot of memory."; 247 } 226 248 G4cout << G4endl; 227 249 } 228 UpdateVisManagerScene (pScene->GetName());229 250 } 230 251 … … 316 337 G4cout << "\"" << G4endl; 317 338 } 318 UpdateVisManagerScene (pScene->GetName());319 339 } 320 340 -
trunk/geant4/visualization/management/src/G4VisManager.cc
r593 r606 24 24 // ******************************************************************** 25 25 // 26 // $Id: G4VisManager.cc,v 1.11 3 2007/05/25 10:50:26 allison Exp $27 // GEANT4 tag $Name: geant4-09-00-ref-01$26 // $Id: G4VisManager.cc,v 1.114 2007/11/10 14:59:46 allison Exp $ 27 // GEANT4 tag $Name: $ 28 28 // 29 29 // … … 1244 1244 G4cout << 1245 1245 " Only useful if before starting the run:" 1246 "\n a) trajectories are stored (\"/ tracking/storeTrajectory N\"), or"1246 "\n a) trajectories are stored (\"/vis/scene/add/trajectories [smooth|rich]\"), or" 1247 1247 "\n b) the Draw method of any hits is implemented." 1248 1248 "\n To view trajectories and hits:" 1249 1249 "\n open a viewer, draw a volume, \"/vis/scene/add/trajectories\"" 1250 1250 "\n \"/vis/scene/add/hits\" and, possibly, \"/vis/viewer/flush\"." 1251 "\n To see all events: \" vis/scene/endOfEventAction accumulate\"."1251 "\n To see all events: \"/vis/scene/endOfEventAction accumulate\"." 1252 1252 "\n To see events individually: \"/vis/reviewKeptEvents\"." 1253 1253 << G4endl;
Note: See TracChangeset
for help on using the changeset viewer.