Changeset 595


Ignore:
Timestamp:
Nov 9, 2007, 3:32:58 PM (17 years ago)
Author:
garnier
Message:

r629@mac-90108: laurentgarnier | 2007-11-09 15:34:57 +0100
mise a jour

Location:
trunk/geant4
Files:
14 edited

Legend:

Unmodified
Added
Removed

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

    r593 r595  
    3838#include "G4VInteractiveSession.hh"
    3939
    40 #include <QtCore/QObject>
     40#include <qobject.h>
    4141
    4242class QMainWindow;

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

    r593 r595  
    4646#include "G4Qt.hh"
    4747
    48 #include <QtGui/QApplication.h>
    49 #include <QtGui/QMainWindow.h>
    50 #include <QtGui/QLineEdit.h>
    51 #include <QtGui/QWidget.h>
    52 #include <QtGui/QMenu.h>
    53 #include <QtGui/QMenuBar.h>
    54 #include <QtGui/QBoxLayout.h>
    55 #include <QtGui/QPushButton.h>
    56 #include <QtGui/QLabel.h>
    57 #include <QtGui/QSplitter.h>
    58 #include <QtGui/QScrollBar.h>
    59 #include <QtGui/QDialog.h>
    60 #include <QtGui/QEvent.h>
    61 #include <QtGui/QListWidget.h>
    62 #include <QtGui/QTextEdit.h>
    63 #include <QtGui/QTreeWidget.h>
    64 #include <QtCore/QSignalMapper.h>
     48#include <qapplication.h>
     49#include <qmainwindow.h>
     50#include <qlineedit.h>
     51#include <qwidget.h>
     52#include <qmenu.h>
     53#include <qmenubar.h>
     54#include <qboxlayout.h>
     55#include <qpushbutton.h>
     56#include <qlabel.h>
     57#include <qsplitter.h>
     58#include <qscrollbar.h>
     59#include <qdialog.h>
     60#include <qevent.h>
     61#include <qlistwidget.h>
     62#include <qtextedit.h>
     63#include <qtreewidget.h>
     64#include <qsignalmapper.h>
    6565
    6666
    … …  
    806806)
    807807{
    808   printf("G4UIQt::HelpTreeClicCallback");
     808  //  printf("G4UIQt::HelpTreeClicCallback");
    809809  QTreeWidgetItem* item =  NULL;
    810810  if (!fHelpTreeWidget)

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

    r593 r595  
    3939#include "G4Qt.hh"
    4040
    41 #include <QtGui/QApplication.h>
     41#include <qapplication.h>
    4242
    4343
    … …  
    146146/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
    147147{
    148   printf("G4Qt::FlushAndWaitExecution ::  Flush ....\n");
     148  //  printf("G4Qt::FlushAndWaitExecution ::  Flush ....\n");
    149149  if(!qApp) return;
    150150  qApp->processEvents();

  • trunk/geant4/specific-geant4-dev.sh

    r592 r595  
    2727  export G4RADIOACTIVEDATA=$G4DATA/RadiativeDecay
    2828  export G4LEDATA=$G4DATA/G4EMLOW3.0
     29  export QTHOME=/usr/local/Qt/4.3.0
    2930  #//////////////////////////////////////////////////////////
    3031  # GUI, Visualization :

  • trunk/geant4/visualization/G4History.macro

    r593 r595  
    2929/gui/addButton vis Vis3(OGLSX) "/control/execute visTutor/exN03Vis3.mac"
    3030/gui/addButton vis Vis4(OGLIX) "/control/execute visTutor/exN03Vis4.mac"
     31/gui/addButton vis Vis12(OGLIQT) "/control/execute visTutor/exN03Vis12.mac"
     32/gui/addButton vis Vis14(OGLSQT) "/control/execute visTutor/exN03Vis14.mac"
    3133/gui/addButton vis Vis5(OIX) "/control/execute visTutor/exN03Vis5.mac"
    3234/gui/addButton vis Vis6(VRML2FILE) "/control/execute visTutor/exN03Vis6.mac"

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

    r593 r595  
    4141#include "G4OpenGLQtViewer.hh"
    4242
    43 #include <QtOpenGL/QGLWidget>
     43#include <qgl.h> // include <qglwidget.h>
    4444
    4545#include "globals.hh"

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

    r593 r595  
    3535#define G4OPENGLQTEXPORTDIALOG_HH
    3636
    37 #include <QtGui/QDialog.h>
     37#include <qdialog.h>
    3838
    3939class QButtonGroup;

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

    r593 r595  
    4242#include "G4OpenGLSceneHandler.hh"
    4343
    44 #include <QtCore/QObject>
    45 #include <QtCore/QPoint>
     44#include <qobject.h>
     45#include <qpoint.h>
    4646
    4747class QGLWidget;

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

    r593 r595  
    4141#include "G4OpenGLQtViewer.hh"
    4242
    43 #include <QtOpenGL/QGLWidget>
     43#include <qgl.h>  // include qglwidget
    4444
    4545class QMouseEvent;

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

    r593 r595  
    3434#include "G4OpenGLQtExportDialog.hh"
    3535
    36 #include <QtCore/QVariant.h>
    37 #include <QtGui/QPushButton.h>
    38 #include <QtGui/QCheckBox.h>
    39 #include <QtGui/QLabel.h>
    40 #include <QtGui/QComboBox.h>
    41 #include <QtGui/QSlider.h>
    42 #include <QtGui/QLayout.h>
    43 #include <QtGui/QGroupBox.h>
    44 #include <QtGui/QRadioButton.h>
    45 #include <QtGui/QImage.h>
    46 #include <QtGui/QLineEdit.h>
     36#include <qvariant.h>
     37#include <qpushbutton.h>
     38#include <qcheckbox.h>
     39#include <qlabel.h>
     40#include <qcombobox.h>
     41#include <qslider.h>
     42#include <qlayout.h>
     43#include <qgroupbox.h>
     44#include <qradiobutton.h>
     45#include <qimage.h>
     46#include <qlineedit.h>
    4747
    4848G4OpenGLQtExportDialog::G4OpenGLQtExportDialog(

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

    r593 r595  
    5050#include "G4UIsession.hh"
    5151#include "G4UImanager.hh"
    52 #include <QtGui/QApplication.h>
    53 #include <QtGui/QBoxLayout.h>
    54 #include <QtGui/QDialog.h>
    55 #include <QtGui/QMenu.h>
    56 #include <QtGui/QImageWriter>
    57 #include <QtGui/QMessageBox>
    58 #include <QtGui/QFileDialog.h>
    59 #include <QtGui/QPrinter.h>
    60 #include <QtGui/QPainter.h>
    61 #include <QtOpenGL/QGLWidget>
    62 #include <QtGui/QDialog>
    63 #include <QtGui/QContextMenuEvent>
    64 #include <QtGui/QMenu>
    65 #include <QtGui/QImage>
     52#include <qapplication.h>
     53#include <qboxLayout.h>
     54#include <qdialog.h>
     55#include <qmenu.h>
     56#include <qimagewriter.h>
     57#include <qmessagebox.h>
     58#include <qfiledialog.h>
     59#include <qprinter.h>
     60#include <qpainter.h>
     61#include <qgl.h> // include <qglwidget.h>
     62#include <qdialog.h>
     63#include <qevent.h> //include <qcontextmenuevent.h>
     64#include <qmenu.h>
     65#include <qimage.h>
    6666
    6767

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

    r593 r595  
    4848{
    4949  G4OpenGLViewerMessenger::GetInstance();
     50  printf("G4OpenGLStoredQt::Create  \n");
    5051}
    5152

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

    r593 r595  
    3939#include "G4ios.hh"
    4040
    41 #include <QtGui/QMouseEvent>
    42 #include <QtGui/QContextMenuEvent>
     41//#include <qmouseevent.h>
     42#include <qevent.h> // include <qcontextmenuevent.h>
    4343
    4444G4OpenGLStoredQtViewer::G4OpenGLStoredQtViewer

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

    r593 r595  
    3939#include "G4ASCIITree.hh"
    4040#include "G4DAWNFILE.hh"
    41 #include "G4GAGTree.hh"
    4241#include "G4HepRep.hh"
    4342#include "G4HepRepFile.hh"
    … …  
    9998  RegisterGraphicsSystem (new G4ASCIITree);
    10099  RegisterGraphicsSystem (new G4DAWNFILE);
    101   RegisterGraphicsSystem (new G4GAGTree);
    102100  RegisterGraphicsSystem (new G4HepRep);
    103101  RegisterGraphicsSystem (new G4HepRepFile);
Note: See TracChangeset for help on using the changeset viewer.