Changeset 632 for trunk/geant4/visualization

Timestamp:

Nov 30, 2007, 3:49:44 PM (17 years ago)

Author:

garnier

Message:

commit sur geant4

Location:

trunk/geant4/visualization

Files:

• OpenGL/History (modified) (2 diffs)
• OpenGL/include/G4OpenGLQtViewer.hh (modified) (1 diff)
• OpenGL/src/G4OpenGLQtExportDialog_moc.cc (modified) (1 diff)
• OpenGL/src/G4OpenGLQtViewer.cc (modified) (5 diffs)
• OpenGL/src/G4OpenGLQtViewer_moc.cc (modified) (1 diff)
• OpenGL/src/G4OpenGLStoredQt.cc (modified) (2 diffs)
• OpenGL/src/G4OpenGLStoredQtViewer.cc (modified) (2 diffs)
• OpenGL/src/G4OpenGLViewer.cc (modified) (1 diff)
• management/History (modified) (2 diffs)
• management/include/G4VisExecutive.icc (modified) (1 diff)
• management/src/G4VisManager.cc (modified) (2 diffs)

trunk/geant4/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.103 2007/11/19 19:45:39 perl Exp $
+$Id: History,v 1.104 2007/11/30 14:47:30 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -20 +20 @@
 History file for visualization/OpenGL
 -------------------------------------
+
+30th November 2007  Laurent Garnier
+- Improvements for Qt3
+- moc files : Adding other versions for QT_MOC_REVISION 28,58 and
+   59, but this is not the right solution..
 
 19th November 2007  Joseph Perl (for Laurent Garnier) (opengl-V09-00-04)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.hh,v 1.4 2007/11/13 17:48:51 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.hh,v 1.5 2007/11/30 14:47:30 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -3 +3 @@
 **
 ** Created: Mon Nov 12 10:36:59 2007
-**      by: The Qt MOC ($Id: G4OpenGLQtExportDialog_moc.cc,v 1.5 2007/11/14 11:49:00 lgarnier Exp $)
+**      by: The Qt MOC ($Id: G4OpenGLQtExportDialog_moc.cc,v 1.6 2007/11/30 14:47:30 lgarnier Exp $)
 **
 ** WARNING! All changes made in this file will be lost!

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.7 2007/11/15 18:24:28 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.8 2007/11/30 14:47:30 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -36 +36 @@
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 
-#define GEANT4_QT_DEBUG
+//#define GEANT4_QT_DEBUG
 
 #include "G4OpenGLQtViewer.hh"
@@ -228 +228 @@
   GLWindow->resize(300, 300);
   GLWindow->move(900,300);
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::Should show glWidget\n");
-#endif
   GLWindow->show();
   
@@ -363 +360 @@
 
   QMenu *mRepresentation = mStyle->addMenu("&Representation");
- QAction *polyhedron = mRepresentation->addAction("Polyhedron");
+  QAction *polyhedron = mRepresentation->addAction("Polyhedron");
   QAction *nurbs = mRepresentation->addAction("NURBS");
 #endif
@@ -385 +382 @@
   fDrawingWireframe = new QPopupMenu(mDrawing);
   mDrawing->insertItem("&Wireframe",fDrawingWireframe);
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer:: fDrawingWireframe creation\n");
-#endif
 
   mDrawing->setCheckable(true);

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

@@ -3 +3 @@
 **
 ** Created: Mon Nov 12 10:34:24 2007
-**      by: The Qt MOC ($Id: G4OpenGLQtViewer_moc.cc,v 1.5 2007/11/14 11:49:00 lgarnier Exp $)
+**      by: The Qt MOC ($Id: G4OpenGLQtViewer_moc.cc,v 1.6 2007/11/30 14:47:30 lgarnier Exp $)
 **
 ** WARNING! All changes made in this file will be lost!

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQt.cc,v 1.3 2007/11/15 18:24:28 lgarnier Exp $
+// $Id: G4OpenGLStoredQt.cc,v 1.4 2007/11/30 14:47:30 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -33 +33 @@
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 
-#define GEANT4_QT_DEBUG
+//#define GEANT4_QT_DEBUG
 
 #include "G4VisFeaturesOfOpenGL.hh"

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.cc,v 1.6 2007/11/15 18:24:28 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.cc,v 1.7 2007/11/30 14:47:30 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -34 +34 @@
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 
-#define GEANT4_QT_DEBUG
+//#define GEANT4_QT_DEBUG
 
 #include "G4OpenGLStoredQtViewer.hh"

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

@@ -26 +26 @@
 //
 // $Id: G4OpenGLViewer.cc,v 1.34 2007/05/24 18:27:13 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name:  $
 //
 // 

trunk/geant4/visualization/management/History

@@ -1 @@
-$Id: History,v 1.103 2007/11/16 20:34:17 perl Exp $
+$Id: History,v 1.104 2007/11/30 14:47:30 lgarnier Exp $
 
 -------------------------------------------------------------------
@@ -26 +26 @@
 History file for visualization management sub-category
 ------------------------------------------------------
+
+30th November 2007  Laurent Garnier
+- G4VisExecutive.icc : Add a #ifdef G4VIS_USE_DAWN directive in order
+ not to add a 'new G4DAWNFILE' if G4VIS_USE_DAWN is not set
+#endif
 
 16th November 2007  Joseph Perl  (visman-V09-00-02)

trunk/geant4/visualization/management/include/G4VisExecutive.icc

@@ -25 +25 @@
 //
 //
-// $Id: G4VisExecutive.icc,v 1.17 2007/11/09 15:03:22 lgarnier Exp $
+// $Id: G4VisExecutive.icc,v 1.18 2007/11/30 14:47:30 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

trunk/geant4/visualization/management/src/G4VisManager.cc

@@ -561 +561 @@
 
 void G4VisManager::CreateSceneHandler (G4String name) {
-  printf("G4VisManager::Initialise OK\n");
   if (!fInitialised) Initialise ();
-  printf("G4VisManager::Initialise OK END\n");
   if (fpGraphicsSystem) {
     G4VSceneHandler* pSceneHandler =
@@ -585 +583 @@
 void G4VisManager::CreateViewer (G4String name) {
 
-    printf("G4VisManager::Initialise OK\n");
   if (!fInitialised) Initialise ();
-
-  if (fpSceneHandler)
-    printf("G4VisManager::CreateViewer OK\n");
-  else
-    printf("G4VisManager::CreateViewer NO SCENE HANDLER\n");
 
   if (fpSceneHandler) {