Changeset 1286


Ignore:
Timestamp:
Jun 1, 2010, 5:50:34 PM (14 years ago)
Author:
garnier
Message:

update from CVS

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

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/OpenGL/History

    r1274 r1286  
    1 $Id: History,v 1.171 2010/05/26 14:50:56 lgarnier Exp $
     1$Id: History,v 1.174 2010/05/30 09:53:05 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1818     ----------------------------------------------------------
    1919
    20 26th May 2010 Laurent Garnier
     2030th May 2010  John Allison  (opengl-V09-03-04)
     21- G4OpenGLSceneHandler: Added AddCompound(const G4VDigi&).
     22
     2329th May 2010  John Allison  (opengl-V09-03-03)
     24- G4OpenGLImmediateSceneHandler.cc, G4OpenGLStoredSceneHandler.cc:
     25  Removed the following from ClearTransientStrore (was causing
     26  unnecessary drawing and flipping buffers?):
     27  // Make sure screen corresponds to graphical database...
     28  if (fpViewer) {
     29    fpViewer -> SetView ();
     30    fpViewer -> ClearView ();
     31    fpViewer -> DrawView ();
     32  }
     33- G4OpenGLStoredXViewer.cc:
     34  Commented out as follows in DrawView (was causing extra buffer swap,
     35  thus showing bad picture; can't recall why it was introduced):
     36      } else { // ADD TO AVOID KernelVisit=1 and nothing to display
     37        //DrawDisplayLists ();  ????????? (JA)
     38        //FinishView ();        ????????? (JA)
     39
     4026th May 2010 Laurent Garnier  (opengl-V09-03-02)
    2141 - G4OpenGLQtViewer : Some improvments with auto rotation mode.
    2242

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

    r1274 r1286  
    2525//
    2626//
    27 // $Id: G4OpenGLSceneHandler.hh,v 1.29 2010/05/11 10:17:32 allison Exp $
     27// $Id: G4OpenGLSceneHandler.hh,v 1.30 2010/05/30 09:53:05 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    8484  void AddCompound (const G4VTrajectory&);
    8585  void AddCompound (const G4VHit&);
     86  void AddCompound (const G4VDigi&);
    8687  void AddCompound (const G4THitsMap<G4double>&);
    8788

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

    r1242 r1286  
    2525//
    2626//
    27 // $Id: G4OpenGLImmediateSceneHandler.cc,v 1.31 2009/02/04 16:48:41 lgarnier Exp $
     27// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.32 2010/05/29 15:52:49 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    203203
    204204void G4OpenGLImmediateSceneHandler::ClearTransientStore () {
    205 
    206205  G4VSceneHandler::ClearTransientStore ();
    207 
    208   // Make sure screen corresponds to graphical database...
    209   if (fpViewer) {
    210     fpViewer -> SetView ();
    211     fpViewer -> ClearView ();
    212     fpViewer -> DrawView ();
    213   }
    214206}
    215207

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

    r1274 r1286  
    2525//
    2626//
    27 // $Id: G4OpenGLSceneHandler.cc,v 1.58 2010/05/11 10:17:32 allison Exp $
     27// $Id: G4OpenGLSceneHandler.cc,v 1.59 2010/05/30 09:53:05 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    879879}
    880880
     881void G4OpenGLSceneHandler::AddCompound(const G4VDigi& digi) {
     882  G4VSceneHandler::AddCompound(digi);  // For now.
     883}
     884
    881885void G4OpenGLSceneHandler::AddCompound(const G4THitsMap<G4double>& hits) {
    882886  G4VSceneHandler::AddCompound(hits);  // For now.

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

    r1160 r1286  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredSceneHandler.cc,v 1.40 2009/02/04 16:48:41 lgarnier Exp $
     27// $Id: G4OpenGLStoredSceneHandler.cc,v 1.41 2010/05/29 15:52:49 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    361361    glDeleteLists(fTOList[i].fDisplayListId, 1);
    362362  fTOList.clear ();
    363 
    364   // Make sure screen corresponds to graphical database...
    365   if (fpViewer) {
    366     fpViewer -> SetView ();
    367     fpViewer -> ClearView ();
    368     fpViewer -> DrawView ();
    369   }
    370363}
    371364

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

    r1196 r1286  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredXViewer.cc,v 1.25 2009/04/08 16:55:44 lgarnier Exp $
     27// $Id: G4OpenGLStoredXViewer.cc,v 1.26 2010/05/29 15:56:50 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    138138        FinishView ();
    139139      } else { // ADD TO AVOID KernelVisit=1 and nothing to display
    140         DrawDisplayLists ();
    141         FinishView ();
     140        //DrawDisplayLists ();  ????????? (JA)
     141        //FinishView ();        ????????? (JA)
    142142      }
    143143    }
Note: See TracChangeset for help on using the changeset viewer.