Changeset 533


Ignore:
Timestamp:
Jun 25, 2007, 6:20:59 PM (17 years ago)
Author:
garnier
Message:

r669@mac-90108: laurentgarnier | 2007-06-25 18:22:42 +0200
mise a jour

Location:
trunk/geant4/visualization
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r531 r533  
    2525//
    2626//
    27 // $Id: G4OpenGLImmediateWin32.hh,v 1.7 2006/06/29 21:17:44 gunter Exp $
     27// $Id: G4OpenGLImmediateQt.hh,v 1.7 2007/06/25 21:17:44 $
    2828// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//
    31 // OpenGLImmediateWin32 graphics system factory.
     31// OpenGLImmediateQt graphics system factory.
    3232
    33 #if defined (G4VIS_BUILD_OPENGLWIN32_DRIVER) || defined (G4VIS_USE_OPENGLWIN32)
     33#if defined (G4VIS_BUILD_OPENGLQT_DRIVER) || defined (G4VIS_USE_OPENGLQT)
    3434
    35 #ifndef G4OPENGLIMMEDIATEWIN32_HH
    36 #define G4OPENGLIMMEDIATEWIN32_HH
     35#ifndef G4OPENGLIMMEDIATEQT_HH
     36#define G4OPENGLIMMEDIATEQT_HH
    3737
    3838#include "G4VGraphicsSystem.hh"
    3939
    40 class G4OpenGLImmediateWin32: public G4VGraphicsSystem {
     40class G4OpenGLImmediateQt: public G4VGraphicsSystem {
    4141public:
    42   G4OpenGLImmediateWin32 ();
     42  G4OpenGLImmediateQt ();
    4343  G4VSceneHandler* CreateSceneHandler (const G4String& name = "");
    4444  G4VViewer*  CreateViewer  (G4VSceneHandler&, const G4String& name = "");

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

    r531 r533  
    2525//
    2626//
    27 // $Id: G4OpenGLImmediateWin32Viewer.hh,v 1.9 2006/06/29 21:17:46 gunter Exp $
     27// $Id: G4OpenGLImmediateQtViewer.hh,v 1.9 2007/06/25 21:17:46 $
    2828// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//
    31 // Class G4OpenGLImmediateWin32Viewer : a class derived from
    32 //   G4OpenGLWin32Viewer and G4OpenGLImmediateViewer.
     31// Class G4OpenGLImmediateQtViewer : a class derived from
     32//   G4OpenGLQtViewer and G4OpenGLImmediateViewer.
    3333
    34 #ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
     34#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    3535
    36 #ifndef G4OpenGLIMMEDIATEWIN32VIEWER_HH
    37 #define G4OpenGLIMMEDIATEWIN32VIEWER_HH
     36#ifndef G4OpenGLIMMEDIATEQTVIEWER_HH
     37#define G4OpenGLIMMEDIATEQTVIEWER_HH
    3838
    3939#include "G4VViewer.hh"
    4040#include "G4OpenGLImmediateViewer.hh"
    41 #include "G4OpenGLWin32Viewer.hh"
     41#include "G4OpenGLQtViewer.hh"
    4242
    4343#include "globals.hh"
    … …  
    4545class G4OpenGLImmediateSceneHandler;
    4646
    47 class G4OpenGLImmediateWin32Viewer:
    48 public G4OpenGLWin32Viewer, public G4OpenGLImmediateViewer{
     47class G4OpenGLImmediateQtViewer:
     48public G4OpenGLQtViewer, public G4OpenGLImmediateViewer{
    4949 
    5050public:
    51   G4OpenGLImmediateWin32Viewer (G4OpenGLImmediateSceneHandler& scene,
     51  G4OpenGLImmediateQtViewer (G4OpenGLImmediateSceneHandler& scene,
    5252                                const G4String& name = "");
    5353  void Initialise ();

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

    r531 r533  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredWin32.hh,v 1.7 2006/06/29 21:18:04 gunter Exp $
     27// $Id: G4OpenGLStoredQt.hh,v 1.7 2007/06/25 21:18:04 $
    2828// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//
    31 // OpenGLStoredWin32 graphics system factory.
     31// OpenGLStoredQt graphics system factory.
    3232
    33 #if defined (G4VIS_BUILD_OPENGLWIN32_DRIVER) || defined (G4VIS_USE_OPENGLWIN32)
     33#if defined (G4VIS_BUILD_OPENGLQT_DRIVER) || defined (G4VIS_USE_OPENGLQT)
    3434
    35 #ifndef G4OPENGLSTOREDWIN32_HH
    36 #define G4OPENGLSTOREDWIN32_HH
     35#ifndef G4OPENGLSTOREDQT_HH
     36#define G4OPENGLSTOREDQT_HH
    3737
    3838#include "G4VGraphicsSystem.hh"
    3939
    40 class G4OpenGLStoredWin32: public G4VGraphicsSystem {
     40class G4OpenGLStoredQt: public G4VGraphicsSystem {
    4141public:
    42   G4OpenGLStoredWin32 ();
     42  G4OpenGLStoredQt ();
    4343  G4VSceneHandler* CreateSceneHandler (const G4String& name = "");
    4444  G4VViewer*  CreateViewer  (G4VSceneHandler&, const G4String& name = "");

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

    r531 r533  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredWin32Viewer.hh,v 1.7 2006/06/29 21:18:06 gunter Exp $
     27// $Id: G4OpenGLStoredQtViewer.hh,v 1.7 2007/06/25 21:18:06 $
    2828// GEANT4 tag $Name: geant4-08-01-patch-01 $
    2929//
    3030//
    31 // Class G4OpenGLStoredWin32Viewer : a class derived from
    32 //   G4OpenGLWin32Viewer and G4OpenGLStoredViewer.
     31// Class G4OpenGLStoredQtViewer : a class derived from
     32//   G4OpenGLQtViewer and G4OpenGLStoredViewer.
    3333
    34 #ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
     34#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    3535
    36 #ifndef G4OPENGLSTOREDWIN32VIEWER_HH
    37 #define G4OPENGLSTOREDWIN32VIEWER_HH
     36#ifndef G4OPENGLSTOREDQTVIEWER_HH
     37#define G4OPENGLSTOREDQTVIEWER_HH
    3838
    3939#include "G4VViewer.hh"
    4040#include "G4OpenGLStoredViewer.hh"
    41 #include "G4OpenGLWin32Viewer.hh"
     41#include "G4OpenGLQtViewer.hh"
    4242
    4343class G4OpenGLStoredSceneHandler;
    4444
    45 class G4OpenGLStoredWin32Viewer:
    46 public G4OpenGLWin32Viewer, public G4OpenGLStoredViewer{
     45class G4OpenGLStoredQtViewer:
     46public G4OpenGLQtViewer, public G4OpenGLStoredViewer{
    4747 
    4848public:
    49   G4OpenGLStoredWin32Viewer (G4OpenGLStoredSceneHandler& scene,
     49  G4OpenGLStoredQtViewer (G4OpenGLStoredSceneHandler& scene,
    5050                             const G4String& name = "");
    5151  void Initialise ();

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

    r531 r533  
    2525//
    2626//
    27 // $Id: G4OpenGLImmediateWin32.cc,v 1.11 2006/08/14 12:07:19 allison Exp $
     27// $Id: G4OpenGLImmediateQt.cc,v 1.11 2007/06/24 12:07:19 $
    2828// GEANT4 tag $Name: geant4-08-02-patch-01 $
    2929//
    3030//
    31 // OpenGLImmediateWin32 graphics system factory.
     31// OpenGLImmediateQt graphics system factory.
    3232
    33 #ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
     33#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    3434
    3535#include "G4VisFeaturesOfOpenGL.hh"
    … …  
    3737#include "G4OpenGLSceneHandler.hh"
    3838#include "G4OpenGLViewer.hh"
    39 #include "G4OpenGLImmediateWin32.hh"
    40 #include "G4OpenGLImmediateWin32Viewer.hh"
     39#include "G4OpenGLImmediateQt.hh"
     40#include "G4OpenGLImmediateQtViewer.hh"
    4141#include "G4OpenGLViewerMessenger.hh"
    4242
    43 G4OpenGLImmediateWin32::G4OpenGLImmediateWin32 ():
    44   G4VGraphicsSystem ("OpenGLImmediateWin32",
    45                      "OGLIWin32",
    46                      G4VisFeaturesOfOpenGLIWin32 (),
     43G4OpenGLImmediateQt::G4OpenGLImmediateQt ():
     44  G4VGraphicsSystem ("OpenGLImmediateQt",
     45                     "OGLIQt",
     46                     G4VisFeaturesOfOpenGLIQt (),
    4747                     G4VGraphicsSystem::threeD)
    4848{
    … …  
    5050}
    5151
    52 G4VSceneHandler* G4OpenGLImmediateWin32::CreateSceneHandler
     52G4VSceneHandler* G4OpenGLImmediateQt::CreateSceneHandler
    5353(const G4String& name) {
    5454  G4VSceneHandler* pScene = new G4OpenGLImmediateSceneHandler (*this, name);
    … …  
    5656}
    5757
    58 G4VViewer* G4OpenGLImmediateWin32::CreateViewer
     58G4VViewer* G4OpenGLImmediateQt::CreateViewer
    5959(G4VSceneHandler& scene, const G4String& name) {
    6060  G4VViewer* pView =
    61     new G4OpenGLImmediateWin32Viewer
     61    new G4OpenGLImmediateQtViewer
    6262    ((G4OpenGLImmediateSceneHandler&) scene, name);
    6363  if (pView) {
    6464    if (pView -> GetViewId () < 0) {
    65       G4cerr << "G4OpenGLImmediateWin32::CreateViewer: error flagged by negative"
    66         " view id in G4OpenGLImmediateWin32Viewer creation."
     65      G4cerr << "G4OpenGLImmediateQt::CreateViewer: error flagged by negative"
     66        " view id in G4OpenGLImmediateQtViewer creation."
    6767        "\n Destroying view and returning null pointer."
    6868           << G4endl;
    … …  
    7272  }
    7373  else {
    74     G4cerr << "G4OpenGLImmediateWin32::CreateViewer: null pointer on"
    75       " new G4OpenGLImmediateWin32Viewer." << G4endl;
     74    G4cerr << "G4OpenGLImmediateQt::CreateViewer: null pointer on"
     75      " new G4OpenGLImmediateQtViewer." << G4endl;
    7676  }
    7777  return pView;

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

    r531 r533  
    2525//
    2626//
    27 // $Id: G4OpenGLImmediateWin32Viewer.cc,v 1.16 2006/07/03 16:38:13 allison Exp $
     27// $Id: G4OpenGLImmediateQtViewer.cc,v 1.16 2007/06/25 16:38:13 $
    2828// GEANT4 tag $Name: geant4-08-02-patch-01 $
    2929//
    3030//
    31 // Class G4OpenGLImmediateWin32Viewer : a class derived from G4OpenGLWin32Viewer and
     31// Class G4OpenGLImmediateQtViewer : a class derived from G4OpenGLQtViewer and
    3232//                                G4OpenGLImmediateViewer.
    3333
    34 #ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
     34#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    3535
    36 #include "G4OpenGLImmediateWin32Viewer.hh"
     36#include "G4OpenGLImmediateQtViewer.hh"
    3737
    3838#include "G4ios.hh"
    3939
    40 G4OpenGLImmediateWin32Viewer::G4OpenGLImmediateWin32Viewer
     40G4OpenGLImmediateQtViewer::G4OpenGLImmediateQtViewer
    4141(G4OpenGLImmediateSceneHandler& sceneHandler,
    4242 const G4String&  name):
    4343G4OpenGLViewer (sceneHandler),
    44 G4OpenGLWin32Viewer (sceneHandler),
     44G4OpenGLQtViewer (sceneHandler),
    4545G4OpenGLImmediateViewer (sceneHandler),
    4646G4VViewer (sceneHandler, sceneHandler.IncrementViewCount (), name) {
    … …  
    4949}
    5050
    51 void G4OpenGLImmediateWin32Viewer::Initialise () {
     51void G4OpenGLImmediateQtViewer::Initialise () {
    5252
    5353// ensure a suitable window was found
    5454
    55   CreateGLWin32Context ();
     55  CreateGLQtContext ();
    5656  CreateMainWindow ();
    5757  CreateFontLists ();
    … …  
    6969}
    7070
    71 void G4OpenGLImmediateWin32Viewer::DrawView () {
     71void G4OpenGLImmediateQtViewer::DrawView () {
    7272
    7373  // If a double buffer context has been forced upon us, ignore the
    … …  
    7878
    7979  //Make sure current viewer is attached and clean...
    80   //Win32 version needed
     80  //Qt version needed
    8181  //glXMakeCurrent (dpy, win, cx);
    8282  glViewport (0, 0, WinSize_x, WinSize_y);
    … …  
    101101
    102102//////////////////////////////////////////////////////////////////////////////
    103 void G4OpenGLImmediateWin32Viewer::FinishView (
     103void G4OpenGLImmediateQtViewer::FinishView (
    104104)
    105105//////////////////////////////////////////////////////////////////////////////

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

    r531 r533  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredWin32.cc,v 1.14 2006/08/14 12:07:19 allison Exp $
     27// $Id: G4OpenGLStoredQt.cc,v 1.14 2007/06/25 12:07:19 $
    2828// GEANT4 tag $Name: geant4-08-02-patch-01 $
    2929//
    3030//
    31 // OpenGLStoredWin32 graphics system factory.
     31// OpenGLStoredQt graphics system factory.
    3232
    3333
    34 #ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
     34#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    3535
    3636#include "G4VisFeaturesOfOpenGL.hh"
    … …  
    3838#include "G4OpenGLSceneHandler.hh"
    3939#include "G4OpenGLViewer.hh"
    40 #include "G4OpenGLStoredWin32.hh"
    41 #include "G4OpenGLStoredWin32Viewer.hh"
     40#include "G4OpenGLStoredQt.hh"
     41#include "G4OpenGLStoredQtViewer.hh"
    4242#include "G4OpenGLViewerMessenger.hh"
    4343
    44 G4OpenGLStoredWin32::G4OpenGLStoredWin32 ():
    45   G4VGraphicsSystem ("OpenGLStoredWin32",
    46                      "OGLSWin32",
    47                      G4VisFeaturesOfOpenGLSWin32 (),
     44G4OpenGLStoredQt::G4OpenGLStoredQt ():
     45  G4VGraphicsSystem ("OpenGLStoredQt",
     46                     "OGLSQt",
     47                     G4VisFeaturesOfOpenGLSQt (),
    4848                     G4VGraphicsSystem::threeD)
    4949{
    … …  
    5151}
    5252
    53 G4VSceneHandler* G4OpenGLStoredWin32::CreateSceneHandler
     53G4VSceneHandler* G4OpenGLStoredQt::CreateSceneHandler
    5454(const G4String& name) {
    5555  G4VSceneHandler* pScene = new G4OpenGLStoredSceneHandler (*this, name);
    … …  
    5757}
    5858
    59 G4VViewer* G4OpenGLStoredWin32::CreateViewer
     59G4VViewer* G4OpenGLStoredQt::CreateViewer
    6060(G4VSceneHandler& scene, const G4String& name) {
    6161  G4VViewer* pView =
    62     new G4OpenGLStoredWin32Viewer ((G4OpenGLStoredSceneHandler&) scene, name);
     62    new G4OpenGLStoredQtViewer ((G4OpenGLStoredSceneHandler&) scene, name);
    6363  if (pView) {
    6464    if (pView -> GetViewId () < 0) {
    6565      delete pView;
    6666      pView = 0;
    67       G4cerr << "G4OpenGLStoredWin32::CreateViewer: error flagged by"
    68         " negative view id in G4OpenGLStoredWin32Viewer creation."
     67      G4cerr << "G4OpenGLStoredQt::CreateViewer: error flagged by"
     68        " negative view id in G4OpenGLStoredQtViewer creation."
    6969        "\n Destroying view and returning null pointer." << G4endl;
    7070    }
    7171  }
    7272  else {
    73     G4cerr << "G4OpenGLStoredWin32::CreateViewer: null pointer on"
    74       " new G4OpenGLStoredWin32Viewer." << G4endl;
     73    G4cerr << "G4OpenGLStoredQt::CreateViewer: null pointer on"
     74      " new G4OpenGLStoredQtViewer." << G4endl;
    7575  }
    7676  return pView;

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

    r531 r533  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredWin32Viewer.cc,v 1.18 2006/09/04 12:07:59 allison Exp $
     27// $Id: G4OpenGLStoredQtViewer.cc,v 1.18 2007/06/25 12:07:59 $
    2828// GEANT4 tag $Name: geant4-08-02-patch-01 $
    2929//
    3030//
    31 // Class G4OpenGLStoredWin32Viewer : a class derived from G4OpenGLWin32Viewer and
     31// Class G4OpenGLStoredQtViewer : a class derived from G4OpenGLQtViewer and
    3232//                             G4OpenGLStoredViewer.
    3333
    34 #ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
     34#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    3535
    36 #include "G4OpenGLStoredWin32Viewer.hh"
     36#include "G4OpenGLStoredQtViewer.hh"
    3737
    3838#include "G4ios.hh"
    3939
    40 G4OpenGLStoredWin32Viewer::G4OpenGLStoredWin32Viewer
     40G4OpenGLStoredQtViewer::G4OpenGLStoredQtViewer
    4141(G4OpenGLStoredSceneHandler& sceneHandler,
    4242 const G4String&  name):
    4343G4OpenGLViewer (sceneHandler),
    44 G4OpenGLWin32Viewer (sceneHandler),
     44G4OpenGLQtViewer (sceneHandler),
    4545G4OpenGLStoredViewer (sceneHandler),
    4646G4VViewer (sceneHandler, sceneHandler.IncrementViewCount (), name) {
    … …  
    4949}
    5050
    51 void G4OpenGLStoredWin32Viewer::Initialise () {
     51void G4OpenGLStoredQtViewer::Initialise () {
    5252
    53   //Check that G4OpenGLWin32Viewer got a double buffered colour visual
     53  //Check that G4OpenGLQtViewer got a double buffered colour visual
    5454
    55   CreateGLWin32Context ();
     55  CreateGLQtContext ();
    5656  CreateMainWindow ();
    5757  CreateFontLists ();
    … …  
    6565}
    6666
    67 void G4OpenGLStoredWin32Viewer::DrawView () {
     67void G4OpenGLStoredQtViewer::DrawView () {
    6868
    6969  //Make sure current viewer is attached and clean...
    70   //Win32 version needed
     70  //Qt version needed
    7171  //  glXMakeCurrent (dpy, win, cx);
    7272  glViewport (0, 0, WinSize_x, WinSize_y);
    … …  
    115115
    116116//////////////////////////////////////////////////////////////////////////////
    117 void G4OpenGLStoredWin32Viewer::FinishView (
     117void G4OpenGLStoredQtViewer::FinishView (
    118118)
    119119//////////////////////////////////////////////////////////////////////////////

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

    r531 r533  
    7171
    7272#ifdef G4VIS_USE_OPENGLQT
    73 #include "G4OpenGLQt.hh"
    74 #include "G4OpenGLQt.hh"
     73#include "G4OpenGLImmediateQt.hh"
     74#include "G4OpenGLStoredQt.hh"
    7575#endif
    7676
Note: See TracChangeset for help on using the changeset viewer.