Ignore:
Timestamp:
Jan 5, 2011, 12:19:12 PM (15 years ago)
Author:
garnier
Message:

update

Location:
trunk/source/visualization/OpenInventor
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/OpenInventor/CVS/Entries

    r1347 r1348  
    11D/include////
    22D/src////
    3 /CMakeLists.txt/1.1/Wed Sep 29 19:12:22 2010//Tgeant4-09-04-ref-00
    4 /sources.cmake/1.1/Wed Sep 29 19:12:30 2010//Tgeant4-09-04-ref-00
    5 /History/1.108/Wed Nov 10 17:53:22 2010//Tgeant4-09-04-ref-00
     3/CMakeLists.txt/1.1/Wed Sep 29 19:12:22 2010//
     4/History/1.110/Mon Jan  3 14:40:22 2011//
     5/sources.cmake/1.1/Wed Sep 29 19:12:30 2010//
     6/GNUmakefile/1.10/Tue Nov 17 11:33:18 2009//

  • trunk/source/visualization/OpenInventor/History

    r1347 r1348  
    1 $Id: History,v 1.108 2010/11/10 17:53:22 allison Exp $
     1$Id: History,v 1.110 2010/12/27 13:02:19 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2020History file for visualization/OpenInventor
    2121-------------------------------------------
     22
     2327th December 2010  John Allison  (openinventor-V09-04-00)
     24- Tagged.
     25
     2611th December 2010  John Allison
     27- Fixed some Coverity warnings.
    2228
    232910th November 2010  John Allison  (openinventor-V09-03-02)

  • trunk/source/visualization/OpenInventor/include/CVS/Entries

    r1347 r1348  
    11D/HEPVis////
    2 /G4OpenInventor.hh/1.9/Thu Jun 29 21:20:22 2006//Tgeant4-09-04-ref-00
    3 /G4OpenInventorSceneHandler.hh/1.33/Tue Mar 27 15:24:15 2007//Tgeant4-09-04-ref-00
    4 /G4OpenInventorTransform3D.hh/1.7/Thu Jun 29 21:20:26 2006//Tgeant4-09-04-ref-00
    5 /G4OpenInventorViewer.hh/1.27/Thu Jun 29 21:20:28 2006//Tgeant4-09-04-ref-00
    6 /G4OpenInventorWin.hh/1.3/Thu Jun 29 21:20:30 2006//Tgeant4-09-04-ref-00
    7 /G4OpenInventorWin32.hh/1.7/Thu Jun 29 21:20:32 2006//Tgeant4-09-04-ref-00
    8 /G4OpenInventorWinViewer.hh/1.10/Fri Sep 18 12:48:43 2009//Tgeant4-09-04-ref-00
    9 /G4OpenInventorX.hh/1.7/Thu Jun 29 21:20:36 2006//Tgeant4-09-04-ref-00
    10 /G4OpenInventorXt.hh/1.3/Thu Jun 29 21:20:38 2006//Tgeant4-09-04-ref-00
    11 /G4OpenInventorXtViewer.hh/1.15/Fri Sep 18 12:48:43 2009//Tgeant4-09-04-ref-00
    12 /Geant4_SoPolyhedron.h/1.6/Thu Jun 29 21:20:42 2006//Tgeant4-09-04-ref-00
    13 /SoG4LineSet.h/1.2/Wed Dec 13 15:49:51 2006//Tgeant4-09-04-ref-00
    14 /SoG4MarkerSet.h/1.2/Wed Dec 13 15:49:53 2006//Tgeant4-09-04-ref-00
    15 /SoG4Polyhedron.h/1.3/Mon Sep 17 16:08:00 2007//Tgeant4-09-04-ref-00
     2/G4OpenInventor.hh/1.9/Thu Jun 29 21:20:22 2006//
     3/G4OpenInventorSceneHandler.hh/1.33/Tue Mar 27 15:24:15 2007//
     4/G4OpenInventorTransform3D.hh/1.7/Thu Jun 29 21:20:26 2006//
     5/G4OpenInventorViewer.hh/1.27/Thu Jun 29 21:20:28 2006//
     6/G4OpenInventorWin.hh/1.3/Thu Jun 29 21:20:30 2006//
     7/G4OpenInventorWin32.hh/1.7/Thu Jun 29 21:20:32 2006//
     8/G4OpenInventorWinViewer.hh/1.10/Fri Sep 18 12:48:43 2009//
     9/G4OpenInventorX.hh/1.7/Thu Jun 29 21:20:36 2006//
     10/G4OpenInventorXt.hh/1.3/Thu Jun 29 21:20:38 2006//
     11/G4OpenInventorXtViewer.hh/1.15/Fri Sep 18 12:48:43 2009//
     12/Geant4_SoPolyhedron.h/1.6/Thu Jun 29 21:20:42 2006//
     13/SoG4LineSet.h/1.2/Wed Dec 13 15:49:51 2006//
     14/SoG4MarkerSet.h/1.2/Wed Dec 13 15:49:53 2006//
     15/SoG4Polyhedron.h/1.3/Mon Sep 17 16:08:00 2007//

  • trunk/source/visualization/OpenInventor/include/HEPVis/CVS/Entries

    r1347 r1348  
    33D/nodekits////
    44D/nodes////
    5 /SbGL.h/1.3/Thu Jun 29 21:20:44 2006//Tgeant4-09-04-ref-00
    6 /SbMath.h/1.4/Thu Jun 29 21:20:46 2006//Tgeant4-09-04-ref-00
    7 /SbPainter.h/1.3/Thu Jun 29 21:20:48 2006//Tgeant4-09-04-ref-00
    8 /SbPainterPS.h/1.3/Thu Jun 29 21:20:50 2006//Tgeant4-09-04-ref-00
     5/SbGL.h/1.3/Thu Jun 29 21:20:44 2006//
     6/SbMath.h/1.4/Thu Jun 29 21:20:46 2006//
     7/SbPainter.h/1.3/Thu Jun 29 21:20:48 2006//
     8/SbPainterPS.h/1.3/Thu Jun 29 21:20:50 2006//

  • trunk/source/visualization/OpenInventor/include/HEPVis/actions/CVS/Entries

    r1347 r1348  
    1 /SoAlternateRepAction.h/1.3/Thu Jun 29 21:20:52 2006//Tgeant4-09-04-ref-00
    2 /SoCounterAction.h/1.5/Thu Jun 29 21:20:54 2006//Tgeant4-09-04-ref-00
    3 /SoGL2PSAction.h/1.7/Wed Feb 18 10:04:25 2009//Tgeant4-09-04-ref-00
     1/SoAlternateRepAction.h/1.3/Thu Jun 29 21:20:52 2006//
     2/SoCounterAction.h/1.5/Thu Jun 29 21:20:54 2006//
     3/SoGL2PSAction.h/1.7/Wed Feb 18 10:04:25 2009//
    44D

  • trunk/source/visualization/OpenInventor/include/HEPVis/misc/CVS/Entries

    r1347 r1348  
    1 /SoStyleCache.h/1.6/Thu Jun 29 21:21:14 2006//Tgeant4-09-04-ref-00
     1/SoStyleCache.h/1.6/Thu Jun 29 21:21:14 2006//
    22D

  • trunk/source/visualization/OpenInventor/include/HEPVis/nodekits/CVS/Entries

    r1347 r1348  
    1 /SoDetectorTreeKit.h/1.5/Thu Jun 29 21:21:16 2006//Tgeant4-09-04-ref-00
     1/SoDetectorTreeKit.h/1.5/Thu Jun 29 21:21:16 2006//
    22D

  • trunk/source/visualization/OpenInventor/include/HEPVis/nodes/CVS/Entries

    r1347 r1348  
    1 /SoBox.h/1.3/Thu Jun 29 21:21:18 2006//Tgeant4-09-04-ref-00
    2 /SoCons.h/1.3/Thu Jun 29 21:21:20 2006//Tgeant4-09-04-ref-00
    3 /SoImageWriter.h/1.3/Thu Jun 29 21:21:38 2006//Tgeant4-09-04-ref-00
    4 /SoMarkerSet.h/1.3/Thu Jun 29 21:22:03 2006//Tgeant4-09-04-ref-00
    5 /SoTrap.h/1.4/Thu Jun 29 21:22:06 2006//Tgeant4-09-04-ref-00
    6 /SoTrd.h/1.3/Thu Jun 29 21:22:08 2006//Tgeant4-09-04-ref-00
    7 /SoTubs.h/1.3/Thu Jun 29 21:22:10 2006//Tgeant4-09-04-ref-00
     1/SoBox.h/1.3/Thu Jun 29 21:21:18 2006//
     2/SoCons.h/1.3/Thu Jun 29 21:21:20 2006//
     3/SoImageWriter.h/1.3/Thu Jun 29 21:21:38 2006//
     4/SoMarkerSet.h/1.3/Thu Jun 29 21:22:03 2006//
     5/SoTrap.h/1.4/Thu Jun 29 21:22:06 2006//
     6/SoTrd.h/1.3/Thu Jun 29 21:22:08 2006//
     7/SoTubs.h/1.3/Thu Jun 29 21:22:10 2006//
    88D

  • trunk/source/visualization/OpenInventor/src/CVS/Entries

    r1347 r1348  
    1 /G4OpenInventor.cc/1.20/Thu Jun 29 21:22:12 2006//Tgeant4-09-04-ref-00
    2 /G4OpenInventorSceneHandler.cc/1.55/Wed Feb 18 14:21:38 2009//Tgeant4-09-04-ref-00
    3 /G4OpenInventorTransform3D.cc/1.8/Thu Jun 29 21:22:16 2006//Tgeant4-09-04-ref-00
    4 /G4OpenInventorViewer.cc/1.61/Wed Oct  6 10:09:57 2010//Tgeant4-09-04-ref-00
    5 /G4OpenInventorWin.cc/1.8/Wed May 26 14:30:46 2010//Tgeant4-09-04-ref-00
    6 /G4OpenInventorWinViewer.cc/1.27/Wed Nov 10 17:53:22 2010//Tgeant4-09-04-ref-00
    7 /G4OpenInventorXt.cc/1.5/Wed May 26 14:30:46 2010//Tgeant4-09-04-ref-00
    8 /G4OpenInventorXtViewer.cc/1.26/Wed Nov 10 17:53:22 2010//Tgeant4-09-04-ref-00
    9 /SbPainter.cc/1.5/Thu Jun 29 21:22:30 2006//Tgeant4-09-04-ref-00
    10 /SbPainterPS.cc/1.5/Thu Jun 29 21:22:32 2006//Tgeant4-09-04-ref-00
    11 /SoAlternateRepAction.cc/1.4/Thu Jun 29 21:22:34 2006//Tgeant4-09-04-ref-00
    12 /SoBox.cc/1.8/Thu Jun 29 21:22:36 2006//Tgeant4-09-04-ref-00
    13 /SoCons.cc/1.8/Thu Jun 29 21:22:38 2006//Tgeant4-09-04-ref-00
    14 /SoCounterAction.cc/1.7/Thu Jun 29 21:22:49 2006//Tgeant4-09-04-ref-00
    15 /SoDetectorTreeKit.cc/1.13/Thu Jun 29 21:22:51 2006//Tgeant4-09-04-ref-00
    16 /SoGL2PSAction.cc/1.9/Wed Feb 18 10:04:25 2009//Tgeant4-09-04-ref-00
    17 /SoImageWriter.cc/1.5/Thu Jun 29 21:22:55 2006//Tgeant4-09-04-ref-00
    18 /SoMarkerSet.cc/1.8/Thu Jun 29 21:22:57 2006//Tgeant4-09-04-ref-00
    19 /SoPolyhedron.cc/1.13/Tue Oct 23 14:54:06 2007//Tgeant4-09-04-ref-00
    20 /SoStyleCache.cc/1.7/Thu Jun 29 21:23:01 2006//Tgeant4-09-04-ref-00
    21 /SoTrap.cc/1.8/Thu Jun 29 21:23:03 2006//Tgeant4-09-04-ref-00
    22 /SoTrd.cc/1.8/Thu Jun 29 21:23:05 2006//Tgeant4-09-04-ref-00
    23 /SoTubs.cc/1.8/Thu Jun 29 21:23:07 2006//Tgeant4-09-04-ref-00
     1/G4OpenInventor.cc/1.20/Thu Jun 29 21:22:12 2006//
     2/G4OpenInventorTransform3D.cc/1.8/Thu Jun 29 21:22:16 2006//
     3/G4OpenInventorViewer.cc/1.61/Wed Oct  6 10:09:57 2010//
     4/G4OpenInventorWin.cc/1.8/Wed May 26 14:30:46 2010//
     5/G4OpenInventorWinViewer.cc/1.27/Wed Nov 10 17:53:22 2010//
     6/G4OpenInventorXt.cc/1.5/Wed May 26 14:30:46 2010//
     7/G4OpenInventorXtViewer.cc/1.26/Wed Nov 10 17:53:22 2010//
     8/SbPainter.cc/1.5/Thu Jun 29 21:22:30 2006//
     9/SbPainterPS.cc/1.6/Mon Jan  3 14:40:22 2011//
     10/SoAlternateRepAction.cc/1.4/Thu Jun 29 21:22:34 2006//
     11/SoBox.cc/1.8/Thu Jun 29 21:22:36 2006//
     12/SoCons.cc/1.8/Thu Jun 29 21:22:38 2006//
     13/SoCounterAction.cc/1.7/Thu Jun 29 21:22:49 2006//
     14/SoDetectorTreeKit.cc/1.13/Thu Jun 29 21:22:51 2006//
     15/SoGL2PSAction.cc/1.9/Wed Feb 18 10:04:25 2009//
     16/SoImageWriter.cc/1.5/Thu Jun 29 21:22:55 2006//
     17/SoMarkerSet.cc/1.9/Mon Jan  3 14:40:22 2011//
     18/SoPolyhedron.cc/1.14/Mon Jan  3 14:40:22 2011//
     19/SoStyleCache.cc/1.7/Thu Jun 29 21:23:01 2006//
     20/SoTrap.cc/1.8/Thu Jun 29 21:23:03 2006//
     21/SoTrd.cc/1.8/Thu Jun 29 21:23:05 2006//
     22/SoTubs.cc/1.8/Thu Jun 29 21:23:07 2006//
     23/G4OpenInventorSceneHandler.cc/1.56/Mon Jan  3 14:40:37 2011//
    2424D

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

    r1347 r1348  
    2525//
    2626//
    27 // $Id: G4OpenInventorSceneHandler.cc,v 1.55 2009/02/18 14:21:38 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-ref-00 $
     27// $Id: G4OpenInventorSceneHandler.cc,v 1.56 2010/12/11 17:07:48 allison Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    113113,fReducedWireFrame(true)
    114114,fStyleCache(0)
    115 ,fPreviewAndFull(false)
     115,fPreviewAndFull(true)
    116116{
    117117  fStyleCache = new SoStyleCache;

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

    r529 r1348  
    6565,fBufferCount(0)
    6666,fBufferString(NULL)
     67,fBufferPointer(0)
    6768//////////////////////////////////////////////////////////////////////////////
    6869//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//

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

    r1196 r1348  
    719719    GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
    720720    glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
    721     delete bitmap;
     721    delete [] bitmap;
    722722  } else if((aStyle>=18)&&(aStyle<36)) {
    723723    w = h = 7;
    … …  
    725725    GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
    726726    glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
    727     delete bitmap;
     727    delete [] bitmap;
    728728  } else if((aStyle>=36)&&(aStyle<54)) {
    729729    w = h = 9;
    … …  
    731731    GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
    732732    glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
    733     delete bitmap;
     733    delete [] bitmap;
    734734  } else {
    735735    return;

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

    r609 r1348  
    343343    separator->addChild(indexedFaceSet);
    344344
    345     SbBool empty = TRUE;
    346 
    347345    int nvert = fPolyhedron->GetNoVertices();
    348346    int nface = fPolyhedron->GetNoFacets();
    … …  
    374372        coords[ipoint] = icoord + ipoint;
    375373        ipoint++;
    376         empty = FALSE;
    377 
    378374      } while (notLastEdge);
    379375
    … …  
    397393    delete [] points;
    398394
    399     if(empty==TRUE) {
    400       separator->unref();
    401     } else {
    402       alternateRep.setValue(separator);
    403     }
     395    alternateRep.setValue(separator);
    404396
    405397  } else {
Note: See TracChangeset for help on using the changeset viewer.