Changeset 873 for trunk


Ignore:
Timestamp:
Oct 30, 2008, 5:47:35 PM (16 years ago)
Author:
garnier
Message:

Update in code, try to mutualise everything between Stored and immediate Qt Viewers

Location:
trunk/source/visualization/OpenGL
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/OpenGL/History

    r866 r873  
    1 $Id: History,v 1.118 2008/10/15 10:33:27 lgarnier Exp $
     1$Id: History,v 1.119 2008/10/24 13:49:19 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2020History file for visualization/OpenGL
    2121-------------------------------------
     22
     2324 October, Laurent Garnier
     24 - Change GEANT4_QT_DEBUG flag by QTDEBUG
     25 - Suppress unuseful DEBUG messages
    2226
    232712th October Laurent Garnier

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

    r850 r873  
    6262  void updateQWidget();
    6363
    64 private :
    65   int readyToPaint;
    66   int nbPaint;
     64protected:
     65  void wheelEvent(QWheelEvent *event);
     66  void mousePressEvent(QMouseEvent *event);
     67  void mouseMoveEvent(QMouseEvent *event);
     68  void mouseDoubleClickEvent(QMouseEvent *event);
     69  void mouseReleaseEvent(QMouseEvent *event);
     70  void contextMenuEvent(QContextMenuEvent *e);
     71  void keyPressEvent (QKeyEvent * event);
    6772};
    6873

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

    r866 r873  
    106106  void CreateGLQtContext ();
    107107  virtual void CreateMainWindow (QGLWidget*,QString);
    108   void manageContextMenuEvent(QContextMenuEvent *e);
    109 #if QT_VERSION < 0x040000
    110   void G4MousePressEvent(QPoint);
    111 #else
    112   void G4MousePressEvent(QPoint);
    113 #endif
     108  void G4resizeGL(int, int);
     109  void G4manageContextMenuEvent(QContextMenuEvent *e);
     110  void G4MousePressEvent(QMouseEvent *event);
    114111  void G4MouseReleaseEvent();
    115   void G4MouseDoubleClickEvent(QPoint p);
    116 #if QT_VERSION < 0x040000
    117   void G4MouseMoveEvent(int, int, Qt::ButtonState);
    118 #else
    119   void G4MouseMoveEvent(int, int, Qt::MouseButtons);
    120 #endif
     112  void G4MouseDoubleClickEvent();
     113  void G4MouseMoveEvent(QMouseEvent *event);
    121114  void G4wheelEvent (QWheelEvent * event);
    122115  void G4keyPressEvent (QKeyEvent * event);
    … …  
    124117  void rotateQtCamera(float, float);
    125118  void moveScene(float, float, float,bool);
     119  void FinishView();
    126120
    127121
    … …  
    140134  float fDeltaRotationAngleY;
    141135  float fDeltaRotationAngleZ;
     136
     137  bool hasToRepaint;
     138  bool readyToPaint;
     139  bool zoomAction;
     140  QPoint beginZoom;
     141  QPoint endZoom;
    142142
    143143private:

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

    r850 r873  
    5959  void initializeGL ();
    6060  void DrawView ();
    61   void FinishView ();
    6261  void resizeGL(int width,int height);
    6362  void paintGL();
    … …  
    7372  void keyPressEvent (QKeyEvent * event);
    7473
    75 private :
    76   bool hasToRepaint;
    77   bool readyToPaint;
    78   bool zoomAction;
    79   int nbPaint;
    80   QPoint beginZoom;
    81   QPoint endZoom;
    8274  //  QImage glBufferImage;
    8375};

  • trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQt.cc

    r866 r873  
    2525//
    2626//
    27 // $Id: G4OpenGLImmediateQt.cc,v 1.3 2008/10/15 10:26:25 lgarnier Exp $
     27// $Id: G4OpenGLImmediateQt.cc,v 1.4 2008/10/24 13:49:19 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    5858G4VViewer* G4OpenGLImmediateQt::CreateViewer
    5959(G4VSceneHandler& scene, const G4String& name) {
    60 #ifdef GEANT4_QT_DEBUG
     60#ifdef G4DEBUG
    6161  printf("G4OpenGLImmediateQt::CreateViewer \n");
    6262#endif
    … …  
    7878      " new G4OpenGLImmediateQtViewer." << G4endl;
    7979  }
    80 #ifdef GEANT4_QT_DEBUG
     80#ifdef G4DEBUG
    8181  printf("G4OpenGLImmediateQt::CreateViewer END \n");
    8282#endif

  • trunk/source/visualization/OpenGL/src/G4OpenGLImmediateQtViewer.cc

    r866 r873  
    2525//
    2626//
    27 // $Id: G4OpenGLImmediateQtViewer.cc,v 1.5 2008/10/15 10:24:04 lgarnier Exp $
     27// $Id: G4OpenGLImmediateQtViewer.cc,v 1.6 2008/10/24 13:49:19 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    3535
    3636#include "G4OpenGLImmediateQtViewer.hh"
    37 #include "G4VisManager.hh"
    3837
    3938#include "G4ios.hh"
    … …  
    4241(G4OpenGLImmediateSceneHandler& sceneHandler,
    4342 const G4String&  name):
    44  G4VViewer (sceneHandler, sceneHandler.IncrementViewCount (), name),
    45  G4OpenGLViewer (sceneHandler),
    46  G4OpenGLQtViewer (sceneHandler),
    47  G4OpenGLImmediateViewer (sceneHandler),
    48  QGLWidget()                      // FIXME : gerer le pb du parent !
    49  {
    50    nbPaint =0;
     43  G4VViewer (sceneHandler, sceneHandler.IncrementViewCount (), name),
     44  G4OpenGLViewer (sceneHandler),
     45  G4OpenGLQtViewer (sceneHandler),
     46  G4OpenGLImmediateViewer (sceneHandler)
     47{
     48
     49  //set true to picking
     50  fVP.SetPicking(true);
     51#if QT_VERSION < 0x040000
     52  setFocusPolicy(QWidget::StrongFocus); // enable keybord events
     53#else
     54  setFocusPolicy(Qt::StrongFocus); // enable keybord events
     55#endif
     56  hasToRepaint =false;
     57
    5158  if (fViewId < 0) return;  // In case error in base class instantiation.
    5259}
    5360
    5461G4OpenGLImmediateQtViewer::~G4OpenGLImmediateQtViewer() {
    55 #ifdef GEANT4_QT_DEBUG
    56    printf("GLWidget::~GLWidget \n");
    57 #endif
    58      makeCurrent();
    59 #ifdef GEANT4_QT_DEBUG
    60    printf("GLWidget::~GLWidget END\n");
    61 #endif
     62  makeCurrent();
    6263}
    6364
    6465void G4OpenGLImmediateQtViewer::Initialise() {
    65 #ifdef GEANT4_QT_DEBUG
    66    printf("GLWidget::Initialise \n");
    67 #endif
    68 #ifdef GEANT4_QT_DEBUG
    69    printf("readyToPaint = false \n");
    70 #endif
    71    readyToPaint = false;
    72    CreateGLQtContext ();
    73 #ifdef GEANT4_QT_DEBUG
    74    printf("G4OpenGLImmediateQtViewer::Initialise () 2\n");
    75 #endif
    76 
    77    CreateMainWindow (this,QString(fName));
    78 #ifdef GEANT4_QT_DEBUG
    79   printf("G4OpenGLImmediateQtViewer::Initialise () 3\n");
    80 #endif
    81 
    82   CreateFontLists ();  // FIXME Does nothing!
    83  
    84 #ifdef GEANT4_QT_DEBUG
    85   printf("readyToPaint = true \n");
    86 #endif
     66#ifdef G4DEBUG
     67  printf("G4OpenGLImmediateQtViewer::Initialise \n");
     68#endif
     69  readyToPaint = false;
     70  CreateMainWindow (this,QString(fName));
     71  CreateFontLists ();
     72
    8773  readyToPaint = true;
    88  
    89   // First Draw
     74}
     75
     76void G4OpenGLImmediateQtViewer::initializeGL () {
     77
     78  InitializeGLView ();
     79
     80#ifdef G4DEBUG
     81  printf("G4OpenGLImmediateQtViewer::InitialiseGL ()\n");
     82#endif
     83
     84  // If a double buffer context has been forced upon us, ignore the
     85  // back buffer for this OpenGLImmediate view.
     86  //   glDrawBuffer (GL_FRONT); // FIXME : Ne marche pas avec cette ligne, mais affiche le run correctement...
     87  // clear the buffers and window.
     88  ClearView ();
     89  FinishView ();
     90
     91  glDepthFunc (GL_LEQUAL);
     92  glDepthMask (GL_TRUE);
     93
     94  if (fSceneHandler.GetScene() == 0) {
     95    hasToRepaint =false;
     96  } else {
     97    hasToRepaint =true;
     98  }
     99
     100#ifdef G4DEBUG
     101  printf("G4OpenGLImmediateQtViewer::InitialiseGL END\n");
     102#endif
     103}
     104
     105
     106void G4OpenGLImmediateQtViewer::DrawView () {
     107
     108#ifdef G4DEBUG
     109  printf("G4OpenGLImmediateQtViewer::DrawView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
     110#endif
     111  // If a double buffer context has been forced upon us, ignore the
     112  // back buffer for this OpenGLImmediate view.
     113  //  glDrawBuffer (GL_FRONT);
     114
     115  G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
     116
     117  //Make sure current viewer is attached and clean...
     118  //Qt version needed
     119  glViewport (0, 0, WinSize_x, WinSize_y);
     120
     121  if(style!=G4ViewParameters::hlr &&
     122     haloing_enabled) {
     123
     124    HaloingFirstPass ();
     125    NeedKernelVisit ();
     126    ProcessView ();
     127    glFlush ();
     128#ifdef G4DEBUG
     129  printf("G4OpenGLImmediateQtViewer::DrawView First ProcessView ok\n");
     130#endif
     131    HaloingSecondPass ();
     132
     133  }
     134
     135#ifdef G4DEBUG
     136  printf("G4OpenGLImmediateQtViewer::DrawView before needKernelVisit %d\n",fNeedKernelVisit);
     137#endif
     138  NeedKernelVisit ();  // Always need to visit G4 kernel.
     139#ifdef G4DEBUG
     140  printf("G4OpenGLImmediateQtViewer::DrawView before ProcessView\n");
     141#endif
     142  ProcessView ();
     143#ifdef G4DEBUG
     144  printf("G4OpenGLImmediateQtViewer::DrawView before FinishView ok\n");
     145#endif
     146  FinishView ();
     147
     148  if (isRecording()) {
     149    savePPMToTemp();
     150  }
     151   
     152#ifdef G4DEBUG
     153  printf("G4OpenGLImmediateQtViewer::DrawView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
     154#endif
     155  hasToRepaint = true;
     156}
     157
     158void G4OpenGLImmediateQtViewer::FinishView()
     159{
     160   glFlush ();
     161}
     162
     163
     164/**
     165   - Lors du resize de la fenetre, on doit non pas redessiner le detecteur, mais aussi les evenements
     166*/
     167void G4OpenGLImmediateQtViewer::resizeGL(
     168                                         int aWidth
     169                                         ,int aHeight)
     170{ 
     171  G4resizeGL(aWidth,aHeight);
     172}
     173
     174
     175void G4OpenGLImmediateQtViewer::paintGL()
     176{
     177#ifdef G4DEBUG
     178  printf("\n\nG4OpenGLImmediateQtViewer::paintGL ??\n");
     179#endif
     180  if (!readyToPaint) {
     181    readyToPaint= true;
     182    return;
     183  }
     184  // DO NOT RESIZE IF SIZE HAS NOT CHANGE
     185  if ( !hasToRepaint) {
     186    if (((WinSize_x == (G4int)width())) &&(WinSize_y == (G4int) height())) {
     187      return;
     188    }
     189  }
     190#ifdef G4DEBUG
     191  printf("G4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint);
     192#endif
     193  WinSize_x = (G4int) width();
     194  WinSize_y = (G4int) height();
     195
     196  setupViewport(width(),height());
     197
    90198  SetView();
    91 #ifdef GEANT4_QT_DEBUG
    92   printf("    ClearView\n");
    93 #endif
     199   
    94200  ClearView (); //ok, put the background correct
    95   ShowView();
    96   FinishView();
    97 }
    98 
    99 void G4OpenGLImmediateQtViewer::initializeGL () {
    100 
    101    InitializeGLView ();
    102 
    103 #ifdef GEANT4_QT_DEBUG
    104    printf("G4OpenGLImmediateQtViewer::InitialiseGL () 1\n");
    105 #endif
    106 
    107    // If a double buffer context has been forced upon us, ignore the
    108    // back buffer for this OpenGLImmediate view.
    109    glDrawBuffer (GL_FRONT); // FIXME : Ne marche pas avec cette ligne, mais affiche le run correctement...
    110    // clear the buffers and window.
    111    ClearView ();
    112 #ifdef GEANT4_QT_DEBUG
    113    //   printf("G4OpenGLImmediateQtViewer::InitialiseGL () 2\n");
    114 #endif
    115    FinishView ();
    116    
    117 
    118 
    119    glDepthFunc (GL_LEQUAL);
    120    glDepthMask (GL_TRUE);
    121 
    122 #ifdef GEANT4_QT_DEBUG
    123    printf("G4OpenGLImmediateQtViewer::InitialiseGL  -------------------------------------------------------------------------------------\n");
    124 #endif
    125 }
    126 
    127 
    128 void G4OpenGLImmediateQtViewer::DrawView () {
    129 
    130 #ifdef GEANT4_QT_DEBUG
    131   printf("G4OpenGLImmediateQtViewer::DrawView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
    132 #endif
    133    // If a double buffer context has been forced upon us, ignore the
    134    // back buffer for this OpenGLImmediate view.
    135   glDrawBuffer (GL_FRONT);
    136 
    137    G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
    138 
    139    //Make sure current viewer is attached and clean...
    140    //Qt version needed
    141    //   glViewport (0, 0, WinSize_x, WinSize_y);
    142 
    143    if(style!=G4ViewParameters::hlr &&
    144       haloing_enabled) {
    145 #ifdef GEANT4_QT_DEBUG
    146      printf("G4OpenGLImmediateQtViewer::DrawView DANS LE IF\n");
    147 #endif
    148 
    149      HaloingFirstPass ();
    150      NeedKernelVisit ();
    151      ProcessView ();
    152      glFlush ();
    153 
    154      HaloingSecondPass ();
    155 
    156    }
    157 
    158    NeedKernelVisit ();  // Always need to visit G4 kernel.
    159    ProcessView ();
    160    FinishView ();
    161 #ifdef GEANT4_QT_DEBUG
    162   printf("G4OpenGLImmediateQtViewer::DrawView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
    163 #endif
    164   readyToPaint = false;
    165 }
    166 
    167 
    168 //////////////////////////////////////////////////////////////////////////////
    169 void G4OpenGLImmediateQtViewer::FinishView (
    170 )
    171 //////////////////////////////////////////////////////////////////////////////
    172 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
    173 {
    174 #ifdef GEANT4_QT_DEBUG
    175   printf("G4OpenGLImmediateQtViewer::FinishView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n");
    176 #endif
    177 
    178    glFlush ();
    179 #ifdef GEANT4_QT_DEBUG
    180   printf("G4OpenGLImmediateQtViewer::FinishView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
    181 #endif
    182 
    183 }
    184 
     201  DrawView();
     202
     203  hasToRepaint = false; // could be set to false by DrawView
     204
     205
     206#ifdef G4DEBUG
     207  printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n\n\n",readyToPaint);
     208#endif
     209}
     210
     211void G4OpenGLImmediateQtViewer::mousePressEvent(QMouseEvent *event)
     212{
     213  G4MousePressEvent(event);
     214}
     215
     216void G4OpenGLImmediateQtViewer::keyPressEvent (QKeyEvent * event)
     217{
     218  G4keyPressEvent(event);
     219}
     220
     221void G4OpenGLImmediateQtViewer::wheelEvent (QWheelEvent * event)
     222{
     223  G4wheelEvent(event);
     224}
    185225
    186226/**
    187  - Lors du resize de la fenetre, on doit non pas redessiner le detecteur, mais aussi les evenements
     227 * This function was build in order to make a zoom on double clic event.
     228 * It was think to build a rubberband on the zoom area, but never work fine
    188229 */
    189 void G4OpenGLImmediateQtViewer::resizeGL(
    190  int width
    191 ,int height)
    192 { 
    193   setupViewport(width,height);
    194 #ifdef GEANT4_QT_DEBUG
    195   printf("G4OpenGLImmediateQtViewer::resizeGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
    196 #endif
    197 }
    198 
    199 
    200 void G4OpenGLImmediateQtViewer::paintGL()
    201  {
    202    if (!readyToPaint) {
    203      readyToPaint= true;
    204      return;
    205    }
    206    // DO NOT RESIZE IF SIZE HAS NOT CHANGE
    207    if (((WinSize_x == (G4int)width())) &&(WinSize_y == (G4int) height())) {
    208      return;
    209    }
    210    nbPaint++;
    211 #ifdef GEANT4_QT_DEBUG
    212    printf("\n\nG4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV %d ready %d\n",nbPaint,readyToPaint);
    213 #endif
    214    WinSize_x = (G4int) width();
    215    WinSize_y = (G4int) height();
    216 
    217    setupViewport(width(),height());
    218 
    219    SetView();
    220 #ifdef GEANT4_QT_DEBUG
    221 //   //  printf("before ClearView\n");
    222 #endif
    223 #ifdef GEANT4_QT_DEBUG
    224    printf("    ClearView\n");
    225 #endif
    226    
    227    ClearView (); //ok, put the background correct
    228    DrawView();
    229    readyToPaint = true; // could be set to false by DrawView
    230 
    231 
    232 #ifdef GEANT4_QT_DEBUG
    233    printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ %d ready %d\n\n\n",nbPaint,readyToPaint);
    234 #endif
    235  }
     230void G4OpenGLImmediateQtViewer::mouseDoubleClickEvent(QMouseEvent *event)
     231{
     232  G4MouseDoubleClickEvent();
     233}
     234
     235void G4OpenGLImmediateQtViewer::mouseReleaseEvent(QMouseEvent *event)
     236{
     237  G4MouseReleaseEvent();
     238}
     239
     240void G4OpenGLImmediateQtViewer::mouseMoveEvent(QMouseEvent *event)
     241{
     242  G4MouseMoveEvent(event);
     243}
     244
     245
     246void G4OpenGLImmediateQtViewer::contextMenuEvent(QContextMenuEvent *e)
     247{
     248  G4manageContextMenuEvent(e);
     249}
    236250
    237251void G4OpenGLImmediateQtViewer::updateQWidget() {
     252  hasToRepaint= true;
    238253  updateGL();
    239 }
    240 
    241 #endif
     254  hasToRepaint= false;
     255}
     256
     257#endif

  • trunk/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc

    r850 r873  
    209209    fpViewer -> SetView ();
    210210    fpViewer -> ClearView ();
     211    printf("G4OpenGLImmediateSceneHandler::ClearTransientStore----------------------------------------------\n");
    211212    fpViewer -> DrawView ();
    212213  }

  • trunk/source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc

    r850 r873  
    8888void G4OpenGLImmediateXmViewer::DrawView () {
    8989
     90#ifdef G4DEBUG
     91  printf("G4OpenGLImmediateXmViewer::DrawView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
     92#endif
    9093  G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
    9194
    … …  
    101104    ProcessView ();
    102105    glFlush ();
     106#ifdef G4DEBUG
     107  printf("G4OpenGLImmediateXmViewer::DrawView First ProcessView ok\n");
     108#endif
    103109
    104110    HaloingSecondPass ();
    … …  
    106112  }
    107113
     114#ifdef G4DEBUG
     115  printf("G4OpenGLImmediateXmViewer::DrawView before needKernelVisit %d\n",fNeedKernelVisit);
     116#endif
    108117  NeedKernelVisit ();  // Always need to visit G4 kernel.
     118#ifdef G4DEBUG
     119  printf("G4OpenGLImmediateXmViewer::DrawView before ProcessView\n");
     120#endif
    109121  ProcessView ();
     122#ifdef G4DEBUG
     123  printf("G4OpenGLImmediateXmViewer::DrawView before FinishView ok\n");
     124#endif
    110125  FinishView ();
    111126

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

    r850 r873  
    2525//
    2626//
    27 // $Id: G4OpenGLQtExportDialog.cc,v 1.7 2008/03/10 16:57:04 lgarnier Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4OpenGLQtExportDialog.cc,v 1.9 2008/10/24 14:17:10 lgarnier Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    3131
    32 //#define GEANT4_QT_DEBUG
    3332#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    3433

  • trunk/source/visualization/OpenGL/src/G4OpenGLQtMovieDialog.cc

    r857 r873  
    2525//
    2626//
    27 // $Id: G4OpenGLQtMovieDialog.cc,v 1.6 2008/03/14 09:22:31 lgarnier Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4OpenGLQtMovieDialog.cc,v 1.8 2008/10/24 13:49:19 lgarnier Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    3131
    32 //#define GEANT4_QT_DEBUG
    3332#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    3433

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

    r866 r873  
    3636#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    3737
    38 //#define GEANT4_QT_DEBUG
    39 
    4038#include "G4OpenGLQtViewer.hh"
    4139
    … …  
    8886//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
    8987{
    90 #ifdef GEANT4_QT_DEBUG
    91   printf("G4OpenGLQtViewer::SetView ++++++++++++++++++++\n");
    92 #endif
    93   //   if(!fHDC) return;
    94   //   if(!fHGLRC) return;
    95   //   ::wglMakeCurrent(fHDC,fHGLRC);
    96   //  fWindow->makeCurrent();
     88#ifdef G4DEBUG
     89  printf("G4OpenGLQtViewer::SetView\n");
     90#endif
    9791  G4OpenGLViewer::SetView ();
    98 #ifdef GEANT4_QT_DEBUG
    99   printf("G4OpenGLQtViewer::SetView --------------------\n");
    100 #endif
    10192}
    10293
    … …  
    126117//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
    127118{
    128 #ifdef GEANT4_QT_DEBUG
    129   printf("G4OpenGLQtViewer::ShowView  +++++++++++++++++++++\n");
    130 #endif
    131119  if (!GLWindow) {
    132120    G4cerr << "Visualization window not defined, please choose one before\n" << G4endl;
    … …  
    137125    GLWindow->activateWindow();
    138126#endif
    139 #ifdef GEANT4_QT_DEBUG
    140     printf("G4OpenGLQtViewer::ShowView -----------------------\n");
    141 #endif
    142127  }
    143128  glFlush ();
    144   //   // Empty the Windows message queue :
    145   //   MSG event;
    146   //   while ( ::PeekMessage(&event, NULL, 0, 0, PM_REMOVE) ) {
    147   //     ::TranslateMessage(&event);
    148   //     ::DispatchMessage (&event);
    149   //   }
    150 }
    151 
    152 
    153 
    154 //////////////////////////////////////////////////////////////////////////////
    155 void G4OpenGLQtViewer::CreateGLQtContext (
    156 )
    157 //////////////////////////////////////////////////////////////////////////////
    158 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
    159 {
    160 #ifdef GEANT4_QT_DEBUG
    161   printf("G4OpenGLQtViewer::CreateGLQtContext \n");
    162 #endif
    163 }
     129}
     130
     131
    164132
    165133
    … …  
    174142
    175143  if(fWindow) return; //Done.
    176 #ifdef GEANT4_QT_DEBUG
     144#ifdef G4DEBUG
    177145  printf("G4OpenGLQtViewer::CreateMainWindow glWidget\n");
    178146#endif
     147
     148  // check if it is already launched,
     149  // if not, we suppose that the G4Qt is not launch.
     150  //  bool isReady = G4Qt::Inited();
    179151
    180152  // launch Qt if not
    … …  
    219191
    220192    if (found==false) {
    221 #ifdef GEANT4_QT_DEBUG
     193#ifdef G4DEBUG
    222194      printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist, but not found\n");
    223195#endif
    … …  
    225197    }
    226198  } else {
    227 #ifdef GEANT4_QT_DEBUG
     199#ifdef G4DEBUG
    228200    printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist\n");
    229201#endif
    … …  
    263235
    264236  if(!fWindow) return;
    265 #ifdef GEANT4_QT_DEBUG
     237#ifdef G4DEBUG
    266238  printf("G4OpenGLQtViewer::CreateMainWindow glWidget END\n");
    267239#endif
    … …  
    276248 */
    277249// void G4OpenGLQtViewer::dialogClosed() {
    278 // #ifdef GEANT4_QT_DEBUG
    279 //   printf("G4OpenGLQtViewer::dialogClosed END\n");
    280 // #endif
    281250//   //  GLWindow = NULL;
    282251// }
    … …  
    328297  fLastEventTime = new QTime();
    329298
    330 #ifdef GEANT4_QT_DEBUG
     299#ifdef G4DEBUG
    331300  printf("G4OpenGLQtViewer::G4OpenGLQtViewer END\n");
    332301#endif
    … …  
    343312#else
    344313  G4cout <<removeTempFolder().toStdString().c_str() <<G4endl;
    345 #endif
    346 
    347 #ifdef GEANT4_QT_DEBUG
    348   printf("G4OpenGLQtViewer::~G4OpenGLQtViewer \n");
    349314#endif
    350315}
    … …  
    577542    mDrawing->clear();
    578543  }
    579 #ifdef GEANT4_QT_DEBUG
    580   printf("G4OpenGLQtViewer:: fDrawingWireframe 1\n");
    581 #endif
    582544  QObject ::connect(fDrawingWireframe,
    583545                    SIGNAL(activated()),
    584546                    this,
    585547                    SLOT(actionDrawingWireframe()));
    586 #ifdef GEANT4_QT_DEBUG
    587   printf("G4OpenGLQtViewer:: fDrawingWireframe 2\n");
    588 #endif
    589548  QObject ::connect(fDrawingLineRemoval,
    590549                    SIGNAL(activated()),
    … …  
    860819}
    861820
    862 void G4OpenGLQtViewer::manageContextMenuEvent(QContextMenuEvent *e)
     821
     822void G4OpenGLQtViewer::G4resizeGL(
     823 int aWidth
     824,int aHeight)
     825{ 
     826  setupViewport(aWidth,aHeight);
     827 
     828  if (((WinSize_x != (G4int)aWidth)) || (WinSize_y != (G4int) aHeight)) {
     829    hasToRepaint =true;
     830  }
     831  WinSize_x = (G4int) aWidth;
     832  WinSize_y = (G4int) aHeight;
     833}
     834
     835
     836void G4OpenGLQtViewer::G4manageContextMenuEvent(QContextMenuEvent *e)
    863837{
    864838  if (!GLWindow) {
    … …  
    948922 */
    949923void G4OpenGLQtViewer::actionMousePick() {
    950 #ifdef GEANT4_QT_DEBUG
    951   printf("G4OpenGLQtViewer::actionMousePick \n");
    952 #endif
    953924  emit toggleMouseAction(STYLE3);
    954925}
    … …  
    14801451  }
    14811452 
    1482 #ifdef GEANT4_QT_DEBUG
    1483   printf("G4OpenGLQtViewer::actionSaveImage() \n");
    1484 #endif
    14851453}
    14861454
    14871455
    14881456void G4OpenGLQtViewer::actionMovieParameters() {
    1489 
    14901457  showMovieParametersDialog();
    1491 #ifdef GEANT4_QT_DEBUG
    1492   printf("G4OpenGLQtViewer::actionMovieParameters() \n");
    1493 #endif
    14941458}
    14951459
    … …  
    15281492
    15291493
     1494void G4OpenGLQtViewer::FinishView()
     1495{
     1496   glFlush ();
     1497   fWindow->swapBuffers ();
     1498}
    15301499
    15311500/**
    … …  
    15331502   @param p mouse click point
    15341503*/
    1535 #if QT_VERSION < 0x040000
    1536 void G4OpenGLQtViewer::G4MousePressEvent(QPoint p)
    1537 #else
    1538 void G4OpenGLQtViewer::G4MousePressEvent(QPoint p)
    1539 #endif
     1504void G4OpenGLQtViewer::G4MousePressEvent(QMouseEvent *event)
    15401505{
    1541   fAutoMove = false; // stop automove
    1542   fLastPos1 = p;
    1543   fLastPos2 = fLastPos1;
    1544   fLastPos3 = fLastPos2;
    1545   fLastEventTime->start();
    1546   if (fMouseAction == STYLE3){  // pick
    1547     Pick(p.x(),p.y());
     1506#if QT_VERSION < 0x040000
     1507  if ((event->button() & Qt::LeftButton)
     1508      && !((event->state() & Qt::ShiftButton)
     1509           || (event->state() & Qt::ControlButton)
     1510           || (event->state() & Qt::AltButton)
     1511           || (event->state() & Qt::MetaButton))) {
     1512#else
     1513  if ((event->buttons() & Qt::LeftButton)
     1514      && !((event->modifiers() & Qt::ShiftModifier)
     1515           || (event->modifiers() & Qt::ControlModifier)
     1516           || (event->modifiers() & Qt::AltModifier)
     1517           || (event->modifiers() & Qt::MetaModifier))) {
     1518#endif
     1519    fWindow->setMouseTracking(true);
     1520    fAutoMove = false; // stop automove
     1521    fLastPos1 = event->pos();
     1522    fLastPos2 = fLastPos1;
     1523    fLastPos3 = fLastPos2;
     1524    fLastEventTime->start();
     1525    if (fMouseAction == STYLE3){  // pick
     1526      Pick(event->pos().x(),event->pos().y());
     1527    }
    15481528  }
    15491529}
    … …  
    15531533void G4OpenGLQtViewer::G4MouseReleaseEvent()
    15541534{
    1555 #ifdef GEANT4_QT_DEBUG
    1556   printf("G4OpenGLQtViewer::mouseRealease() %d,%d  %d,%d  %d,%d\n",fLastPos1.x(),fLastPos1.y(),fLastPos2.x(),fLastPos2.y(),fLastPos3.x(),fLastPos3.y());
    1557 #endif
    15581535  fSpinningDelay = fLastEventTime->elapsed();
    15591536  QPoint delta = (fLastPos3-fLastPos1);
    15601537  if ((delta.x() == 0) && (delta.y() == 0)) {
    1561 #ifdef GEANT4_QT_DEBUG
    1562   printf("G4OpenGLQtViewer::mouseRealease() EXIT 1 \n");
    1563 #endif
    15641538    return;
    15651539  }
    … …  
    15791553        lastMoveTime.start();
    15801554        cycles = 1 ;
    1581         //      }
    15821555      ((QApplication*)G4Qt::getInstance ())->processEvents();
    1583 #ifdef GEANT4_QT_DEBUG
    1584         printf("G4OpenGLQtViewer::mouseRealease() cycle :%d \n",lastMoveTime.elapsed());
    1585 #endif
    15861556      cycles ++ ;
    15871557    }
    15881558  }
     1559  fWindow->setMouseTracking(false);
     1560
     1561}
     1562
     1563
     1564void G4OpenGLQtViewer::G4MouseDoubleClickEvent()
     1565{
     1566  fWindow->setMouseTracking(true);
    15891567}
    15901568
    … …  
    15971575*/
    15981576
    1599 #if QT_VERSION < 0x040000
    1600 void G4OpenGLQtViewer::G4MouseMoveEvent(int pos_x, int pos_y,Qt::ButtonState mButtons)
    1601 #else
    1602   void G4OpenGLQtViewer::G4MouseMoveEvent(int pos_x, int pos_y,Qt::MouseButtons mButtons)
    1603 #endif
     1577void G4OpenGLQtViewer::G4MouseMoveEvent(QMouseEvent *event)
    16041578{
     1579
     1580 
     1581#if QT_VERSION < 0x040000
     1582  Qt::ButtonState mButtons = event->state();
     1583#else
     1584  Qt::MouseButtons mButtons = event->buttons();
     1585#endif
    16051586
    16061587  if (fAutoMove) {
    … …  
    16101591  fLastPos3 = fLastPos2;
    16111592  fLastPos2 = fLastPos1;
    1612   fLastPos1 = QPoint(pos_x, pos_y);
     1593  fLastPos1 = QPoint(event->x(), event->y());
    16131594
    16141595  int deltaX = fLastPos2.x()-fLastPos1.x();
    … …  
    17201701,int aHeight
    17211702){
    1722 #ifdef GEANT4_QT_DEBUG
    1723   printf("should rescale \n");
    1724 #endif
    17251703  //  GLfloat* feedback_buffer;
    17261704  //  GLint returned;
    … …  
    18031781{
    18041782  // FIXME
    1805 #ifdef GEANT4_QT_DEBUG
    1806   printf("saving EPS\n");
    1807 #endif
    18081783
    18091784  FILE* fp;
    … …  
    20061981  fVP.SetZoomFactor(fVP.GetZoomFactor()+(fVP.GetZoomFactor()*(event->delta())/1200));
    20071982  updateQWidget();
    2008 
    2009 #ifdef GEANT4_QT_DEBUG
    2010   printf("G4OpenGLQtViewer::wheel event  +++++++++++++++++++++ %f %d\n",fVP.GetZoomFactor(),event->delta());
    2011 #endif
    20121983}
    20131984

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

    r866 r873  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredQt.cc,v 1.7 2008/10/15 10:26:25 lgarnier Exp $
     27// $Id: G4OpenGLStoredQt.cc,v 1.9 2008/10/24 14:21:34 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    3232
    3333#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    34 
    35 //#define GEANT4_QT_DEBUG
    3634
    3735#include "G4VisFeaturesOfOpenGL.hh"
    … …  
    5048{
    5149  G4OpenGLViewerMessenger::GetInstance();
    52 #ifdef GEANT4_QT_DEBUG
    53   printf("G4OpenGLStoredQt::Create  \n");
    54 #endif
    5550}
    5651
    … …  
    6257
    6358G4VViewer* G4OpenGLStoredQt::CreateViewer
    64 #ifdef GEANT4_QT_DEBUG
     59(G4VSceneHandler& scene, const G4String& name) {
     60#ifdef G4DEBUG
    6561  printf("G4OpenGLStoredQt::CreateViewer \n");
    6662#endif
    67 (G4VSceneHandler& scene, const G4String& name) {
    6863  G4VViewer* pView =
    6964    new G4OpenGLStoredQtViewer
    … …  
    8378      " new G4OpenGLStoredQtViewer." << G4endl;
    8479  }
    85 #ifdef GEANT4_QT_DEBUG
     80#ifdef G4DEBUG
    8681  printf("G4OpenGLStoredQt::CreateViewer END \n");
    8782#endif

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

    r866 r873  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.18 2008/10/15 10:29:39 lgarnier Exp $
     27// $Id: G4OpenGLStoredQtViewer.cc,v 1.19 2008/10/24 13:49:19 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    3333
    3434#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    35 
    36 //#define GEANT4_QT_DEBUG
    3735
    3836#include "G4OpenGLStoredQtViewer.hh"
    … …  
    5149  G4OpenGLStoredViewer (sceneHandler)             // FIXME : gerer le pb du parent !
    5250{
    53   // if no scene...
    54 //   if (fSceneHandler.GetScene() == 0) {
    55 //     G4cerr << "G4OpenGLStoredQtViewer: Creating a Viewer without a scene is not allowed. \nPlease use /vis/scene/create before /vis/open/.... "
    56 //         << G4endl;
    57 //     return;
    58 //   }
    5951
    6052  //set true to picking
    … …  
    6557  setFocusPolicy(Qt::StrongFocus); // enable keybord events
    6658#endif
    67   nbPaint =0;
    6859  hasToRepaint =false;
    6960
    … …  
    7263
    7364G4OpenGLStoredQtViewer::~G4OpenGLStoredQtViewer() {
    74 #ifdef GEANT4_QT_DEBUG
    75   printf("GLWidget::~GLWidget \n");
    76 #endif
    7765  makeCurrent();
    7866  // this is connect to the Dialog for deleting it properly
    7967  // when close event.
    8068  //   ((QDialog*)window())->reject();
    81 #ifdef GEANT4_QT_DEBUG
    82   printf("GLWidget::~GLWidget END\n");
    83 #endif
    8469}
    8570
    8671void G4OpenGLStoredQtViewer::Initialise() {
    87 #ifdef GEANT4_QT_DEBUG
     72#ifdef G4DEBUG
    8873  printf("G4OpenGLStoredQtViewer::Initialise 1\n");
    8974#endif
    9075  readyToPaint = false;
    91   CreateGLQtContext ();
    92 #ifdef GEANT4_QT_DEBUG
    93   printf("G4OpenGLStoredQtViewer::Initialise () 2\n");
    94 #endif
    9576  CreateMainWindow (this,QString(fName));
    96 #ifdef GEANT4_QT_DEBUG
    97   printf("G4OpenGLStoredQtViewer::Initialise () 3\n");
    98 #endif
    99   CreateFontLists ();  // FIXME Does nothing!
     77  CreateFontLists ();
    10078 
    101 #ifdef GEANT4_QT_DEBUG
    102   printf("readyToPaint = true \n");
    103 #endif
    10479  readyToPaint = true;
    10580}
    … …  
    10984  InitializeGLView ();
    11085
    111 #ifdef GEANT4_QT_DEBUG
     86#ifdef G4DEBUG
    11287  printf("G4OpenGLStoredQtViewer::InitialiseGL () 1\n");
    11388#endif
    … …  
    11590  // clear the buffers and window.
    11691  ClearView ();
    117   //   printf("G4OpenGLStoredQtViewer::InitialiseGL () 2\n");
    11892  FinishView ();
    11993   
    … …  
    127101  }
    128102
    129 #ifdef GEANT4_QT_DEBUG
    130   printf("G4OpenGLStoredQtViewer::InitialiseGL  -------------------------------------------------------------------------------------\n");
     103#ifdef G4DEBUG
     104  printf("G4OpenGLStoredQtViewer::InitialiseGL  END\n");
    131105#endif
    132106}
    … …  
    135109void G4OpenGLStoredQtViewer::DrawView () {
    136110
    137 #ifdef GEANT4_QT_DEBUG
    138   printf("G4OpenGLQtViewer::setupViewport\n");
     111#ifdef G4DEBUG
    139112  printf("G4OpenGLStoredQtViewer::DrawView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
    140113#endif
    … …  
    149122  // /vis/viewer/rebuild, but if not, make decision and set flag only
    150123  // if necessary...
    151   if (!fNeedKernelVisit)
    152 
     124  if (!fNeedKernelVisit) {
    153125    if (!fNeedKernelVisit) KernelVisitDecision ();
    154    
     126  }
    155127  G4bool kernelVisitWasNeeded = fNeedKernelVisit; // Keep (ProcessView resets).
    156128  ProcessView ();
    … …  
    159131  if(style!=G4ViewParameters::hlr &&
    160132     haloing_enabled) {
    161 #ifdef GEANT4_QT_DEBUG
     133#ifdef G4DEBUG
    162134    printf("G4OpenGLStoredQtViewer::DrawView DANS LE IF\n");
    163135#endif
    … …  
    177149    // have been done, so...
    178150    if (!kernelVisitWasNeeded) {
    179 #ifdef GEANT4_QT_DEBUG
     151#ifdef G4DEBUG
    180152      printf("**************************  G4OpenGLStoredQtViewer::DrawView Don't need kernel Visit \n");
    181153#endif
    … …  
    183155      FinishView ();
    184156    } else {
    185 #ifdef GEANT4_QT_DEBUG
     157#ifdef G4DEBUG
    186158      printf("**************************  G4OpenGLStoredQtViewer::DrawView need kernel Visit \n");
    187159#endif
    … …  
    193165        DrawDisplayLists ();
    194166        FinishView ();
    195 #ifdef GEANT4_QT_DEBUG
     167#ifdef G4DEBUG
    196168        printf("***************************  CASE 4 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
    197169#endif
    … …  
    207179  }
    208180
    209 #ifdef GEANT4_QT_DEBUG
     181#ifdef G4DEBUG
    210182  printf("G4OpenGLStoredQtViewer::DrawView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
    211183#endif
    212184  hasToRepaint =true;
    213 }
    214 
    215 
    216 //////////////////////////////////////////////////////////////////////////////
    217 void G4OpenGLStoredQtViewer::FinishView (
    218 )
    219 //////////////////////////////////////////////////////////////////////////////
    220 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
    221 {
    222   glFlush ();
    223   swapBuffers ();
    224185}
    225186
    … …  
    232193                                      ,int aHeight)
    233194{ 
    234   setupViewport(aWidth,aHeight);
    235 
    236   if (((WinSize_x != (G4int)aWidth)) || (WinSize_y != (G4int) aHeight)) {
    237     hasToRepaint =true;
    238   }
    239   WinSize_x = (G4int) aWidth;
    240   WinSize_y = (G4int) aHeight;
    241  
    242 #ifdef GEANT4_QT_DEBUG
    243   printf("G4OpenGLStoredQtViewer::resizeGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ %d %d=%d %d=%d\n",hasToRepaint,width(),aWidth,height(),aHeight);
    244 #endif
    245 }
    246 
    247 
    248 /**
    249     @see :
    250 */
     195  G4resizeGL(aWidth,aHeight);
     196}
     197
    251198
    252199void G4OpenGLStoredQtViewer::paintGL()
    253200{
     201#ifdef G4DEBUG
     202  printf("G4OpenGLStoredQtViewer::paintGL ??\n");
     203#endif
    254204  if (!readyToPaint) {
    255 #ifdef GEANT4_QT_DEBUG
    256     printf("G4OpenGLStoredQtViewer::paintGL ============  Not ready %d\n",readyToPaint);
    257 #endif
    258205    readyToPaint= true;
    259206    return;
    … …  
    264211  if ( !hasToRepaint) {
    265212    if (((WinSize_x == (G4int)width())) &&(WinSize_y == (G4int) height())) {
    266 #ifdef GEANT4_QT_DEBUG
    267       printf("G4OpenGLStoredQtViewer::paintGL ============  Dont repaint\n");
    268 #endif
    269213      return;
    270214    }
    271215  }
    272   nbPaint++;
    273 #ifdef GEANT4_QT_DEBUG
    274   printf("G4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV %d ready %d\n",nbPaint,readyToPaint);
     216#ifdef G4DEBUG
     217  printf("G4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint);
    275218#endif
    276219  WinSize_x = (G4int) width();
    277220  WinSize_y = (G4int) height();
    278      
     221
    279222  setupViewport(width(),height());
    280   //     glViewport (0, 0, width(), height());
    281   //   glLoadIdentity();
    282      
    283      
     223
    284224  SetView();
    285      
    286   //   //  printf("before ClearView\n");
    287 #ifdef GEANT4_QT_DEBUG
    288   printf("    ClearView\n");
    289 #endif
    290      
     225         
    291226  ClearView (); //ok, put the background correct
    292227  DrawView();
    … …  
    294229  hasToRepaint =false;
    295230     
    296 #ifdef GEANT4_QT_DEBUG
    297   printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ %d ready %d\n",nbPaint,readyToPaint);
     231#ifdef G4DEBUG
     232  printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n",readyToPaint);
    298233#endif
    299234}
    … …  
    301236void G4OpenGLStoredQtViewer::mousePressEvent(QMouseEvent *event)
    302237{
    303 #if QT_VERSION < 0x040000
    304   if ((event->button() & Qt::LeftButton)
    305       && !((event->state() & Qt::ShiftButton)
    306            || (event->state() & Qt::ControlButton)
    307            || (event->state() & Qt::AltButton)
    308            || (event->state() & Qt::MetaButton))) {
    309 #else
    310   if ((event->buttons() & Qt::LeftButton)
    311       && !((event->modifiers() & Qt::ShiftModifier)
    312            || (event->modifiers() & Qt::ControlModifier)
    313            || (event->modifiers() & Qt::AltModifier)
    314            || (event->modifiers() & Qt::MetaModifier))) {
    315 #endif
    316 #ifdef GEANT4_QT_DEBUG
    317     printf("G4OpenGLStoredQtViewer::mousePressEvent\n");
    318 #endif
    319     setMouseTracking(true);
    320     G4MousePressEvent(event->pos());
    321   }
     238  G4MousePressEvent(event);
    322239}
    323240
    … …  
    338255void G4OpenGLStoredQtViewer::mouseDoubleClickEvent(QMouseEvent *event)
    339256{
    340 #ifdef GEANT4_QT_DEBUG
    341   printf("G4OpenGLStoredQtViewer::mouseDoubleClickEvent\n");
    342 #endif
    343   setMouseTracking(true);
    344   //   glBufferImage = grabFrameBuffer().convertToFormat(QImage::Format_ARGB32);//_Premultiplied); 
     257  G4MouseDoubleClickEvent();
    345258}
    346259
    … …  
    348261{
    349262  G4MouseReleaseEvent();
    350 #ifdef GEANT4_QT_DEBUG
    351   printf("G4OpenGLStoredQtViewer::mouseReleaseEvent ================\n");
    352 #endif
    353   setMouseTracking(false);
    354263}
    355264
    356265void G4OpenGLStoredQtViewer::mouseMoveEvent(QMouseEvent *event)
    357266{
    358  
    359 #if QT_VERSION < 0x040000
    360   G4MouseMoveEvent(event->x(),event->y(),event->state());
    361 #else
    362   G4MouseMoveEvent(event->x(),event->y(),event->buttons());
    363 #endif
     267  G4MouseMoveEvent(event);
    364268}
    365269
    … …  
    367271void G4OpenGLStoredQtViewer::contextMenuEvent(QContextMenuEvent *e)
    368272{
    369 #ifdef GEANT4_QT_DEBUG
    370   printf("G4OpenGLStoredQtViewer::contextMenuEvent\n");
    371 #endif
    372   manageContextMenuEvent(e);
     273  G4manageContextMenuEvent(e);
    373274}
    374275

  • trunk/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc

    r866 r873  
    363363    fpViewer -> SetView ();
    364364    fpViewer -> ClearView ();
     365    printf("G4OpenGLStoredSceneHandler::ClearTransientStore----------------------------------------------\n");
    365366    fpViewer -> DrawView ();
    366367  }

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

    r858 r873  
    2525//
    2626//
    27 // $Id: G4OpenGLViewer.cc,v 1.39 2008/07/28 15:36:45 lgarnier Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4OpenGLViewer.cc,v 1.41 2008/10/24 13:49:19 lgarnier Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    3333
    3434#ifdef G4VIS_BUILD_OPENGL_DRIVER
    35 
    36 //#define GEANT4_QT_DEBUG
    3735
    3836#include "G4ios.hh"
    … …  
    942940    targetPoint + cameraDistance * fVP.GetViewpointDirection().unit();
    943941
    944 
    945 #ifdef GEANT4_QT_DEBUG
    946   printf("G4OpenGLViewer:: %f %f %f Tp: %f %f %f Vpd:%f %f %f - Up:%f %f %f Cp:%f %f %f\n",
    947          dx,dy,deltaRotation,targetPoint[0],targetPoint[1],targetPoint[2],
    948          vp.x(),vp.y(),vp.z(),
    949          up.x(),up.y(),up.z(),
    950          cameraPosition[0],cameraPosition[1],cameraPosition[2]);
    951 #endif
    952 
    953942  if (fVP.GetLightsMoveWithCamera()) {
    954943    new_up = (new_vp.cross(yprime)).unit();
    … …  
    959948    new_up = up;
    960949    if (new_vp.z()*vp.z() <0) {
    961 #ifdef GEANT4_QT_DEBUG
    962       //            printf("G4OpenGLViewer:: ***********************************************************\n");
    963 #endif
    964950      new_up.set(new_up.x(),-new_up.y(),new_up.z());
    965       //      new_vp.set(-new_vp.x(),new_vp.y(),new_vp.z());
    966951    }
    967952  }
Note: See TracChangeset for help on using the changeset viewer.