- Timestamp:
- Apr 30, 2008, 6:30:42 PM (16 years ago)
- Location:
- trunk/geant4
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/config/G4UI_USE.gmk
r787 r790 1 # $Id: G4UI_USE.gmk,v 1. 9 2007/10/03 12:15:05lgarnier Exp $1 # $Id: G4UI_USE.gmk,v 1.10 2008/04/30 10:40:12 lgarnier Exp $ 2 2 # ------------------------------------------------------------- 3 3 # GNUmakefile for CPPFLAGS for interfaces USE phase. -
trunk/geant4/config/G4VIS_USE.gmk
r777 r790 1 # $Id: G4VIS_USE.gmk,v 1.2 3 2007/10/03 12:15:05lgarnier Exp $1 # $Id: G4VIS_USE.gmk,v 1.24 2008/04/30 10:40:12 lgarnier Exp $ 2 2 # ------------------------------------------------------------- 3 3 # GNUmakefile for CPPFLAGS for visualization USE phase. -
trunk/geant4/config/History
r761 r790 1 $Id: History,v 1.3 19 2008/04/04 10:35:41 gcosmoExp $1 $Id: History,v 1.320 2008/04/30 10:40:12 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 16 16 * Reverse chronological order (last date on top), please * 17 17 ---------------------------------------------------------- 18 19 30th April 2008 Laurent Garnier 20 - common.gmk : Better Qt moc files integration 21 - moc.gmk : Add a file for Qt moc files configuration 22 - G4UI_USE, G4VIS_USE, interactivity, sys/*: Separation of QT with OpenGL 23 or without 18 24 19 25 3rd April 2008 Gabriele Cosmo (config-V09-01-03) -
trunk/geant4/config/common.gmk
r787 r790 1 # $Id: common.gmk,v 1.5 1 2008/04/04 10:35:20 gcosmoExp $1 # $Id: common.gmk,v 1.52 2008/04/30 10:40:12 lgarnier Exp $ 2 2 # ---------------------------------------------------------------- 3 3 # Common part of GNUmakefile for libraries. John Allison, 5/7/95. … … 12 12 G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(name) 13 13 14 ifneq ($(G4INTY_BUILD_QT),) 15 dependencies := $(moc_dependencies) 16 endif 17 dependencies += $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources)) 14 sources := $(wildcard src/*.cc) 15 dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources)) 16 objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources)) 18 17 19 18 ifneq ($(G4INTY_BUILD_QT),) 20 objects := $(moc_objects) 19 sources += $(moc_sources) 20 dependencies += $(moc_dependencies) 21 objects += $(moc_objects) 21 22 endif 22 sources += $(wildcard src/*.cc)23 24 objects += $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))25 23 26 24 g4libraries_to_build := -
trunk/geant4/config/sys/Darwin-g++.gmk
r780 r790 79 79 ifndef QTLIBS 80 80 QT3LIBS := -L$(QTHOME)/lib -lqt -lqui 81 QT4LIBS := - D111 -F$(QTHOME)/lib -framework QtCore -framework QtGui -D111_END81 QT4LIBS := -F$(QTHOME)/lib -framework QtCore -framework QtGui 82 82 QT4LIBS += -framework QtSql -framework QtXml 83 83 QTLIBS := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS)) -
trunk/geant4/config/sys/Linux-g++.gmk
r758 r790 65 65 QTMOC := $(QTHOME)/bin/moc 66 66 endif 67 ifndef QTGLLIBS 68 QT3LIBS := -L$(QTHOME)/lib -lqt-mt 69 QT4LIBS := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtOpenGL -lQtSql -lQtXml 70 QTLIBS := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo $(QT4LIBS) || echo $(QT3LIBS)) 71 endif 67 72 ifndef QTLIBS 68 73 QT3LIBS := -L$(QTHOME)/lib -lqt-mt 69 QT4LIBS := -L$(QTHOME)/lib -lQtCore -lQtGui -lQt OpenGL -lQtSql -lQtXml74 QT4LIBS := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtSql -lQtXml 70 75 QTLIBS := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo $(QT4LIBS) || echo $(QT3LIBS)) 71 76 endif -
trunk/geant4/config/sys/WIN32-VC.gmk
r758 r790 45 45 endif 46 46 ifndef QTLIBS 47 QT3LIBS := -L$(QTHOME)/lib -lqt-mt 48 QT4LIBS := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtSql4.lib QtXml4.lib 49 QTLIBS := $(shell test -f $(QTHOME)/lib/Qt3Support4.lib && echo $(QT4LIBS) || echo $(QT3LIBS)) 50 endif 51 ifndef QTGLLIBS 47 52 QT3LIBS := -L$(QTHOME)/lib -lqt-mt 48 53 QT4LIBS := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib QtSql4.lib QtXml4.lib -
trunk/geant4/interfaces/History
r786 r790 1 $Id: History,v 1.9 5 2008/03/10 17:03:16lgarnier Exp $1 $Id: History,v 1.96 2008/04/30 10:01:41 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 17 17 * Reverse chronological order (last date on top), please * 18 18 ---------------------------------------------------------- 19 20 30th April, Laurent Garnier 21 - Include moc config in GNUmakefile 22 19 23 10th March, Laurent Garnier 20 24 - Improvments for layout in Qt driver for Qt3 -
trunk/geant4/interfaces/basic/GNUmakefile
r786 r790 1 # $Id: GNUmakefile,v 1. 5 2008/01/15 11:04:26lgarnier Exp $1 # $Id: GNUmakefile,v 1.6 2008/04/30 10:00:14 lgarnier Exp $ 2 2 # ------------------------------------------------------------- 3 3 # GNUmakefile for interfaces/basic library. John Allison, 6/7/98. -
trunk/geant4/visualization/OpenGL/GNUmakefile
r789 r790 1 # $Id: GNUmakefile,v 1. 7 2008/01/15 11:05:08lgarnier Exp $1 # $Id: GNUmakefile,v 1.8 2008/04/29 16:58:04 lgarnier Exp $ 2 2 3 3 name := G4OpenGL -
trunk/geant4/visualization/OpenGL/History
r789 r790 1 $Id: History,v 1.11 2 2008/04/04 13:32:22 allisonExp $1 $Id: History,v 1.114 2008/04/29 16:58:04 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 21 21 ------------------------------------- 22 22 23 2 2th April 2008 Laurent Garnier23 28th April 2008 Laurent Garnier 24 24 - Add better moc control/compilation step in GNUmakefile 25 - Fix a problem when launching QT VIS without QT UI (N02 for example) 26 27 28th April 2008 John Allison (opengl-V09-01-02) 28 - G4OpenGLStoredSceneHandler: Tidied constructors of nested classes. 25 29 26 30 4th April 2008 John Allison (opengl-V09-01-01) -
trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh
r789 r790 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredSceneHandler.hh,v 1.2 6 2008/04/04 13:32:22allison Exp $27 // $Id: G4OpenGLStoredSceneHandler.hh,v 1.27 2008/04/28 16:19:40 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 87 87 GLint fTopPODL; // List which calls the other PODLs. 88 88 struct PO { 89 PO(G4int id, const G4Transform3D& tr = G4Transform3D()): 90 fDisplayListId(id), fTransform(tr), fPickName(0) {} 89 PO(G4int id, const G4Transform3D& tr = G4Transform3D()); 91 90 G4int fDisplayListId; 92 91 G4Transform3D fTransform; … … 97 96 // TO = Transparent Object. 98 97 struct TO { 99 TO(G4int id, const G4Transform3D& tr = G4Transform3D()): 100 fDisplayListId(id), fTransform(tr), fPickName(0), 101 fStartTime(-DBL_MAX), fEndTime(DBL_MAX) {} 98 TO(G4int id, const G4Transform3D& tr = G4Transform3D()); 102 99 G4int fDisplayListId; 103 100 G4Transform3D fTransform; -
trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r778 r790 25 25 // 26 26 // 27 // $Id: G4OpenGLQtViewer.cc,v 1.2 2 2008/03/14 09:42:04 lgarnier Exp $27 // $Id: G4OpenGLQtViewer.cc,v 1.23 2008/04/29 16:58:04 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 36 36 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER 37 37 38 #define GEANT4_QT_DEBUG38 //#define GEANT4_QT_DEBUG 39 39 40 40 #include "G4OpenGLQtViewer.hh" … … 53 53 #include "G4UImanager.hh" 54 54 #include "G4UIcommandTree.hh" 55 #include <qapplication.h>56 55 #include <qlayout.h> 57 56 #include <qdialog.h> 58 57 #include <qprocess.h> 58 #include <qapplication.h> 59 59 60 60 #if QT_VERSION >= 0x040000 … … 311 311 { 312 312 313 // launch Qt if not 314 G4Qt* interactorManager = G4Qt::getInstance (); 315 313 316 initMovieParameters(); 314 317 315 318 #ifdef GEANT4_QT_DEBUG 316 printf("G4OpenGLQtViewer::G4OpenGLQtViewer \n");319 printf("G4OpenGLQtViewer::G4OpenGLQtViewer END\n"); 317 320 #endif 318 321 } -
trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc
r754 r790 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.1 3 2008/03/11 16:31:09lgarnier Exp $27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.14 2008/04/29 16:58:04 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 93 93 #endif 94 94 readyToPaint = true; 95 96 // First Draw97 SetView();98 #ifdef GEANT4_QT_DEBUG99 printf(" ClearView\n");100 #endif101 ClearView (); //ok, put the background correct102 FinishView();103 95 } 104 96 -
trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
r789 r790 25 25 // 26 26 // 27 // $Id: G4OpenGLStoredSceneHandler.cc,v 1.3 7 2008/04/04 13:32:22allison Exp $27 // $Id: G4OpenGLStoredSceneHandler.cc,v 1.38 2008/04/28 16:19:39 allison Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 55 55 #include "G4AttHolder.hh" 56 56 57 G4OpenGLStoredSceneHandler::G4OpenGLStoredSceneHandler (G4VGraphicsSystem& system, 58 const G4String& name): 57 G4OpenGLStoredSceneHandler::PO::PO 58 (G4int id, 59 const G4Transform3D& tr): 60 fDisplayListId(id), 61 fTransform(tr), 62 fPickName(0) 63 {} 64 65 G4OpenGLStoredSceneHandler::TO::TO 66 (G4int id, 67 const G4Transform3D& tr): 68 fDisplayListId(id), 69 fTransform(tr), 70 fPickName(0), 71 fStartTime(-DBL_MAX), 72 fEndTime(DBL_MAX) 73 {} 74 75 G4OpenGLStoredSceneHandler::G4OpenGLStoredSceneHandler 76 (G4VGraphicsSystem& system, 77 const G4String& name): 59 78 G4OpenGLSceneHandler (system, fSceneIdCount++, name), 60 79 fMemoryForDisplayLists (true),
Note: See TracChangeset
for help on using the changeset viewer.