Changeset 632


Ignore:
Timestamp:
Nov 30, 2007, 3:49:44 PM (17 years ago)
Author:
garnier
Message:

commit sur geant4

Location:
trunk/geant4
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/interfaces/GAG/GNUmakefile

    r610 r632  
    1 # $Id: GNUmakefile,v 1.2 2005/01/26 08:50:58 gcosmo Exp $
     1# $Id: GNUmakefile,v 1.3 2007/11/30 14:28:50 lgarnier Exp $
    22# -------------------------------------------------------------
    33# GNUmakefile for interfaces/GAG library.  John Allison, 6/7/98.
    … …  
    1010
    1111include $(G4INSTALL)/config/architecture.gmk
    12 #include $(G4INSTALL)/config/G4UI_BUILD.gmk
    1312include $(G4INSTALL)/config/interactivity.gmk
    1413

  • trunk/geant4/interfaces/History

    r631 r632  
    1 $Id: History,v 1.90 2007/11/16 15:03:17 kmura Exp $
     1$Id: History,v 1.91 2007/11/30 14:28:49 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1818     ----------------------------------------------------------
    1919
     2030 November 2007, Laurent Garnier
     21 - G4UIQt : Some improvements for Qt3, corrections of some bugs
     22 - G4UIQt_moc.cc : Adding other versions for QT_MOC_REVISION 28,58 and
     23   59, but this is not the right solution..
     24 - GAG/Makefile : Suppression of linking on a unuseful library
     25
    202616 November 2007, Koichi Murakami (interfaces-V09-00-03)
    2127 - G4UIGainServer.cc: cleared a compilation warning.

  • trunk/geant4/interfaces/basic/include/G4UIQt.hh

    r619 r632  
    2525//
    2626//
    27 // $Id: G4UIQt.hh,v 1.7 2007/11/15 18:53:59 lgarnier Exp $
     27// $Id: G4UIQt.hh,v 1.9 2007/11/30 13:32:47 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    152152  void HelpTreeDoubleClicCallback( QListViewItem*);
    153153#else
    154   void HelpTreeDoubleClicCallback( QTreeWidgetItem*,int);
     154  void HelpTreeDoubleClicCallback( QTreeWidgetItem*, int);
    155155#endif
    156156  void ShowHelpCallback();

  • trunk/geant4/interfaces/basic/src/G4UIQt.cc

    r630 r632  
    2525//
    2626//
    27 // $Id: G4UIQt.cc,v 1.12 2007/11/15 18:24:27 lgarnier Exp $
     27// $Id: G4UIQt.cc,v 1.13 2007/11/30 14:28:50 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    3030// L. Garnier
    3131
    32 #define GEANT4_QT_DEBUG
     32//#define DEBUG
    3333
    3434#ifdef G4UI_BUILD_QT_SESSION
    … …  
    175175  connect(fCommandHistoryArea, SIGNAL(itemSelectionChanged()), SLOT(CommandHistoryCallback()));
    176176#endif
    177 
    178177  fCommandHistoryArea->installEventFilter(this);
    179178  fCommandLabel = new QLabel("",bottomWidget);
    … …  
    181180  fCommandArea = new QLineEdit(bottomWidget);
    182181  fCommandArea->installEventFilter(this);
    183 #ifdef GEANT4_QT_DEBUG
    184   printf("G4UIQt::   1\n");
    185 #endif
    186182#if QT_VERSION < 0x040000
    187183  fCommandArea->setActiveWindow();
    … …  
    190186#endif
    191187  connect(fCommandArea, SIGNAL(returnPressed()), SLOT(CommandEnteredCallback()));
    192 #ifdef GEANT4_QT_DEBUG
    193   printf("G4UIQt::   1 connect returnPressed\n");
    194 #endif
    195188#if QT_VERSION < 0x040000
    196189  fCommandArea->setFocusPolicy ( QWidget::StrongFocus );
    … …  
    207200#endif
    208201
    209 #ifdef GEANT4_QT_DEBUG
    210   printf("G4UIQt::   3\n");
    211 #endif
    212202
    213203
    … …  
    219209#endif
    220210
    221 #ifdef GEANT4_QT_DEBUG
    222   printf("G4UIQt::   4\n");
    223 #endif
    224211  layoutBottom->addWidget(fCommandHistoryArea);
    225212  layoutBottom->addWidget(fCommandLabel);
    … …  
    233220
    234221
    235 #ifdef GEANT4_QT_DEBUG
    236   printf("G4UIQt::   5\n");
    237 #endif
    238222  fMainWindow->setCentralWidget(splitter);
    239223
    … …  
    250234  fMainWindow->menuBar()->insertItem( QString("&Help"), helpMenu );
    251235
    252 #ifdef GEANT4_QT_DEBUG
    253   printf("G4UIQt::   6\n");
    254 #endif
    255236
    256237#else
    … …  
    263244  QMenu *helpMenu = fMainWindow->menuBar()->addMenu("Help");
    264245  helpMenu->addAction("Show Help", this, SLOT(ShowHelpCallback()));
    265 #endif
    266 #ifdef GEANT4_QT_DEBUG
    267   printf("G4UIQt::   7\n");
    268246#endif
    269247
    … …  
    279257    splitter->setSizes(vals);
    280258  }
    281 #ifdef GEANT4_QT_DEBUG
    282   printf("G4UIQt::   8\n");
    283 #endif
    284259
    285260  if(UI!=NULL) UI->SetCoutDestination(this);  // TO KEEP
    … …  
    448423  fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum());
    449424#endif
    450   // Slow down everything : disababled
    451425  interactorManager->FlushAndWaitExecution();
    452426  return 0;
    … …  
    609583
    610584#if QT_VERSION < 0x040000
    611 #ifdef GEANT4_QT_DEBUG
    612   printf("G4UIQt::QTextEdit 1\n");
    613 #endif
    614585    fHelpArea = new QTextEdit(splitter);
    615 #ifdef GEANT4_QT_DEBUG
    616   printf("G4UIQt::end 1\n");
    617 #endif
    618 #else
    619 #ifdef GEANT4_QT_DEBUG
    620   printf("G4UIQt::QTextEdit 2\n");
    621 #endif
     586#else
    622587    fHelpArea = new QTextEdit();
    623 #ifdef GEANT4_QT_DEBUG
    624   printf("G4UIQt::end 2\n");
    625 #endif
    626588#endif
    627589    fHelpArea->setReadOnly(true);
    … …  
    12121174)
    12131175{
    1214 
    12151176#if QT_VERSION < 0x040000
    12161177  G4String ss = G4String(aCommand.ascii());
    … …  
    13161277  if (!fCommandHistoryArea)
    13171278    return ;
     1279
    13181280 
    13191281#if QT_VERSION < 0x040000

  • trunk/geant4/interfaces/basic/src/G4UIQt_moc.cc

    r624 r632  
    33**
    44** Created: Tue Nov 13 18:13:09 2007
    5 **      by: The Qt MOC ($Id: G4UIQt_moc.cc,v 1.8 2007/11/15 18:24:28 lgarnier Exp $)
     5**      by: The Qt MOC ($Id: G4UIQt_moc.cc,v 1.9 2007/11/30 14:28:50 lgarnier Exp $)
    66**
    77** WARNING! All changes made in this file will be lost!

  • trunk/geant4/interfaces/common/src/G4Qt.cc

    r617 r632  
    3232#if defined(G4INTY_BUILD_QT) || defined(G4INTY_USE_QT)
    3333
    34 #define GEANT4_QT_DEBUG
    35 
    3634#include <stdlib.h>
    3735#include <string.h>
    … …  
    4240
    4341#include <qapplication.h>
    44 #include <qpushbutton.h> // EN TEST
    4542
    4643

  • trunk/geant4/visualization/OpenGL/History

    r631 r632  
    1 $Id: History,v 1.103 2007/11/19 19:45:39 perl Exp $
     1$Id: History,v 1.104 2007/11/30 14:47:30 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2020History file for visualization/OpenGL
    2121-------------------------------------
     22
     2330th November 2007  Laurent Garnier
     24- Improvements for Qt3
     25- moc files : Adding other versions for QT_MOC_REVISION 28,58 and
     26   59, but this is not the right solution..
    2227
    232819th November 2007  Joseph Perl (for Laurent Garnier) (opengl-V09-00-04)

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

    r612 r632  
    2525//
    2626//
    27 // $Id: G4OpenGLQtViewer.hh,v 1.4 2007/11/13 17:48:51 lgarnier Exp $
     27// $Id: G4OpenGLQtViewer.hh,v 1.5 2007/11/30 14:47:30 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

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

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

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

    r631 r632  
    2525//
    2626//
    27 // $Id: G4OpenGLQtViewer.cc,v 1.7 2007/11/15 18:24:28 lgarnier Exp $
     27// $Id: G4OpenGLQtViewer.cc,v 1.8 2007/11/30 14:47:30 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    3636#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    3737
    38 #define GEANT4_QT_DEBUG
     38//#define GEANT4_QT_DEBUG
    3939
    4040#include "G4OpenGLQtViewer.hh"
    … …  
    228228  GLWindow->resize(300, 300);
    229229  GLWindow->move(900,300);
    230 #ifdef GEANT4_QT_DEBUG
    231   printf("G4OpenGLQtViewer::Should show glWidget\n");
    232 #endif
    233230  GLWindow->show();
    234231 
    … …  
    363360
    364361  QMenu *mRepresentation = mStyle->addMenu("&Representation");
    365  QAction *polyhedron = mRepresentation->addAction("Polyhedron");
     362  QAction *polyhedron = mRepresentation->addAction("Polyhedron");
    366363  QAction *nurbs = mRepresentation->addAction("NURBS");
    367364#endif
    … …  
    385382  fDrawingWireframe = new QPopupMenu(mDrawing);
    386383  mDrawing->insertItem("&Wireframe",fDrawingWireframe);
    387 #ifdef GEANT4_QT_DEBUG
    388   printf("G4OpenGLQtViewer:: fDrawingWireframe creation\n");
    389 #endif
    390384
    391385  mDrawing->setCheckable(true);

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

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

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

    r616 r632  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredQt.cc,v 1.3 2007/11/15 18:24:28 lgarnier Exp $
     27// $Id: G4OpenGLStoredQt.cc,v 1.4 2007/11/30 14:47:30 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    3333#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    3434
    35 #define GEANT4_QT_DEBUG
     35//#define GEANT4_QT_DEBUG
    3636
    3737#include "G4VisFeaturesOfOpenGL.hh"

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

    r621 r632  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.6 2007/11/15 18:24:28 lgarnier Exp $
     27// $Id: G4OpenGLStoredQtViewer.cc,v 1.7 2007/11/30 14:47:30 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    3434#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    3535
    36 #define GEANT4_QT_DEBUG
     36//#define GEANT4_QT_DEBUG
    3737
    3838#include "G4OpenGLStoredQtViewer.hh"

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

    r631 r632  
    2626//
    2727// $Id: G4OpenGLViewer.cc,v 1.34 2007/05/24 18:27:13 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/geant4/visualization/management/History

    r631 r632  
    1 $Id: History,v 1.103 2007/11/16 20:34:17 perl Exp $
     1$Id: History,v 1.104 2007/11/30 14:47:30 lgarnier Exp $
    22
    33-------------------------------------------------------------------
    … …  
    2626History file for visualization management sub-category
    2727------------------------------------------------------
     28
     2930th November 2007  Laurent Garnier
     30- G4VisExecutive.icc : Add a #ifdef G4VIS_USE_DAWN directive in order
     31 not to add a 'new G4DAWNFILE' if G4VIS_USE_DAWN is not set
     32#endif
    2833
    293416th November 2007  Joseph Perl  (visman-V09-00-02)

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

    r612 r632  
    2525//
    2626//
    27 // $Id: G4VisExecutive.icc,v 1.17 2007/11/09 15:03:22 lgarnier Exp $
     27// $Id: G4VisExecutive.icc,v 1.18 2007/11/30 14:47:30 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

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

    r610 r632  
    561561
    562562void G4VisManager::CreateSceneHandler (G4String name) {
    563   printf("G4VisManager::Initialise OK\n");
    564563  if (!fInitialised) Initialise ();
    565   printf("G4VisManager::Initialise OK END\n");
    566564  if (fpGraphicsSystem) {
    567565    G4VSceneHandler* pSceneHandler =
    … …  
    585583void G4VisManager::CreateViewer (G4String name) {
    586584
    587     printf("G4VisManager::Initialise OK\n");
    588585  if (!fInitialised) Initialise ();
    589 
    590   if (fpSceneHandler)
    591     printf("G4VisManager::CreateViewer OK\n");
    592   else
    593     printf("G4VisManager::CreateViewer NO SCENE HANDLER\n");
    594586
    595587  if (fpSceneHandler) {
Note: See TracChangeset for help on using the changeset viewer.