Changeset 789


Ignore:
Timestamp:
Apr 23, 2008, 3:28:50 PM (16 years ago)
Author:
garnier
Message:

r815@wl-72126: garnier | 2008-04-23 15:28:34 +0200
maj par rapport au CVS

Location:
trunk/geant4/visualization/OpenGL
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/visualization/OpenGL/GNUmakefile

    r777 r789  
    66  G4INSTALL = ../../..
    77endif
    8 
    98
    109# Definition of macro for moc files (for Qt use only)

  • trunk/geant4/visualization/OpenGL/History

    r776 r789  
    1 $Id: History,v 1.111 2008/03/11 16:05:56 lgarnier Exp $
     1$Id: History,v 1.112 2008/04/04 13:32:22 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2020History file for visualization/OpenGL
    2121-------------------------------------
     22
     2322th April 2008  Laurent Garnier
     24- Add better moc control/compilation step in GNUmakefile
     25
     264th April 2008  John Allison  (opengl-V09-01-01)
     27- Fixed DBL_MAX problem in 2D drawing:
     28  o changed G4OPENGL_DBL_MAX to G4OPENGL_FLT_BIG.
     29- Fix gcc-4.3.0 compiler warnings.
    2230
    233111th March 2008, Laurent Garnier

  • trunk/geant4/visualization/OpenGL/include/G4OpenGL.hh

    r608 r789  
    2424// ********************************************************************
    2525//
    26 // $Id: G4OpenGL.hh,v 1.6 2007/11/15 10:14:23 allison Exp $
     26// $Id: G4OpenGL.hh,v 1.7 2008/04/04 13:32:22 allison Exp $
    2727// GEANT4 tag $Name:  $
    2828//
    … …  
    4141#include <GL/glu.h>
    4242
    43 #define G4OPENGL_DBL_MAX 1.e308
     43#define G4OPENGL_FLT_BIG 1.e20
    4444
    4545#endif

  • trunk/geant4/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh

    r688 r789  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredSceneHandler.hh,v 1.25 2008/01/04 22:07:01 allison Exp $
     27// $Id: G4OpenGLStoredSceneHandler.hh,v 1.26 2008/04/04 13:32:22 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    9999    TO(G4int id, const G4Transform3D& tr = G4Transform3D()):
    100100      fDisplayListId(id), fTransform(tr), fPickName(0),
    101       fStartTime(-G4OPENGL_DBL_MAX), fEndTime(G4OPENGL_DBL_MAX) {}
     101      fStartTime(-DBL_MAX), fEndTime(DBL_MAX) {}
    102102    G4int fDisplayListId;
    103103    G4Transform3D fTransform;

  • trunk/geant4/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc

    r754 r789  
    2525//
    2626//
    27 // $Id: G4OpenGLImmediateSceneHandler.cc,v 1.29 2008/02/18 08:53:49 asaim Exp $
     27// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.30 2008/04/04 13:32:22 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    171171  glPushMatrix();
    172172  glLoadIdentity();
    173 //////  glOrtho (-1., 1., -1., 1., -G4OPENGL_DBL_MAX, G4OPENGL_DBL_MAX);
    174   glOrtho (-1., 1., -1., 1., -1., 1.);
     173  glOrtho (-1., 1., -1., 1., -G4OPENGL_FLT_BIG, G4OPENGL_FLT_BIG);
    175174  glMatrixMode (GL_MODELVIEW);
    176175  glPushMatrix();

  • trunk/geant4/visualization/OpenGL/src/G4OpenGLSceneHandler.cc

    r754 r789  
    2525//
    2626//
    27 // $Id: G4OpenGLSceneHandler.cc,v 1.53 2008/02/01 06:26:45 allison Exp $
     27// $Id: G4OpenGLSceneHandler.cc,v 1.54 2008/04/04 13:32:22 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    736736  u_knot_array = u_knot_array_ptr = new GLfloat [nurb.GetnbrKnots(G4NURBS::U)];
    737737  G4NURBS::KnotsIterator u_iterator (nurb, G4NURBS::U);
    738   while (u_iterator.pick (u_knot_array_ptr++));
     738  while (u_iterator.pick (u_knot_array_ptr++)){}
    739739
    740740  GLfloat *v_knot_array, *v_knot_array_ptr;
    741741  v_knot_array = v_knot_array_ptr = new GLfloat [nurb.GetnbrKnots(G4NURBS::V)];
    742742  G4NURBS::KnotsIterator v_iterator (nurb, G4NURBS::V);
    743   while (v_iterator.pick (v_knot_array_ptr++));
     743  while (v_iterator.pick (v_knot_array_ptr++)){}
    744744
    745745  GLfloat *ctrl_pnt_array, *ctrl_pnt_array_ptr;
    … …  
    747747    new GLfloat [nurb.GettotalnbrCtrlPts () * G4NURBS::NofC];
    748748  G4NURBS::CtrlPtsCoordsIterator c_p_iterator (nurb);
    749   while (c_p_iterator.pick (ctrl_pnt_array_ptr++));
     749  while (c_p_iterator.pick (ctrl_pnt_array_ptr++)){}
    750750
    751751  // Get vis attributes - pick up defaults if none.

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

    r754 r789  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredSceneHandler.cc,v 1.36 2008/02/18 08:53:49 asaim Exp $
     27// $Id: G4OpenGLStoredSceneHandler.cc,v 1.37 2008/04/04 13:32:22 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    133133    glPushMatrix();
    134134    glLoadIdentity();
    135 //    glOrtho (-1., 1., -1., 1., -G4OPENGL_DBL_MAX, G4OPENGL_DBL_MAX);
    136     glOrtho (-1., 1., -1., 1., -1., 1.);
     135    glOrtho (-1., 1., -1., 1., -G4OPENGL_FLT_BIG, G4OPENGL_FLT_BIG);
    137136    glMatrixMode (GL_MODELVIEW);
    138137    glPushMatrix();

  • trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredViewer.cc

    r688 r789  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredViewer.cc,v 1.23 2007/04/04 16:50:27 allison Exp $
     27// $Id: G4OpenGLStoredViewer.cc,v 1.24 2008/04/04 13:32:22 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    168168
    169169  // Display time at "head" of time range, which is fEndTime...
    170   if (fDisplayHeadTime && fEndTime < G4OPENGL_DBL_MAX) {
     170  if (fDisplayHeadTime && fEndTime < DBL_MAX) {
    171171    glMatrixMode (GL_PROJECTION);
    172172    glPushMatrix();
    173173    glLoadIdentity();
    174     glOrtho (-1., 1., -1., 1., -G4OPENGL_DBL_MAX, G4OPENGL_DBL_MAX);
     174    glOrtho (-1., 1., -1., 1., -G4OPENGL_FLT_BIG, G4OPENGL_FLT_BIG);
    175175    glMatrixMode (GL_MODELVIEW);
    176176    glPushMatrix();
    … …  
    193193
    194194  // Display light front...
    195   if (fDisplayLightFront && fEndTime < G4OPENGL_DBL_MAX) {
     195  if (fDisplayLightFront && fEndTime < DBL_MAX) {
    196196    G4double lightFrontRadius = (fEndTime - fDisplayLightFrontT) * c_light;
    197197    if (lightFrontRadius > 0.) {

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

    r754 r789  
    2525//
    2626//
    27 // $Id: G4OpenGLViewer.cc,v 1.36 2008/03/10 16:57:04 lgarnier Exp $
     27// $Id: G4OpenGLViewer.cc,v 1.37 2008/04/04 13:32:22 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    9090antialiasing_enabled (false),
    9191haloing_enabled (false),
    92 fStartTime(-G4OPENGL_DBL_MAX),
    93 fEndTime(G4OPENGL_DBL_MAX),
     92fStartTime(-DBL_MAX),
     93fEndTime(DBL_MAX),
    9494fFadeFactor(0.),
    9595fDisplayHeadTime(false),

  • trunk/geant4/visualization/OpenGL/src/G4OpenGLViewerMessenger.cc

    r608 r789  
    2525//
    2626//
    27 // $Id: G4OpenGLViewerMessenger.cc,v 1.11 2007/11/15 10:14:23 allison Exp $
     27// $Id: G4OpenGLViewerMessenger.cc,v 1.12 2008/04/04 13:32:22 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929
    … …  
    158158  fpCommandEndTime->SetGuidance("Set end and range of track time.");
    159159  parameter = new G4UIparameter ("end-time", 'd', omitable = false);
    160   parameter->SetDefaultValue(G4OPENGL_DBL_MAX);
     160  parameter->SetDefaultValue(DBL_MAX);
    161161  fpCommandEndTime->SetParameter(parameter);
    162162  parameter = new G4UIparameter ("end-time-unit", 's', omitable = false);
    … …  
    188188  fpCommandStartTime->SetGuidance("Set start and range of track time.");
    189189  parameter = new G4UIparameter ("start-time", 'd', omitable = false);
    190   parameter->SetDefaultValue(-G4OPENGL_DBL_MAX);
     190  parameter->SetDefaultValue(-DBL_MAX);
    191191  fpCommandStartTime->SetParameter(parameter);
    192192  parameter = new G4UIparameter ("start-time-unit", 's', omitable = false);
Note: See TracChangeset for help on using the changeset viewer.