Ignore:
Timestamp:
May 18, 2009, 11:48:22 AM (15 years ago)
Author:
garnier
Message:

update

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

Legend:

Unmodified
Added
Removed
  • trunk/source/visualization/OpenGL/History

    r1041 r1046  
    1 $Id: History,v 1.140 2009/05/13 10:28:00 lgarnier Exp $
     1$Id: History,v 1.141 2009/05/14 16:42:27 lgarnier Exp $
    22-------------------------------------------------------------------
    33
     
    2020History file for visualization/OpenGL
    2121-------------------------------------
     22
     2314 May 2009, Laurent Garnier (opengl-V09-02-04)
     24 - G4OpenGLViewer : Add methods to manage print size and filename
     25 - G4OpenGLViewerMessenger : Added /vis/ogl/set/printSize
     26 - G4OpenGLViewerMessenger : Added /vis/ogl/set/printFilename
     27 - G4OpenGLQtViewer.cc,G4OpenGLXmMainMenuBarCallback.cc, renaming
     28   according to first point.
    2229
    233013 May 2009, Laurent Garnier
  • trunk/source/visualization/OpenGL/include/G4OpenGLViewer.hh

    r1042 r1046  
    2525//
    2626//
    27 // $Id: G4OpenGLViewer.hh,v 1.31 2009/05/13 10:28:00 lgarnier Exp $
     27// $Id: G4OpenGLViewer.hh,v 1.32 2009/05/14 16:38:23 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
  • trunk/source/visualization/OpenGL/include/G4OpenGLViewerMessenger.hh

    r1041 r1046  
    2525//
    2626//
    27 // $Id: G4OpenGLViewerMessenger.hh,v 1.6 2009/02/04 16:48:41 lgarnier Exp $
     27// $Id: G4OpenGLViewerMessenger.hh,v 1.7 2009/05/18 09:07:12 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929
  • trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc

    r1041 r1046  
    2525//
    2626//
    27 // $Id: G4OpenGLQtViewer.cc,v 1.41 2009/05/13 10:28:00 lgarnier Exp $
     27// $Id: G4OpenGLQtViewer.cc,v 1.42 2009/05/14 16:38:23 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
     
    14321432void G4OpenGLQtViewer::FinishView()
    14331433{
    1434 #ifdef G4DEBUG_VIS_OGL
    1435   printf("G4OpenGLQtViewer::FinishView\n");
    1436 #endif
    14371434   glFlush ();
    14381435   fWindow->swapBuffers ();
    1439 #ifdef G4DEBUG_VIS_OGL
    1440   printf("G4OpenGLQtViewer::FinishView END\n");
    1441 #endif
    14421436}
    14431437
  • trunk/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc

    r951 r1046  
    2525//
    2626//
     27<<<<<<< G4OpenGLStoredWin32.cc
    2728// $Id: G4OpenGLStoredWin32.cc,v 1.14 2006/08/14 12:07:19 allison Exp $
    2829// GEANT4 tag $Name: geant4-09-02-ref-02 $
     30=======
     31// $Id: G4OpenGLStoredWin32.cc,v 1.15 2009/01/19 16:53:42 lgarnier Exp $
     32// GEANT4 tag $Name:  $
     33>>>>>>> 1.15
    2934//
    3035//
  • trunk/source/visualization/OpenGL/src/G4OpenGLStoredX.cc

    r951 r1046  
    2525//
    2626//
     27<<<<<<< G4OpenGLStoredX.cc
    2728// $Id: G4OpenGLStoredX.cc,v 1.14 2007/08/21 14:05:51 allison Exp $
    2829// GEANT4 tag $Name: geant4-09-02-ref-02 $
     30=======
     31// $Id: G4OpenGLStoredX.cc,v 1.15 2009/01/19 16:53:42 lgarnier Exp $
     32// GEANT4 tag $Name:  $
     33>>>>>>> 1.15
    2934//
    3035//
  • trunk/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc

    r951 r1046  
    2525//
    2626//
     27<<<<<<< G4OpenGLStoredXm.cc
    2728// $Id: G4OpenGLStoredXm.cc,v 1.11 2006/08/14 12:07:19 allison Exp $
    2829// GEANT4 tag $Name: geant4-09-02-ref-02 $
     30=======
     31// $Id: G4OpenGLStoredXm.cc,v 1.12 2009/01/19 16:53:42 lgarnier Exp $
     32// GEANT4 tag $Name:  $
     33>>>>>>> 1.12
    2934//
    3035//
  • trunk/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc

    r951 r1046  
    2525//
    2626//
     27<<<<<<< G4OpenGLTransform3D.cc
    2728// $Id: G4OpenGLTransform3D.cc,v 1.8 2006/06/29 21:19:32 gunter Exp $
    2829// GEANT4 tag $Name: geant4-09-02-ref-02 $
     30=======
     31// $Id: G4OpenGLTransform3D.cc,v 1.9 2009/01/19 16:53:42 lgarnier Exp $
     32// GEANT4 tag $Name:  $
     33>>>>>>> 1.9
    2934//
    3035//
  • trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc

    r1042 r1046  
    2525//
    2626//
    27 // $Id: G4OpenGLViewer.cc,v 1.55 2009/05/13 10:28:00 lgarnier Exp $
     27// $Id: G4OpenGLViewer.cc,v 1.56 2009/05/14 16:38:23 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
     
    691691
    692692void G4OpenGLViewer::setPrintFilename(G4String name,G4bool inc) {
    693 #ifdef G4DEBUG_VIS_OGL
    694   printf("G4OpenGLViewer::setPrintFilename :%s Inc:%d\n",name.c_str(),inc);
    695 #endif
    696 
    697693  if (name != "") {
    698694    fPrintFilename = name;
     
    717713  }
    718714  temp += ".eps";
    719 #ifdef G4DEBUG_VIS_OGL
    720   printf("G4OpenGLViewer::getRealPrintFilename :%s --%d\n",temp.c_str(),fPrintFilenameIndex);
    721 #endif
    722715  return temp;
    723716}
  • trunk/source/visualization/OpenGL/src/G4OpenGLViewerMessenger.cc

    r1041 r1046  
    2525//
    2626//
    27 // $Id: G4OpenGLViewerMessenger.cc,v 1.17 2009/04/28 15:05:22 allison Exp $
     27// $Id: G4OpenGLViewerMessenger.cc,v 1.18 2009/05/14 16:38:23 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929
  • trunk/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc

    r1041 r1046  
    2525//
    2626//
    27 // $Id: G4OpenGLXmMainMenubarCallbacks.cc,v 1.16 2009/02/16 15:31:05 lgarnier Exp $
     27// $Id: G4OpenGLXmMainMenubarCallbacks.cc,v 1.17 2009/05/14 16:38:23 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
  • trunk/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc

    r951 r1046  
    2525//
    2626//
     27<<<<<<< G4OpenGLXmSliderBar.cc
    2728// $Id: G4OpenGLXmSliderBar.cc,v 1.7 2006/06/29 21:20:00 gunter Exp $
    2829// GEANT4 tag $Name: geant4-09-02-ref-02 $
     30=======
     31// $Id: G4OpenGLXmSliderBar.cc,v 1.8 2009/01/19 16:53:42 lgarnier Exp $
     32// GEANT4 tag $Name:  $
     33>>>>>>> 1.8
    2934//
    3035//Slider bar class. Inherits from G4OpenGLXmVWidgetComponent
  • trunk/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc

    r951 r1046  
    2525//
    2626//
     27<<<<<<< G4OpenGLXmVWidgetComponent.cc
    2728// $Id: G4OpenGLXmVWidgetComponent.cc,v 1.5 2006/06/29 21:20:08 gunter Exp $
    2829// GEANT4 tag $Name: geant4-09-02-ref-02 $
     30=======
     31// $Id: G4OpenGLXmVWidgetComponent.cc,v 1.6 2009/01/19 16:53:42 lgarnier Exp $
     32// GEANT4 tag $Name:  $
     33>>>>>>> 1.6
    2934//
    3035//Base class for all Motif component widgets
  • trunk/source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc

    r951 r1046  
    2525//
    2626//
     27<<<<<<< G4OpenGLXmVWidgetContainer.cc
    2728// $Id: G4OpenGLXmVWidgetContainer.cc,v 1.5 2006/06/29 21:20:10 gunter Exp $
    2829// GEANT4 tag $Name: geant4-09-02-ref-02 $
     30=======
     31// $Id: G4OpenGLXmVWidgetContainer.cc,v 1.7 2009/03/13 09:50:03 lgarnier Exp $
     32// GEANT4 tag $Name:  $
     33>>>>>>> 1.7
    2934//
    3035//Base class for all Motif container widgets
  • trunk/source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc

    r951 r1046  
    2525//
    2626//
     27<<<<<<< G4OpenGLXmVWidgetShell.cc
    2728// $Id: G4OpenGLXmVWidgetShell.cc,v 1.5 2006/06/29 21:20:14 gunter Exp $
    2829// GEANT4 tag $Name: geant4-09-02-ref-02 $
     30=======
     31// $Id: G4OpenGLXmVWidgetShell.cc,v 1.6 2009/01/19 16:53:42 lgarnier Exp $
     32// GEANT4 tag $Name:  $
     33>>>>>>> 1.6
    2934//
    3035//Base class for all Motif shell widgets
  • trunk/source/visualization/OpenGL/src/G4OpenGLXmViewerMessenger.cc

    r951 r1046  
    2525//
    2626//
     27<<<<<<< G4OpenGLXmViewerMessenger.cc
    2728// $Id: G4OpenGLXmViewerMessenger.cc,v 1.4 2006/06/29 21:20:18 gunter Exp $
    2829// GEANT4 tag $Name: geant4-09-02-ref-02 $
     30=======
     31// $Id: G4OpenGLXmViewerMessenger.cc,v 1.5 2009/01/19 16:53:42 lgarnier Exp $
     32// GEANT4 tag $Name:  $
     33>>>>>>> 1.5
    2934
    3035#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
Note: See TracChangeset for help on using the changeset viewer.