Changeset 959


Ignore:
Timestamp:
Apr 2, 2009, 3:23:18 PM (15 years ago)
Author:
garnier
Message:

after maj on CVS good-HEAD

Location:
trunk/source/visualization
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/GNUmakefile

    r944 r959  
    2626
    2727# For Debug mode
    28 # CPPFLAGS += -DG4DEBUG_VIS_OGL
    29 # CPPFLAGS += -DG4DEBUG_VIS_OI
    30 # CPPFLAGS += -DG4DEBUG_VIS_MANAGEMENT
     28CPPFLAGS += -DG4DEBUG_VIS_OGL
     29CPPFLAGS += -DG4DEBUG_VIS_OI
     30CPPFLAGS += -DG4DEBUG_VIS_MANAGEMENT
    3131
    3232# Libraries which can be used without external packages or libraries...

  • trunk/source/visualization/History

    r954 r959  
    1 $Id: History,v 1.433 2009/03/19 12:00:11 lgarnier Exp $
     1$Id: History,v 1.435 2009/04/01 16:34:13 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2424History file for visualization category
    2525---------------------------------------
     26
     271st April 2009  Laurent Garnier (vis-V09-02-01)
     28- opengl-V09-02-01 : Improvments in order to use GL2PS for printing
     29- 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
     31  OpenInventor before)
    2632
    273314th March 2009  John Allison
    … …  
    566216 February 2009, Laurent Garnier
    5763 - Creation of this gl2ps library in order to have a gl2ps for all viewers.
     64 - GNUMakefile : Add the gl2ps external library
    5865 - Some modifications in GNUMakefile for gl2ps. Packages OpenInventor,
    5966   OpenGL had also been modified for gl2ps.

  • trunk/source/visualization/OpenGL/History

    r951 r959  
    2121-------------------------------------
    2222
    23 24th March 2009, Laurent Garnier (vis-V09-02-01)
     2324th March 2009, Laurent Garnier (opengl-V09-02-01)
    2424 - G4OpenGLViewer : Add a fix and resizing when X/Y size was even (lack of precision
    2525   in a /2)

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

    r956 r959  
    2626//
    2727// $Id: G4OpenGLWin32Viewer.hh,v 1.15 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r955 r959  
    16341634*/
    16351635void G4OpenGLQtViewer::rescaleImage(
    1636  int /*aWidth*/
    1637 ,int /*aHeight*/
     1636 int /* aWidth */
     1637,int /* aHeight */
    16381638){
    16391639  //  GLfloat* feedback_buffer;

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

    r955 r959  
    214214{
    215215
     216#ifdef G4DEBUG_VIS_OGL
    216217  printf("G4OpenGLStoredSceneHandler::AddPrimitive\n");
    217 
     218#endif
    218219  std::vector< G4Polymarker > poly;
    219220    // 40,83 N03 lancement
    … …  
    286287  }
    287288#endif 
     289#ifdef G4DEBUG_VIS_OGL
    288290  printf("G4OpenGLStoredSceneHandler::AddPrimitive new marker list\n");
     291#endif
    289292  AddPrimitivePreamble(polymarker);
    290293  G4OpenGLSceneHandler::AddPrimitive(polymarker);
    … …  
    378381void G4OpenGLStoredSceneHandler::EndModeling () {
    379382  // Make a List which calls the other lists.
     383#ifdef G4DEBUG_VIS_OGL
    380384  printf("G4OpenGLStoredSceneHandler::EndModeling Cree une nouvelle liste+++++++++++++++++++++++++++\n");
     385#endif
    381386  fTopPODL = glGenLists (1);
    382387  if (glGetError() == GL_OUT_OF_MEMORY) {  // Could pre-allocate?

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

    r955 r959  
    115115
    116116void G4OpenGLViewer::ClearView () {
     117#ifdef G4DEBUG_VIS_OGL
    117118  printf("G4OpenGLViewer::ClearView\n");
     119#endif
    118120  glClearColor (background.GetRed(),
    119121                background.GetGreen(),
    … …  
    141143void G4OpenGLViewer::ResizeGLView()
    142144{
     145#ifdef G4DEBUG_VIS_OGL
    143146  printf("G4OpenGLViewer::ResizeGLView %d %d\n",fWinSize_x,fWinSize_y);
     147#endif
    144148  // Check size
    145149  GLint dims[2];
    … …  
    182186  GLint Y = (fWinSize_y - side) / 2;
    183187 
     188#ifdef G4DEBUG_VIS_OGL
    184189  printf("G4OpenGLViewer::ResizeGLView X:%d Y:%d W:%d H:%d --side%d\n",(fWinSize_x - side) / 2,(fWinSize_y - side) / 2,fWinSize_x,fWinSize_y,side);
     190#endif
    185191  glViewport(X, Y, side, side);
    186192  //    glViewport(0, 0, fWinSize_x,fWinSize_y); 

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

    r955 r959  
    413413void G4OpenGLXViewer::printEPS() {
    414414 
     415#ifdef G4DEBUG_VIS_OGL
    415416    printf("G4OpenGLXViewer::print \n");
     417#endif
    416418
    417419  //using namespace std;
    … …  
    541543//                  fGLXWin,
    542544//                  cx);
     545#ifdef G4DEBUG_VIS_OGL
    543546    printf("G4OpenGLXViewer::print Restored context:%d old winGL:%d \n",cx,fGLXWin);
     547#endif
    544548    //    printf("Error 1:%d 2:%d\n",er1,er2);
    545549   
    … …  
    589593
    590594 
     595#ifdef G4DEBUG_VIS_OGL
    591596  printf("------%d------\n",tmp_cx);
     597#endif
    592598  return glXCreateContext (dpy,
    593599                           pvi,

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

    r914 r959  
    1616// * for the full disclaimer and the limitation of liability.         *
    1717// *                                                                  *
    18 // * This  code  implementation is the result of the  scientific and *
     18// * This  code  implementation is the result of  the  scientific and *
    1919// * technical work of the GEANT4 collaboration.                      *
    2020// * By using,  copying,  modifying or  distributing the software (or *
    … …  
    2626//
    2727// $Id: G4OpenInventorXt.cc,v 1.4 2006/06/29 21:22:24 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r931 r959  
    732732    delete bitmap;
    733733  }
     734#ifdef G4DEBUG_VIS_OI
    734735  printf("DM %d %d %f %f",w,h,xorig,yorig);
     736#endif
    735737
    736738  if(aAction->isOfType(SoGL2PSAction::getClassTypeId())) {
     739#ifdef G4DEBUG_VIS_OI
    737740    printf(" GL2PS ");
     741#endif
    738742    ((SoGL2PSAction*)aAction)->addBitmap(w-2,h-2,xorig,yorig,xmove,ymove);
    739743  }

  • trunk/source/visualization/management/src/G4VSceneHandler.cc

    r948 r959  
    470470
    471471void G4VSceneHandler::ProcessScene (G4VViewer&) {
     472
     473#ifdef G4DEBUG_VIS_MANAGEMENT
    472474  printf("G4VSceneHandler::ProcessScene : BEGIN\n");
     475#endif
    473476
    474477  if (!fpScene) return;
    … …  
    482485  fReadyForTransients = false;
    483486
     487#ifdef G4DEBUG_VIS_MANAGEMENT
    484488  printf("G4VSceneHandler::ProcessScene : Before clear store \n");
     489#endif
    485490  // Clear stored scene, if any, i.e., display lists, scene graphs.
    486491  ClearStore ();
    … …  
    503508    }
    504509
     510#ifdef G4DEBUG_VIS_MANAGEMENT
    505511    printf("G4VSceneHandler::ProcessScene : begin model\n");
     512#endif
    506513    BeginModeling ();
    507514
    … …  
    544551  fReadyForTransients = true;
    545552
     553#ifdef G4DEBUG_VIS_MANAGEMENT
    546554  printf("G4VSceneHandler::ProcessScene : Idle ?\n");
     555#endif
    547556  // Refresh event from end-of-event model list.  Allow only in Idle state...
    548557  G4StateManager* stateManager = G4StateManager::GetStateManager();
    549558  G4ApplicationState state = stateManager->GetCurrentState();
    550559  if (state == G4State_Idle) {
     560#ifdef G4DEBUG_VIS_MANAGEMENT
    551561    printf("G4VSceneHandler::ProcessScene : IDLE\n");
     562#endif
    552563
    553564    visManager->SetEventRefreshing(true);

  • trunk/source/visualization/management/src/G4VViewer.cc

    r948 r959  
    111111void G4VViewer::ProcessView ()
    112112{
     113#ifdef G4DEBUG_VIS_MANAGEMENT
    113114  printf("G4VViewer::ProcessView\n");
     115#endif
    114116
    115117  // If ClearStore has been requested, e.g., if the scene has changed,
    … …  
    119121  // DrawView)...
    120122  if (fNeedKernelVisit) {
     123#ifdef G4DEBUG_VIS_MANAGEMENT
    121124    printf("G4VViewer::ProcessView : NeedKernelVisit\n");
     125#endif
    122126    // Reset flag.  This must be done before ProcessScene to prevent
    123127    // recursive calls when recomputing transients...

  • trunk/source/visualization/modeling/src/G4TrajectoryDrawerUtils.cc

    r942 r959  
    2525//
    2626// $Id: G4TrajectoryDrawerUtils.cc,v 1.12 2009/02/24 12:00:56 allison Exp $
    27 // GEANT4 tag $Name: modeling-V09-02-00 $
     27// GEANT4 tag $Name: $
    2828//
    2929// Jane Tinslay, John Allison, Joseph Perl November 2005
    … …  
    9090   
    9191    GetPoints(traj, trajectoryLine, auxiliaryPoints, stepPoints);
    92 
     92   
    9393    if (lineRequired) {
    9494      G4VisAttributes trajectoryLineAttribs(colour);
Note: See TracChangeset for help on using the changeset viewer.