Changeset 1023 for trunk


Ignore:
Timestamp:
Apr 28, 2009, 2:57:38 PM (15 years ago)
Author:
garnier
Message:

update before cvs

Location:
trunk/source/visualization
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/History

    r959 r1023  
    1 $Id: History,v 1.435 2009/04/01 16:34:13 lgarnier Exp $
     1$Id: History,v 1.437 2009/04/27 16:23:06 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2525---------------------------------------
    2626
    27 1st April 2009  Laurent Garnier (vis-V09-02-01)
    28 - opengl-V09-02-01 : Improvments in order to use GL2PS for printing
     2727th April 2009  John Allison (vis-V09-02-02)
     28- opengl-V09-02-03: Fix compiler warnings.
     29- visexternal-V09-02-03: Fix compiler warnings.
     30
     316th April 2009  Joseph Perl (vis-V09-02-01)
     32- opengl-V09-02-02 : Improvments in order to use GL2PS for printing
    2933- openinventor-V09-02-01 : Improvments in order to use GL2PS for printing
    30 - visexternal-V09-02-01 :  Add GL2PS library in external (it was in
     34- visexternal-V09-02-02 :  Add GL2PS library in external (it was in
    3135  OpenInventor before)
    3236

  • trunk/source/visualization/OpenGL/History

    r975 r1023  
    1 $Id: History,v 1.135 2009/04/08 16:55:44 lgarnier Exp $
     1$Id: History,v 1.136 2009/04/27 16:02:50 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2020History file for visualization/OpenGL
    2121-------------------------------------
     2228th April 2009, Laurent Garnier
     23 - G4OpenGLXViewer,G4OpenGLViewer : End of moving printEPS and associated
     24   functions from GLXViewer to GLViewer.   
     25 - G4OpenGLXViewer :
     26   - Remove debug methods
     27   - Add check in SetView() method
    2228
    23298th April 2009, Laurent Garnier
    … …  
    3844   mode on some windows size
    3945
    40 6th April 2009, Joseph Perl (opengl-V09-02-02)
     466th April 2009, Joseph Perl (opengl-V09-02-02, then opengl-V09-02-03)
    4147 - New tag to clean up all of the cases of files that changed only in the cvs id.
    4248

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

    r1009 r1023  
    3737#include "G4OpenGLImmediateXmViewer.hh"
    3838#include "G4OpenGLImmediateSceneHandler.hh"
    39 #include "G4StateManager.hh"
    4039
    4140#include "G4ios.hh"
    … …  
    117116  printf("G4OpenGLImmediateXmViewer::DrawView : need Kernel/Process/Finish\n");
    118117#endif
    119 
    120 
    121118  NeedKernelVisit ();  // Always need to visit G4 kernel.
    122 
    123119  ProcessView ();
    124 
    125120  FinishView ();
    126 
    127121
    128122}

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

    r1008 r1023  
    4949#include "G4AttHolder.hh"
    5050#include "G4AttCheck.hh"
    51 
    52 #include "G4OpenGLXViewer.hh"
    5351
    5452// GL2PS
    … …  
    438436  int size;
    439437
    440 #ifdef G4DEBUG_VIS_OGL
    441   printf("G4OpenGLViewer::grabPixels\n");
    442 #endif
    443438  if (inColor) {
    444439    format = GL_RGB;

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

    r1008 r1023  
    9292
    9393void G4OpenGLXViewer::SetView () {
    94 #ifdef G4DEBUG_VIS_OGL
    95     printf("G4OpenGLXViewer::SetView \n");
    96 #endif
    9794  Bool success = glXMakeCurrent (dpy, win, cx);
    9895  if (!success) {

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

    r1009 r1023  
    5656#include <Xm/DrawingA.h>
    5757
    58 
    5958#include <sstream>
    6059
    … …  
    6564    G4StateManager* stateManager = G4StateManager::GetStateManager();
    6665    G4ApplicationState state = stateManager->GetCurrentState();
    67     if (state == G4State_Idle) {
     66    //    if (state == G4State_Idle) {
    6867#ifdef G4DEBUG_VIS_OGL
    6968      printf("G4OpenGLXmViewer::ShowView LOOOOOOOOOOOOOOOPPPPPPPPPPP\n");
    7069#endif
    7170      G4Xt::getInstance () -> SecondaryLoop ();
    72     }
     71      //    }
    7372#ifdef G4DEBUG_VIS_OGL
    7473    printf("G4OpenGLXmViewer::ShowView END ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");

  • trunk/source/visualization/OpenInventor/src/SoMarkerSet.cc

    r959 r1023  
    657657//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
    658658{
    659   //  printf("HEPVis_SoMarkerSet::GLRender\n");
    660659  SoState* state = aAction->getState();
    661660

  • trunk/source/visualization/externals/gl2ps/History

    r974 r1023  
    1 $Id: History,v 1.5 2009/04/08 15:26:59 lgarnier Exp $
     1$Id: History,v 1.7 2009/04/27 15:29:46 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
     2027 April 2009, Laurent Garnier (visexternal-V09-02-03)
     21 - gl2ps/src/gl2ps.cc : Fix some warnings on Linux
    1922
    20238 April 2009, Laurent Garnier
Note: See TracChangeset for help on using the changeset viewer.