Ignore:
Timestamp:
Nov 25, 2009, 5:13:58 PM (15 years ago)
Author:
garnier
Message:

update CVS release candidate geant4.9.3.01

Location:
trunk/source/visualization
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/History

    r1140 r1196  
    1 $Id: History,v 1.453 2009/10/25 10:43:42 allison Exp $
     1$Id: History,v 1.456 2009/11/17 14:37:06 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2424History file for visualization category
    2525---------------------------------------
    26 15 October 2009 Laurent Garnier
    27  - G4OpenGLViewer.cc : Fix a problem with printing.
    28 
    29 13 October 2009 Laurent Garnier
    30  - G4OpenGLQtViewer.cc/G4OpenGLStoreQtViewer.cc : Fix problems with
    31    mac OS X 10.6
     26
     2717th November 2009  Laurent Garnier
     28- Fix SceneHandler removing viewer if class destructor call
     29  before G4VSceneHandler calls it
     30
     316th November 2009  John Allison
     32 - vistest-V09-02-01: test19.cc: Use G4UIExecutive.
     33
     343rd November 2009  John Allison  (vis-V09-02-10, greps-V09-02-03, digits_hits-V09-02-02)
     35- gMocren-V09-02-01:
     36  o Entrust AddEndOfEventModel to /vis/scene/add/psHits or hits.
     37  o Fix compiler warnings.
     38- opengl-V09-02-09: Fix compilation problems and protect Qt3.
     39
     4030th October 2009  John Allison
     41- visman-V09-02-06: Added /vis/scene/add/psHits.
    3242
    334323rd October 2009  John Allison  (vis-V09-02-09, greps-V09-02-02, digits_hits-V09-02-02)
    … …  
    5161  o VRML-V09-02-01
    5262  o visXXX-V09-02-00
     63
     6415st October 2009 Laurent Garnier
     65 - G4OpenGLViewer.cc : Fix a problem with printing.
     66
     6713st October 2009 Laurent Garnier
     68 - G4OpenGLQtViewer.cc/G4OpenGLStoreQtViewer.cc : Fix problems with
     69   mac OS X 10.6
    5370
    547110th October 2009 Joseph Perl (vis-V09-02-06)

  • trunk/source/visualization/OpenGL/GNUmakefile

    r1167 r1196  
    4141INTYLIBS += -L$(G4LIBDIR)
    4242
     43SUBLIBS += G4gl2ps
     44
    4345include $(G4INSTALL)/config/moc.gmk
    4446include $(G4INSTALL)/config/common.gmk

  • trunk/source/visualization/OpenGL/History

    r1160 r1196  
    1 $Id: History,v 1.159 2009/11/03 11:18:03 allison Exp $
     1$Id: History,v 1.160 2009/11/17 11:52:51 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
     2017th November 2009  Gabriele Cosmo
     21- Fixed problem in the generation of dependencies on Windows for some
     22  files, due to redefinition of min and max macros from windows.h in
     23  G4OpenGL.hh.
     24- Fixed GNUmakefile.
    1925
    20263rd November 2009  John Allison  (opengl-V09-02-09 coworks greps-V09-02-03)

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

    r1172 r1196  
    6060G4OpenGLImmediateQtViewer::~G4OpenGLImmediateQtViewer() {
    6161  makeCurrent();
    62   GetSceneHandler()->RemoveViewerFromList(this);
    6362}
    6463

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

    r1160 r1196  
    198198void G4OpenGLSceneHandler::AddPrimitive (const G4Polymarker& polymarker)
    199199{
     200#ifdef G4DEBUG_VIS_OGL
     201  printf("G4OpenGLSceneHandler::AddPrimitive polymarker");
     202#endif
    200203  G4int nPoints = polymarker.size ();
    201204  if (nPoints <= 0) return;
    … …  
    214217  case G4Polymarker::dots:
    215218    {
     219#ifdef G4DEBUG_VIS_OGL
     220  printf(" dots ");
     221#endif
    216222      for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) {
    217223        G4Circle dot (polymarker);
    … …  
    225231  case G4Polymarker::circles:
    226232    {
     233#ifdef G4DEBUG_VIS_OGL
     234  printf(" circle ");
     235#endif
    227236      for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) {
    228237        G4Circle circle (polymarker);
    … …  
    234243  case G4Polymarker::squares:
    235244    {
     245#ifdef G4DEBUG_VIS_OGL
     246  printf(" square ");
     247#endif
    236248      for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) {
    237249        G4Square square (polymarker);
    … …  
    243255  }
    244256
     257#ifdef G4DEBUG_VIS_OGL
     258  printf(" \n");
     259#endif
    245260  fProcessingPolymarker = false;
    246261}
    … …  
    319334  // Note: colour treated in sub-class.
    320335
    321   if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ())
     336  if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ()) {
     337#ifdef G4DEBUG_VIS_OGL
     338    printf("+");
     339#endif
    322340    glDisable (GL_DEPTH_TEST);
    323   else {glEnable (GL_DEPTH_TEST); glDepthFunc (GL_LESS);}
     341  } else {
     342#ifdef G4DEBUG_VIS_OGL
     343    printf("-");
     344#endif
     345    glEnable (GL_DEPTH_TEST); glDepthFunc (GL_LESS);}
    324346 
    325347  glDisable (GL_LIGHTING);
    … …  
    365387  MarkerSizeType sizeType;
    366388  G4double size = GetMarkerSize(marker, sizeType);
     389
    367390
    368391  // Draw...

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

    r1172 r1196  
    6363  // when close event.
    6464  //   ((QDialog*)window())->reject();
    65   GetSceneHandler()->RemoveViewerFromList(this);
    6665}
    6766

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

    r975 r1196  
    5757}
    5858
    59 G4OpenGLStoredXViewer::~G4OpenGLStoredXViewer () {}
     59G4OpenGLStoredXViewer::~G4OpenGLStoredXViewer () {
     60#ifdef G4DEBUG_VIS_OGL
     61  printf("G4OpenGLStoredXViewer::~G4OpenGLStoredXViewer DELETE\n");
     62#endif
     63  //  GetSceneHandler()->RemoveViewerFromList(this);
     64}
    6065
    6166void G4OpenGLStoredXViewer::Initialise () {

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

    r1125 r1196  
    5858}
    5959
    60 G4OpenGLStoredXmViewer::~G4OpenGLStoredXmViewer () {}
     60G4OpenGLStoredXmViewer::~G4OpenGLStoredXmViewer () {
     61  GetSceneHandler()->RemoveViewerFromList(this);
     62}
    6163
    6264void G4OpenGLStoredXmViewer::Initialise () {

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

    r1160 r1196  
    103103}
    104104
    105 G4OpenGLViewer::~G4OpenGLViewer () {}
     105G4OpenGLViewer::~G4OpenGLViewer () {
     106#ifdef G4DEBUG_VIS_OGL
     107  printf("G4OpenGLViewer::~G4OpenGLViewer DELETING \n");
     108#endif
     109}
    106110
    107111void G4OpenGLViewer::InitializeGLView ()
    … …  
    640644    fGL2PSAction->setLineWidth(1);
    641645    // By default, we choose the point size (markers...)
    642     fGL2PSAction->setPointSize(2);
    643 
     646   
     647#ifdef G4DEBUG_VIS_OGL
     648    //  printf("G4OpenGLViewer::printGl2PS marker size:%f\n",    GetSceneHandler()->GetMarkerSize());
     649#endif
     650#ifdef G4DEBUG_VIS_OGL
     651  //  printf("G4OpenGLViewer::printGl2PS marker2 size:%f\n",fpViewer -> GetViewParameters ()->GetDefaultMarker ().GetScreenSize());
     652#endif
     653    //    if (fpViewer -> GetViewParameters ().IsMarkerNotHidden ()) {
     654    //      fGL2PSAction->setPointSize(fpViewer -> GetViewParameters ()->GetDefaultMarker ().GetScreenSize());
     655    //    } else {
     656      fGL2PSAction->setPointSize(2);
     657      //    }
    644658    DrawView ();
    645659    fGL2PSAction->disableFileWriting();

  • trunk/source/visualization/OpenInventor/History

    r1136 r1196  
    1 $Id: History,v 1.101 2009/09/18 12:48:43 lgarnier Exp $
     1$Id: History,v 1.102 2009/09/29 21:23:36 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2020History file for visualization/OpenInventor
    2121-------------------------------------------
     22
     2329 September 2009  John Allison  (openinventor-V09-02-02)
     24- Tagged.
    2225
    232618 August 2009 Laurent Garnier

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

    r1051 r1196  
    477477
    478478void G4OpenInventorViewer::WritePostScript(const G4String& aFile) {
    479 #ifdef G4DEBUG_VIS_OI
    480   printf("G4OpenInventorViewer::WritePostScript %s\n",aFile.c_str());
    481 #endif
    482479  if(!fGL2PSAction) return;
    483480  fGL2PSAction->setFileName(aFile.c_str());
    484481  G4cout << "Produce " << aFile << "..." << G4endl;
    485482  if (fGL2PSAction->enableFileWriting()) {
    486 #ifdef G4DEBUG_VIS_OI
    487     printf("G4OpenInventorViewer::WritePostScript produce OK\n");
    488 #endif
    489483    ViewerRender();
    490484    fGL2PSAction->disableFileWriting();
    … …  
    493487
    494488void G4OpenInventorViewer::WritePixmapPostScript(const G4String& aFile) {
    495 #ifdef G4DEBUG_VIS_OI
    496   printf("G4OpenInventorViewer::WritePixmapPostScript %s\n",aFile.c_str());
    497 #endif
    498 
    499489  fSoImageWriter->fileName.setValue(aFile.c_str());
    500490  //imageWriter->format.setValue(SoImageWriter::POST_SCRIPT);
    … …  
    511501           << G4endl;
    512502  }
    513 #ifdef G4DEBUG_VIS_OI
    514   printf("G4OpenInventorViewer::WritePixmapPostScript END\n");
    515 #endif
    516503} 
    517504

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

    r1136 r1196  
    5252
    5353  SetInteractorManager (G4Win32::getInstance());
    54   GetInteractorManager () -> RemoveDispatcher((G4DispatchFunction)G4Win32::DispatchWin32Event); 
     54  GetInteractorManager () -> RemoveDispatcher((G4DispatchFunction)G4Win32::dispatchWin32Event); 
    5555
    5656  //  GetInteractorManager () -> AddDispatcher((G4DispatchFunction)SoWin::dispatchEvent);

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

    r1051 r1196  
    7171//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
    7272{
    73 #ifdef G4DEBUG_VIS_OI
    74     printf("SoGL2PSAction::enableFileWriting\n");
    75 #endif
    7673  fFile = ::fopen(fFileName,"w");
    7774  if(!fFile) {

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

    r1023 r1196  
    717717    w = h = 5;
    718718    xorig = yorig = 2;
     719    GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
     720    glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
     721    delete bitmap;
    719722  } else if((aStyle>=18)&&(aStyle<36)) {
    720723    w = h = 7;
    721724    xorig = yorig = 3;
     725    GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
     726    glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
     727    delete bitmap;
    722728  } else if((aStyle>=36)&&(aStyle<54)) {
    723729    w = h = 9;
    724730    xorig = yorig = 4;
     731    GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
     732    glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
     733    delete bitmap;
    725734  } else {
    726735    return;
    727736  }
    728   if (w != 0) {
    729     GLubyte* bitmap = getBitmap(w,h,sFigures[aStyle]);
    730     glBitmap(w,h,xorig,yorig,0.,0.,bitmap);
    731     delete bitmap;
    732   }
    733 #ifdef G4DEBUG_VIS_OI
    734   printf("DM %d %d %f %f",w,h,xorig,yorig);
    735 #endif
    736737
    737738  if(aAction->isOfType(SoGL2PSAction::getClassTypeId())) {
    738 #ifdef G4DEBUG_VIS_OI
    739     printf(" GL2PS ");
    740 #endif
    741     ((SoGL2PSAction*)aAction)->addBitmap(w-2,h-2,xorig,yorig,xmove,ymove);
     739    ((SoGL2PSAction*)aAction)->addBitmap(w,h,xorig,yorig,xmove,ymove);
    742740  }
    743741

  • trunk/source/visualization/RayTracer/src/G4RayTracer.cc

    r1096 r1196  
    5555G4VViewer* G4RayTracer::CreateViewer (G4VSceneHandler& sceneHandler,
    5656                                      const G4String& name) {
    57   printf("G4RayTracer::CreateViewer\n");
    5857  G4VViewer* pViewer = new G4RayTracerViewer (sceneHandler, name);
    5958  if (pViewer) {

  • trunk/source/visualization/RayTracer/src/G4RayTracerX.cc

    r1096 r1196  
    5555G4VViewer* G4RayTracerX::CreateViewer (G4VSceneHandler& sceneHandler,
    5656                                       const G4String& name) {
    57   printf("G4RayTracerX::CreateViewer\n");
    5857  G4VViewer* pViewer = new G4RayTracerXViewer (sceneHandler, name);
    5958  if (pViewer) {

  • trunk/source/visualization/Tree/src/G4ASCIITreeViewer.cc

    r1140 r1196  
    3434  G4VTreeViewer(sceneHandler, name) {
    3535  // Make changes to view parameters for ASCIITree...
    36 //   if (!fVP) {
    37     printf("G4ASCIITreeViewer::G4ASCIITreeViewer SHOULD CRASH HERE-----------------------------------------------------------\n");
    38 //   } else {
    39 //     printf("G4ASCIITreeViewer::G4ASCIITreeViewer SHOULD NOT CRASH HERE------------------------------------------------------------\n");
    40 //   }
    4136  fVP.SetCulling(false);
    42   printf("G4ASCIITreeViewer::G4ASCIITreeViewer 2\n");
    4337  fDefaultVP.SetCulling(false);
    44   printf("G4ASCIITreeViewer::G4ASCIITreeViewer 3\n");
    4538}
    4639

  • trunk/source/visualization/externals/gl2ps/src/G4OpenGL2PSAction.cc

    r1038 r1196  
    125125     GL2PS_BEST_ROOT | GL2PS_SILENT | GL2PS_DRAW_BACKGROUND;
    126126  int sort = GL2PS_BSP_SORT;
    127   //int sort = GL2PS_SIMPLE_SORT;
     127  sort = GL2PS_SIMPLE_SORT;
    128128  GLint buffsize = 0;
    129129  buffsize += 1024*1024;

  • trunk/source/visualization/management/History

    r1168 r1196  
    1 $Id: History,v 1.133 2009/11/16 13:51:08 lgarnier Exp $
     1$Id: History,v 1.134 2009/11/17 14:37:06 lgarnier Exp $
    22
    33-------------------------------------------------------------------
    … …  
    2626History file for visualization management sub-category
    2727------------------------------------------------------
     28
     2917th November 2009  Laurent Garnier
     30- G4VViewer::Fix SceneHandler removing viewer if class destructor call
     31  before G4VSceneHandler calls it
    2832
    293316th November 2009  Laurent Garnier

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

    r1170 r1196  
    2525//
    2626//
    27 // $Id: G4VViewer.cc,v 1.25 2009/01/13 09:55:15 lgarnier Exp $
     27// $Id: G4VViewer.cc,v 1.26 2009/11/17 14:37:06 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    6363}
    6464
    65 G4VViewer::~G4VViewer () {}
     65G4VViewer::~G4VViewer () {
     66  fSceneHandler.RemoveViewerFromList(this);
     67}
    6668
    6769void G4VViewer::SetName (const G4String& name) {
Note: See TracChangeset for help on using the changeset viewer.