Ignore:
Timestamp:
Mar 26, 2009, 5:57:53 PM (17 years ago)
Author:
garnier
Message:

change headers pour correspondre a cvs

Location:
trunk/source/visualization/OpenGL/src
Files:
17 edited

Legend:

Unmodified
Added
Removed

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

    r911 r951  
    2525//
    2626//
    27 // $Id: G4OpenGLBitMapStore.cc,v 1.5 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4OpenGLBitMapStore.cc,v 1.4 2007/11/15 10:14:23 allison Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

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

    r911 r951  
    2525//
    2626//
    27 // $Id: G4OpenGLFontBaseStore.cc,v 1.4 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4OpenGLFontBaseStore.cc,v 1.3 2006/06/29 21:18:56 gunter Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

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

    r911 r951  
    2525//
    2626//
    27 // $Id: G4OpenGLImmediateWin32.cc,v 1.12 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4OpenGLImmediateWin32.cc,v 1.11 2006/08/14 12:07:19 allison Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

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

    r873 r951  
    2626//
    2727// $Id: G4OpenGLQtExportDialog.cc,v 1.9 2008/10/24 14:17:10 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

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

    r873 r951  
    2626//
    2727// $Id: G4OpenGLQtMovieDialog.cc,v 1.8 2008/10/24 13:49:19 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

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

    r911 r951  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredWin32.cc,v 1.15 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4OpenGLStoredWin32.cc,v 1.14 2006/08/14 12:07:19 allison Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

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

    r911 r951  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredX.cc,v 1.15 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4OpenGLStoredX.cc,v 1.14 2007/08/21 14:05:51 allison Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

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

    r911 r951  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredXm.cc,v 1.12 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4OpenGLStoredXm.cc,v 1.11 2006/08/14 12:07:19 allison Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

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

    r911 r951  
    2525//
    2626//
    27 // $Id: G4OpenGLTransform3D.cc,v 1.9 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4OpenGLTransform3D.cc,v 1.8 2006/06/29 21:19:32 gunter Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

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

    r950 r951  
    442442    XVisualInfo* pvi;
    443443    GLXContext pcx = create_GL_print_context(pvi);
    444 //     cmap = XCreateColormap (dpy,
    445 //                          XRootWindow(dpy, pvi -> screen),
    446 //                          pvi -> visual,
    447 //                          AllocNone);
    448 //     if (!cmap) {
    449 //       fViewId = -1;  // This flags an error.
    450 //       G4cerr << "G4OpenGLViewer::G4OpenGLViewer failed to allocate a Colormap."
    451 //              << G4endl;
    452 //       return;
    453 //     }
    454 //     swa.colormap = cmap;
     444
    455445    if (!pcx) {
    456446      G4cout << "Unable to create print context." << G4endl;
    … …  
    474464    }
    475465
    476     Drawable root;
    477     int x, y;
    478     unsigned int rw, rh,bw,rd;
    479 
    480 
    481     XGetGeometry(dpy, pmap, &root, &x, &y, &rw, &rh, &bw, &rd);
    482 #ifdef G4DEBUG_VIS_OGL
    483     printf("G4OpenGLXViewer::print after creation Size :%d %d %d %d rh:%D bw:%d rd:%d\n",x,y,rw,rh, bw, rd);
    484 #endif
    485     // Seems to be OK
    486 
    487 
    488 
    489466
    490467    GLXPixmap glxpmap = glXCreateGLXPixmap (dpy,
    … …  
    502479    fGLXWin=glxpmap;
    503480   
    504     // Should be remove : Already done by SetView
    505     //     bool er1 = glXMakeCurrent (dpy,
    506     //                                fGLXWin,  // pixmap win Id
    507     //                                cx); // pixmap context Id
    508    
    509     // should be remove because already done by SetView()
    510     //    glViewport (0, 0, fWinSize_x, fWinSize_y);
    511    
    512     //    InitializeGLView ();
    513481    int winX=fWinSize_x;
    514482    int winY=fWinSize_y;
    515483
    516     for (int tstX  = winX-2;tstX <=winX+2;tstX++) {
    517       for (int tstY  = winY-2;tstY <=winY+2;tstY++) {
     484    //#define CHECK_MULTIPLE_PRINT 1
     485#ifdef CHECK_MULTIPLE_PRINT
     486    for (int tstX  = 3000-2;tstX <=3000+2;tstX++) {
     487      for (int tstY  = 3000-2;tstY <=3000+2;tstY++) {
    518488        fWinSize_y = tstY;
    519489        fWinSize_x = tstX;
    … …  
    523493        file +=tstY;
    524494        file +=".eps";
     495#else
     496        std::string file = "G4OpenGL_XPixmapTest.eps";
     497#endif
    525498
    526499    // clear the buffers and window.
    … …  
    556529                 fWinSize_x, fWinSize_y);
    557530   
     531#ifdef CHECK_MULTIPLE_PRINT
    558532      }
    559533    }
     534    fWinSize_y = winY;
     535    fWinSize_x = winX;
     536#endif
    560537    fGLXWin=tmp_win;
    561538    cx=tmp_cx;
    562539   
    563     bool er2 = glXMakeCurrent (dpy,
    564                     fGLXWin,
    565                     cx);
     540//     bool er2 = glXMakeCurrent (dpy,
     541//                  fGLXWin,
     542//                  cx);
    566543    printf("G4OpenGLXViewer::print Restored context:%d old winGL:%d \n",cx,fGLXWin);
    567544    //    printf("Error 1:%d 2:%d\n",er1,er2);

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

    r911 r951  
    2525//
    2626//
    27 // $Id: G4OpenGLXmRotationCallbacks.cc,v 1.17 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4OpenGLXmRotationCallbacks.cc,v 1.16 2008/07/28 15:36:45 lgarnier Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

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

    r911 r951  
    2525//
    2626//
    27 // $Id: G4OpenGLXmSliderBar.cc,v 1.8 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4OpenGLXmSliderBar.cc,v 1.7 2006/06/29 21:20:00 gunter Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//Slider bar class. Inherits from G4OpenGLXmVWidgetComponent

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

    r911 r951  
    2525//
    2626//
    27 // $Id: G4OpenGLXmStyleCallbacks.cc,v 1.15 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4OpenGLXmStyleCallbacks.cc,v 1.14 2006/06/29 21:20:02 gunter Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

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

    r911 r951  
    2525//
    2626//
    27 // $Id: G4OpenGLXmVWidgetComponent.cc,v 1.6 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4OpenGLXmVWidgetComponent.cc,v 1.5 2006/06/29 21:20:08 gunter Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//Base class for all Motif component widgets

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

    r944 r951  
    2525//
    2626//
    27 // $Id: G4OpenGLXmVWidgetContainer.cc,v 1.7 2009/03/13 09:50:03 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4OpenGLXmVWidgetContainer.cc,v 1.5 2006/06/29 21:20:10 gunter Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//Base class for all Motif container widgets

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

    r911 r951  
    2525//
    2626//
    27 // $Id: G4OpenGLXmVWidgetShell.cc,v 1.6 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4OpenGLXmVWidgetShell.cc,v 1.5 2006/06/29 21:20:14 gunter Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//Base class for all Motif shell widgets

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

    r911 r951  
    2525//
    2626//
    27 // $Id: G4OpenGLXmViewerMessenger.cc,v 1.5 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4OpenGLXmViewerMessenger.cc,v 1.4 2006/06/29 21:20:18 gunter Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929
    3030#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
Note: See TracChangeset for help on using the changeset viewer.