Ignore:
Timestamp:
Nov 15, 2007, 11:56:03 AM (18 years ago)
Author:
garnier
Message:

r647@mac-90108: laurentgarnier | 2007-11-15 11:32:46 +0100
Ok en Qt 4.3.0

Location:
trunk/geant4/visualization/OpenGL
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r600 r606  
    2525//
    2626//
    27 // $Id: G4OpenGLQtViewer.hh,v 1.3 2007/11/09 15:03:21 lgarnier Exp $
     27// $Id: G4OpenGLQtViewer.hh,v 1.4 2007/11/13 17:48:51 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

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

    r593 r606  
    2525//
    2626//
    27 // $Id: G4OpenGLViewer.hh,v 1.20 2007/05/08 11:04:11 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-00-ref-01 $
     27// $Id: G4OpenGLViewer.hh,v 1.21 2007/11/10 14:50:01 allison Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    4848  friend class G4OpenGLImmediateSceneHandler;
    4949  friend class G4OpenGLStoredSceneHandler;
     50  friend class G4OpenGLFileSceneHandler;
    5051  friend class G4OpenGLViewerMessenger;
    5152
    … …  
    7980  G4OpenGLSceneHandler& fOpenGLSceneHandler;
    8081  G4Colour background;      //the OpenGL clear colour
     82  unsigned int WinSize_x, WinSize_y;
    8183  G4bool
    8284    transparency_enabled,   //is alpha blending enabled?

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

    r593 r606  
    2525//
    2626//
    27 // $Id: G4OpenGLWin32Viewer.hh,v 1.13 2006/06/29 21:18:20 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-00-ref-01 $
     27// $Id: G4OpenGLWin32Viewer.hh,v 1.14 2007/11/10 14:50:01 allison Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    5555  void CreateGLWin32Context ();
    5656  virtual void CreateMainWindow ();
    57 protected:
    58   G4int WinSize_x;
    59   G4int WinSize_y;
    6057  HDC fHDC;
    6158private:

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

    r593 r606  
    2525//
    2626//
    27 // $Id: G4OpenGLXViewer.hh,v 1.27 2007/05/08 11:04:11 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-00-ref-01 $
     27// $Id: G4OpenGLXViewer.hh,v 1.28 2007/11/10 14:50:01 allison Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    105105  Pixmap                            icon_pixmap;
    106106  XSizeHints                        *size_hints;
    107   unsigned int                      WinSize_x,
    108                                     WinSize_y;
    109107  Atom                              Xatom;
    110108  XTextProperty                     windowName,

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

    r599 r606  
    2525//
    2626//
    27 // $Id: G4OpenGLImmediateQtViewer.cc,v 1.1 2007/09/28 14:44:13 lgarnier Exp $
     27// $Id: G4OpenGLImmediateQtViewer.cc,v 1.2 2007/11/13 17:48:51 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

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

    r599 r606  
    2525//
    2626//
    27 // $Id: G4OpenGLQtExportDialog.cc,v 1.3 2007/11/09 15:03:21 lgarnier Exp $
     27// $Id: G4OpenGLQtExportDialog.cc,v 1.4 2007/11/13 17:48:51 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

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

    r602 r606  
    2525//
    2626//
    27 // $Id: G4OpenGLQtViewer.cc,v 1.4 2007/11/09 15:03:22 lgarnier Exp $
     27// $Id: G4OpenGLQtViewer.cc,v 1.6 2007/11/14 11:49:00 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    13441344
    13451345  if (aFilename.endsWith(".ps")) {
     1346#if QT_VERSION > 0x040200
    13461347    printer.setOutputFormat(QPrinter::PostScriptFormat);
    1347   } else {
     1348#endif
     1349  } else {
     1350#if QT_VERSION > 0x040100
    13481351    printer.setOutputFormat(QPrinter::PdfFormat);
    1349   }
     1352#endif
     1353  }
     1354#if QT_VERSION > 0x040100
    13501355  printer.setOutputFileName(aFilename);
     1356#endif
    13511357  //  printer.setFullPage ( true);
    13521358  QPainter paint(&printer);

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

    r601 r606  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.3 2007/11/09 15:03:22 lgarnier Exp $
     27// $Id: G4OpenGLStoredQtViewer.cc,v 1.5 2007/11/14 18:58:59 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    256256void G4OpenGLStoredQtViewer::mouseMoveEvent(QMouseEvent *event)
    257257{
     258  printf("G4OpenGLStoredQtViewer::mouseMoveEvent\n");
     259#if QT_VERSION < 0x040000
    258260  G4MouseMoveEvent(event->x(),event->y(),event->button());
     261#else
     262  G4MouseMoveEvent(event->x(),event->y(),event->buttons());
     263#endif
    259264  //  DrawView();
    260265}
Note: See TracChangeset for help on using the changeset viewer.