Changeset 940


Ignore:
Timestamp:
Mar 5, 2009, 12:35:38 PM (15 years ago)
Author:
garnier
Message:

Ok dans CVS

Location:
trunk/source/visualization
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/GNUmakefile

    r931 r940  
    1 # $Id: GNUmakefile,v 1.22 2009/02/16 15:31:05 lgarnier Exp $
     1# $Id: GNUmakefile,v 1.23 2009/03/05 11:32:07 lgarnier Exp $
    22# -----------------------------------------------------------------------
    33# GNUmakefile for visualization and modeling.  John Allison, 5/7/95.
    … …  
    2525endif
    2626
    27 CPPFLAGS += -DG4DEBUG_VIS_OGL
     27# For Debug mode
     28# CPPFLAGS += -DG4DEBUG_VIS_OGL
     29# CPPFLAGS += -DG4DEBUG_VIS_OI
     30# CPPFLAGS += -DG4DEBUG_VIS_MANAGEMENT
    2831
    2932# Libraries which can be used without external packages or libraries...

  • trunk/source/visualization/History

    r931 r940  
    2424History file for visualization category
    2525---------------------------------------
     26
     275th March 2009, Laurent Garnier
     28 - Now using Gl2PS method to do PS
     29 - Add flag in GNUMakefile to compile in debug mode
     30 - Remplacing glBitmap by GL_POINTS to draw marker : Speed improvment
     31  and gl2ps can now draw Markers.
    2632
    273324th February 2009  John Allison

  • trunk/source/visualization/OpenGL/GNUmakefile

    r924 r940  
    1 # $Id: GNUmakefile,v 1.9 2009/02/16 15:31:05 lgarnier Exp $
     1# $Id: GNUmakefile,v 1.10 2009/03/05 11:17:42 lgarnier Exp $
    22
    33name := G4OpenGL
    … …  
    99# Definition of macro for moc files (for Qt use only)
    1010MOC_MACRO = -DG4VIS_BUILD_OPENGLQT_DRIVER
     11
     12# For debug mode
     13# CPPFLAGS += -DG4DEBUG_VIS_OGL
    1114
    1215GLOBLIBS  = libG4vis_management.lib libG4modeling.lib

  • trunk/source/visualization/OpenGL/History

    r938 r940  
    1 $Id: History,v 1.127 2009/03/03 14:51:29 lgarnier Exp $
     1$Id: History,v 1.128 2009/03/05 11:04:20 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2121-------------------------------------
    2222
    23 3rd March 2009, Laurent Garnier
     234rd March 2009, Laurent Garnier
    2424 - G4OpenGLQtViewer:
    2525   - Suppress some warnings when saving file
    2626   - Changing size is now allowed when saving (to save with better resolution than screen size)
     27 - G4OpenGLViewer: Some renaming for print methods to be more clear about Vectored and non Vectored
     28 - G4OpenGLViewer: Now using Gl2PS method to do PS (changes also in G4OpenGLXViewer and G4OpenGLQtViewer)
    2729
    28301st March 2009, Laurent Garnier

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

    r938 r940  
    2525//
    2626//
    27 // $Id: G4OpenGLViewer.hh,v 1.27 2009/02/16 15:31:05 lgarnier Exp $
     27// $Id: G4OpenGLViewer.hh,v 1.28 2009/03/05 11:04:20 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

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

    r938 r940  
    2525//
    2626//
    27 // $Id: G4OpenGLQtViewer.cc,v 1.36 2009/02/25 15:14:29 lgarnier Exp $
     27// $Id: G4OpenGLQtViewer.cc,v 1.37 2009/03/05 11:04:20 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

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

    r931 r940  
    3232//                                G4OpenGLStoredViewer.
    3333
    34 #define G4DEBUG_VIS_OGL
    35 
    3634#ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    3735

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

    r938 r940  
    3333//                              and G4OpenGLStoredViewer.
    3434
    35 #define G4DEBUG_VIS_OGL 1
    3635#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
    3736
    … …  
    122121      FinishView ();
    123122    } else {
    124 #ifdef G4DEBUG_VIS_OGL
    125       printf("**************************  G4OpenGLStoredXmViewer::ComputeView Need kernel Visit \n");
    126 #endif
    127123    // However, union cutaways are implemented in DrawDisplayLists, so make
    128124    // an extra pass...

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

    r939 r940  
    2525//
    2626//
    27 // $Id: G4OpenGLViewer.cc,v 1.48 2009/02/16 15:31:05 lgarnier Exp $
     27// $Id: G4OpenGLViewer.cc,v 1.49 2009/03/05 11:04:20 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    3333
    3434#ifdef G4VIS_BUILD_OPENGL_DRIVER
    35 
    36 #define G4DEBUG_VIS_OGL
    3735
    3836#include "G4ios.hh"
    … …  
    5149#include "G4AttHolder.hh"
    5250#include "G4AttCheck.hh"
    53 #include "G4StateManager.hh"
    5451
    5552// GL2PS
    … …  
    146143
    147144void G4OpenGLViewer::ClearView () {
    148 #ifdef G4DEBUG_VIS_OGL
    149   printf("G4OpenGLViewer::ClearView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
    150 #endif
    151145  glClearColor (background.GetRed(),
    152146                background.GetGreen(),
    … …  
    160154  glClear (GL_STENCIL_BUFFER_BIT);
    161155  glFlush ();
    162 #ifdef G4DEBUG_VIS_OGL
    163   printf("G4OpenGLViewer::ClearView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
    164 #endif
    165156}
    166157
    … …  
    178169
    179170void G4OpenGLViewer::SetView () {
    180 
    181 #ifdef G4DEBUG_VIS_OGL
    182   printf("G4OpenGLViewer::SetView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
    183 #endif
    184171
    185172  if (!fSceneHandler.GetScene()) {
    … …  
    321308  background = fVP.GetBackgroundColour ();
    322309
    323 #ifdef G4DEBUG_VIS_OGL
    324   printf("G4OpenGLViewer::SetView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
    325 #endif
    326310}
    327311
    328312void G4OpenGLViewer::HaloingFirstPass () {
    329313 
    330 #ifdef G4DEBUG_VIS_OGL
    331   printf("G4OpenGLViewer::HaloingFirstPass VVVVVVVVVVVVVVVVVV \n");
    332 #endif
    333314  //To perform haloing, first Draw all information to the depth buffer
    334315  //alone, using a chunky line width, and then Draw all info again, to
    … …  
    353334void G4OpenGLViewer::HaloingSecondPass () {
    354335
    355 #ifdef G4DEBUG_VIS_OGL
    356   printf("G4OpenGLViewer::HaloingSecondtPass VVVVVVVVVVVVVVVVVV \n");
    357 #endif
    358336  //And finally, turn the colour buffer back on with a sesible line width...
    359337  glColorMask (GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
    … …  
    907885  if (!fGL2PSAction) return false;
    908886
    909 
    910887  fGL2PSAction->setFileName(fPrintFilename.c_str());
    911888  // try to resize

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

    r939 r940  
    2525//
    2626//
    27 // $Id: G4OpenGLXViewer.cc,v 1.49 2009/02/16 15:31:05 lgarnier Exp $
     27// $Id: G4OpenGLXViewer.cc,v 1.50 2009/03/05 11:04:20 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    4949#include "G4Point3D.hh"
    5050#include "G4Normal3D.hh"
    51 #include "G4StateManager.hh"
    5251
    5352#include <X11/Xatom.h>

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

    r930 r940  
    3333/*--------------------------------------------------------------------------*/
    3434
    35 //#define G4DEBUG_VIS_OGL 1
    36 
    3735// this :
    3836#include <HEPVis/actions/SoGL2PSAction.h>
    … …  
    5351//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
    5452{
    55 #ifdef G4DEBUG_VIS_OGL
    56   printf("SoGL2PSAction::initClass\n");
    57 #endif
    5853  SO_ACTION_INIT_CLASS(SoGL2PSAction,SoGLRenderAction);
    5954}
    … …  
    6762//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
    6863{
    69 #ifdef G4DEBUG_VIS_OGL
    70   printf("SoGL2PSAction::SoGL2PSAction\n");
    71 #endif
    7264  setFileName("out.ps");
    7365  SO_ACTION_CONSTRUCTOR(SoGL2PSAction);
    … …  
    119111//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
    120112{
    121 #ifdef G4DEBUG_VIS_OGL
    122   printf("SoGL2PSAction::addBitmap\n");
    123 #endif
    124113  if(!fFile) return false;
    125114  GLboolean valid;
    … …  
    172161}
    173162
    174 
    175163#endif

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

    r939 r940  
    545545  G4ApplicationState state = stateManager->GetCurrentState();
    546546  if (state == G4State_Idle) {
    547     printf("State is ILDE....ProcessScene\n");
    548   } else {
    549     printf("State is not ILDE....ProcessScene\n");
    550   }
    551   if (state == G4State_Idle) {
    552547
    553548    visManager->SetEventRefreshing(true);

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

    r936 r940  
    9090   
    9191    GetPoints(traj, trajectoryLine, auxiliaryPoints, stepPoints);
     92
    9293    if (lineRequired) {
    9394      G4VisAttributes trajectoryLineAttribs(colour);
Note: See TracChangeset for help on using the changeset viewer.