Changeset 790

Timestamp:

Apr 30, 2008, 6:30:42 PM (16 years ago)

Author:

garnier

Message:

r818@wl-72126: garnier | 2008-04-30 12:42:00 +0200
modif mise a jour sur le cvs

Location:

trunk/geant4

Files:

• config/G4UI_USE.gmk (modified) (1 diff)
• config/G4VIS_USE.gmk (modified) (1 diff)
• config/History (modified) (2 diffs)
• config/common.gmk (modified) (2 diffs)
• config/sys/Darwin-g++.gmk (modified) (1 diff)
• config/sys/Linux-g++.gmk (modified) (1 diff)
• config/sys/WIN32-VC.gmk (modified) (1 diff)
• interfaces/History (modified) (2 diffs)
• interfaces/basic/GNUmakefile (modified) (1 diff)
• visualization/OpenGL/GNUmakefile (modified) (1 diff)
• visualization/OpenGL/History (modified) (2 diffs)
• visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh (modified) (3 diffs)
• visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (4 diffs)
• visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc (modified) (2 diffs)
• visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc (modified) (2 diffs)

trunk/geant4/config/G4UI_USE.gmk

@@ -1 @@
-# $Id: G4UI_USE.gmk,v 1.9 2007/10/03 12:15:05 lgarnier Exp $
+# $Id: G4UI_USE.gmk,v 1.10 2008/04/30 10:40:12 lgarnier Exp $
 # -------------------------------------------------------------
 # GNUmakefile for CPPFLAGS for interfaces USE phase.

trunk/geant4/config/G4VIS_USE.gmk

@@ -1 @@
-# $Id: G4VIS_USE.gmk,v 1.23 2007/10/03 12:15:05 lgarnier Exp $
+# $Id: G4VIS_USE.gmk,v 1.24 2008/04/30 10:40:12 lgarnier Exp $
 # -------------------------------------------------------------
 # GNUmakefile for CPPFLAGS for visualization USE phase.

trunk/geant4/config/History

@@ -1 @@
-$Id: History,v 1.319 2008/04/04 10:35:41 gcosmo Exp $
+$Id: History,v 1.320 2008/04/30 10:40:12 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -16 +16 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+30th April 2008  Laurent Garnier
+- common.gmk : Better Qt moc files integration
+- moc.gmk : Add a file for Qt moc files configuration
+- G4UI_USE, G4VIS_USE, interactivity, sys/*: Separation of QT with OpenGL 
+  or without
 
 3rd April 2008  Gabriele Cosmo (config-V09-01-03)

trunk/geant4/config/common.gmk

@@ -1 @@
-# $Id: common.gmk,v 1.51 2008/04/04 10:35:20 gcosmo Exp $
+# $Id: common.gmk,v 1.52 2008/04/30 10:40:12 lgarnier Exp $
 # ----------------------------------------------------------------
 # Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
@@ -12 +12 @@
 G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(name)
 
-ifneq ($(G4INTY_BUILD_QT),)
-  dependencies := $(moc_dependencies)
-endif
-dependencies += $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
+sources      := $(wildcard src/*.cc)
+dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
+objects      := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
 
 ifneq ($(G4INTY_BUILD_QT),)
-  objects := $(moc_objects)
+ sources      += $(moc_sources)
+ dependencies += $(moc_dependencies)
+ objects      += $(moc_objects)
 endif
-sources += $(wildcard src/*.cc)
-
-objects += $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
 
    g4libraries_to_build :=

trunk/geant4/config/sys/Darwin-g++.gmk

@@ -79 +79 @@
   ifndef QTLIBS
     QT3LIBS    := -L$(QTHOME)/lib -lqt -lqui
-    QT4LIBS    := -D111 -F$(QTHOME)/lib -framework QtCore -framework QtGui -D111_END
+    QT4LIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui
     QT4LIBS    += -framework QtSql -framework QtXml
     QTLIBS     := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))

trunk/geant4/config/sys/Linux-g++.gmk

@@ -65 +65 @@
     QTMOC      := $(QTHOME)/bin/moc
   endif
+  ifndef QTGLLIBS
+    QT3LIBS    := -L$(QTHOME)/lib -lqt-mt
+    QT4LIBS    := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtOpenGL -lQtSql -lQtXml
+    QTLIBS     := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo $(QT4LIBS) || echo $(QT3LIBS))
+  endif
   ifndef QTLIBS
     QT3LIBS    := -L$(QTHOME)/lib -lqt-mt
-    QT4LIBS    := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtOpenGL -lQtSql -lQtXml
+    QT4LIBS    := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtSql -lQtXml
     QTLIBS     := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo $(QT4LIBS) || echo $(QT3LIBS))
   endif

trunk/geant4/config/sys/WIN32-VC.gmk

@@ -45 +45 @@
   endif
   ifndef QTLIBS
+    QT3LIBS   := -L$(QTHOME)/lib -lqt-mt
+    QT4LIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtSql4.lib QtXml4.lib
+    QTLIBS    := $(shell test -f $(QTHOME)/lib/Qt3Support4.lib && echo $(QT4LIBS) || echo $(QT3LIBS))
+  endif
+  ifndef QTGLLIBS
     QT3LIBS   := -L$(QTHOME)/lib -lqt-mt
     QT4LIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib QtSql4.lib QtXml4.lib

trunk/geant4/interfaces/History

@@ -1 @@
-$Id: History,v 1.95 2008/03/10 17:03:16 lgarnier Exp $
+$Id: History,v 1.96 2008/04/30 10:01:41 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+30th April, Laurent Garnier
+ - Include moc config in GNUmakefile
+
 10th March, Laurent Garnier
  - Improvments for layout in Qt driver for Qt3

trunk/geant4/interfaces/basic/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.5 2008/01/15 11:04:26 lgarnier Exp $
+# $Id: GNUmakefile,v 1.6 2008/04/30 10:00:14 lgarnier Exp $
 # -------------------------------------------------------------
 # GNUmakefile for interfaces/basic library.  John Allison, 6/7/98.

trunk/geant4/visualization/OpenGL/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.7 2008/01/15 11:05:08 lgarnier Exp $
+# $Id: GNUmakefile,v 1.8 2008/04/29 16:58:04 lgarnier Exp $
 
 name := G4OpenGL

trunk/geant4/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.112 2008/04/04 13:32:22 allison Exp $
+$Id: History,v 1.114 2008/04/29 16:58:04 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -21 +21 @@
 -------------------------------------
 
-22th April 2008  Laurent Garnier
+28th April 2008  Laurent Garnier
 - Add better moc control/compilation step in GNUmakefile 
+- Fix a problem when launching QT VIS without QT UI (N02 for example)
+
+28th April 2008  John Allison  (opengl-V09-01-02)
+- G4OpenGLStoredSceneHandler: Tidied constructors of nested classes.
 
 4th April 2008  John Allison  (opengl-V09-01-01)

trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredSceneHandler.hh,v 1.26 2008/04/04 13:32:22 allison Exp $
+// $Id: G4OpenGLStoredSceneHandler.hh,v 1.27 2008/04/28 16:19:40 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -87 +87 @@
   GLint  fTopPODL;                  // List which calls the other PODLs.
   struct PO {
-    PO(G4int id, const G4Transform3D& tr = G4Transform3D()):
-      fDisplayListId(id), fTransform(tr), fPickName(0) {}
+    PO(G4int id, const G4Transform3D& tr = G4Transform3D());
     G4int fDisplayListId;
     G4Transform3D fTransform;
@@ -97 +96 @@
   // TO = Transparent Object.
   struct TO {
-    TO(G4int id, const G4Transform3D& tr = G4Transform3D()):
-      fDisplayListId(id), fTransform(tr), fPickName(0),
-      fStartTime(-DBL_MAX), fEndTime(DBL_MAX) {}
+    TO(G4int id, const G4Transform3D& tr = G4Transform3D());
     G4int fDisplayListId;
     G4Transform3D fTransform;

trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.22 2008/03/14 09:42:04 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.23 2008/04/29 16:58:04 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -36 +36 @@
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 
-#define GEANT4_QT_DEBUG
+//#define GEANT4_QT_DEBUG
 
 #include "G4OpenGLQtViewer.hh"
@@ -53 +53 @@
 #include "G4UImanager.hh"
 #include "G4UIcommandTree.hh"
-#include <qapplication.h>
 #include <qlayout.h>
 #include <qdialog.h>
 #include <qprocess.h>
+#include <qapplication.h>
 
 #if QT_VERSION >= 0x040000
@@ -311 +311 @@
 {
 
+  // launch Qt if not
+  G4Qt* interactorManager = G4Qt::getInstance ();
+
   initMovieParameters();
 
 #ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::G4OpenGLQtViewer \n");
+  printf("G4OpenGLQtViewer::G4OpenGLQtViewer END\n");
 #endif
 }

trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.cc,v 1.13 2008/03/11 16:31:09 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.cc,v 1.14 2008/04/29 16:58:04 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -93 +93 @@
 #endif
   readyToPaint = true;
-  
-  // First Draw
-  SetView();
-#ifdef GEANT4_QT_DEBUG
-  printf("    ClearView\n");
-#endif
-  ClearView (); //ok, put the background correct
-  FinishView();
 }
 

trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredSceneHandler.cc,v 1.37 2008/04/04 13:32:22 allison Exp $
+// $Id: G4OpenGLStoredSceneHandler.cc,v 1.38 2008/04/28 16:19:39 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -55 +55 @@
 #include "G4AttHolder.hh"
 
-G4OpenGLStoredSceneHandler::G4OpenGLStoredSceneHandler (G4VGraphicsSystem& system,
-                                          const G4String& name):
+G4OpenGLStoredSceneHandler::PO::PO
+(G4int id,
+ const G4Transform3D& tr):
+  fDisplayListId(id),
+  fTransform(tr),
+  fPickName(0)
+{}
+
+G4OpenGLStoredSceneHandler::TO::TO
+(G4int id,
+ const G4Transform3D& tr):
+  fDisplayListId(id),
+  fTransform(tr),
+  fPickName(0),
+  fStartTime(-DBL_MAX),
+  fEndTime(DBL_MAX)
+{}
+
+G4OpenGLStoredSceneHandler::G4OpenGLStoredSceneHandler
+(G4VGraphicsSystem& system,
+ const G4String& name):
 G4OpenGLSceneHandler (system, fSceneIdCount++, name),
 fMemoryForDisplayLists (true),