Changeset 704


Ignore:
Timestamp:
Jan 30, 2008, 12:41:47 PM (16 years ago)
Author:
garnier
Message:

update sur cvs

Location:
trunk/geant4
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/interfaces/History

    r688 r704  
    1 $Id: History,v 1.93 2008/01/15 11:04:26 lgarnier Exp $
     1$Id: History,v 1.94 2008/01/30 11:16:17 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1818     ----------------------------------------------------------
    1919
    20 15th Janvier 2007, Laurent Garnier
     2030th January 2007, Laurent Garnier
     21 - Add a search area in the help widget
     22
     2315th January 2007, Laurent Garnier
    2124 - Fixed some layout problems
    2225 - GNUmakefile : Added a macro for moc file

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

    r697 r704  
    2525//
    2626//
    27 // $Id: G4UIQt.hh,v 1.10 2008/01/15 11:04:26 lgarnier Exp $
     27// $Id: G4UIQt.hh,v 1.11 2008/01/30 11:16:17 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    7575//
    7676// Class description - end :
    77 
    7877
    7978class G4UIQt : public QObject, public G4VBasicShell, public G4VInteractiveSession {

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

    r700 r704  
    2525//
    2626//
    27 // $Id: G4UIQt.cc,v 1.14 2008/01/15 11:04:26 lgarnier Exp $
     27// $Id: G4UIQt.cc,v 1.15 2008/01/30 11:16:17 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    3030// L. Garnier
    3131
    32 #define GEANT4_QT_DEBUG
     32//#define GEANT4_QT_DEBUG
    3333
    3434#ifdef G4UI_BUILD_QT_SESSION

  • trunk/geant4/visualization/OpenGL/History

    r688 r704  
    1 $Id: History,v 1.106 2008/01/15 11:05:08 lgarnier Exp $
     1$Id: History,v 1.108 2008/01/30 11:16:42 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2121-------------------------------------
    2222
    23 15th Janvier 2007, Laurent Garnier
     2330th January 2007, Laurent Garnier
     24 - Add moving camera on left/right/up/down arrown, going forward/backward
     25   on SHIFT+up/down, zoom in with +/- keys
     26 - Add a context menu entry for projection perspective/orthographic
     27 - Fix some bugs on windows in export dialog
     28
     2915th January 2007, Laurent Garnier
    2430 - Fixed some layout problems on export dialog box
    2531 - Some improvements on exports formats

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

    r694 r704  
    2525//
    2626//
    27 // $Id: G4OpenGLQtExportDialog.hh,v 1.4 2008/01/15 11:05:08 lgarnier Exp $
     27// $Id: G4OpenGLQtExportDialog.hh,v 1.5 2008/01/30 10:54:13 lgarnier Exp $
    2828// GEANT4 tag $Name:
    2929//

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

    r702 r704  
    2525//
    2626//
    27 // $Id: G4OpenGLQtViewer.hh,v 1.6 2008/01/15 11:05:08 lgarnier Exp $
     27// $Id: G4OpenGLQtViewer.hh,v 1.7 2008/01/30 10:54:13 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    157157  void toggleHaloing(bool);
    158158  void toggleAux(bool);
    159   void toggleFullScreen(bool);
     159  void toggleFullScreen();
    160160  // Only use for Qt>4.0
    161161  void dialogClosed();

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLSceneHandler.icc

    r593 r704  
    2525//
    2626//
    27 // $Id: G4OpenGLSceneHandler.icc,v 1.7 2006/06/29 21:17:58 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-00-ref-01 $
     27// $Id: G4OpenGLSceneHandler.icc,v 1.8 2008/01/30 10:54:13 lgarnier Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r696 r704  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredQtViewer.hh,v 1.4 2008/01/15 11:05:08 lgarnier Exp $
     27// $Id: G4OpenGLStoredQtViewer.hh,v 1.5 2008/01/30 10:54:13 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

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

    r696 r704  
    2525//
    2626//
    27 // $Id: G4OpenGLQtExportDialog.cc,v 1.5 2008/01/15 11:05:08 lgarnier Exp $
     27// $Id: G4OpenGLQtExportDialog.cc,v 1.6 2008/01/30 10:54:13 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    3030//
    3131
    32 #define GEANT4_QT_DEBUG
     32//#define GEANT4_QT_DEBUG
    3333#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    3434

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

    r703 r704  
    2525//
    2626//
    27 // $Id: G4OpenGLQtViewer.cc,v 1.9 2008/01/15 11:05:08 lgarnier Exp $
     27// $Id: G4OpenGLQtViewer.cc,v 1.10 2008/01/30 10:54:13 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"
    … …  
    768768  QAction *fullOff = mFullScreen->addAction("Off");
    769769#endif
    770   createRadioAction(fullOn,fullOff,SLOT(toggleFullScreen(bool)),2);
     770  createRadioAction(fullOn,fullOff,SLOT(toggleFullScreen()),2);
    771771#endif
    772772
    … …  
    12341234/**
    12351235   SLOT Activate by a click on the full screen menu
    1236 @param check : 1 , 0
    1237 */
    1238 void G4OpenGLQtViewer::toggleFullScreen(bool check) {
     1236*/
     1237void G4OpenGLQtViewer::toggleFullScreen() {
    12391238#if QT_VERSION >= 0x030200
    12401239  GLWindow->setWindowState(GLWindow->windowState() ^ Qt::WindowFullScreen);
    … …  
    18191818  holdKeyEvent = true;
    18201819
    1821   if ((event->key() == Qt::Key_Down) && (event->modifiers() & Qt::ShiftModifier)) // go backward
     1820  if (event->key() == Qt::Key_Escape) { // escaped from full screen
     1821    toggleFullScreen();
     1822   
     1823  }  else if ((event->key() == Qt::Key_Down) && (event->modifiers() & Qt::ShiftModifier)) // go backward
    18221824    {
    18231825      G4MouseMoveEvent(0,0,1);
    … …  
    18791881}
    18801882*/
    1881 

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

    r702 r704  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.8 2008/01/15 11:05:08 lgarnier Exp $
     27// $Id: G4OpenGLStoredQtViewer.cc,v 1.9 2008/01/30 10:54:13 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"
    … …  
    365365
    366366#endif
    367 

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

    r632 r704  
    9797  // Graphics Systems not needing external packages or libraries...
    9898  RegisterGraphicsSystem (new G4ASCIITree);
    99 #ifdef G4VIS_USE_DAWN
    100 //  RegisterGraphicsSystem (new G4DAWNFILE);
    101 #endif
     99  RegisterGraphicsSystem (new G4DAWNFILE);
    102100  RegisterGraphicsSystem (new G4HepRep);
    103101  RegisterGraphicsSystem (new G4HepRepFile);
Note: See TracChangeset for help on using the changeset viewer.