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

update

Location:
trunk/source/visualization/OpenGL/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r1346 r1348  
    1 /G4OpenGLBitMapStore.cc/1.5/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
    2 /G4OpenGLFontBaseStore.cc/1.4/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
    3 /G4OpenGLImmediateQt.cc/1.6/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
    4 /G4OpenGLImmediateQtViewer.cc/1.22/Wed Jun 23 13:29:23 2010//Tgeant4-09-04-ref-00
    5 /G4OpenGLImmediateSceneHandler.cc/1.35/Thu Jun  3 20:35:19 2010//Tgeant4-09-04-ref-00
    6 /G4OpenGLImmediateViewer.cc/1.10/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
    7 /G4OpenGLImmediateWin32.cc/1.13/Wed May 20 09:58:10 2009//Tgeant4-09-04-ref-00
    8 /G4OpenGLImmediateWin32Viewer.cc/1.19/Wed May 20 10:19:51 2009//Tgeant4-09-04-ref-00
    9 /G4OpenGLImmediateX.cc/1.15/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
    10 /G4OpenGLImmediateXViewer.cc/1.19/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
    11 /G4OpenGLImmediateXm.cc/1.15/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
    12 /G4OpenGLImmediateXmViewer.cc/1.21/Wed Apr  8 16:55:44 2009//Tgeant4-09-04-ref-00
    13 /G4OpenGLQtExportDialog.cc/1.9/Fri Oct 24 14:17:10 2008//Tgeant4-09-04-ref-00
    14 /G4OpenGLQtMovieDialog.cc/1.8/Fri Oct 24 13:49:19 2008//Tgeant4-09-04-ref-00
    15 /G4OpenGLQtViewer.cc/1.55/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
    16 /G4OpenGLSceneHandler.cc/1.59/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
    17 /G4OpenGLStoredQt.cc/1.10/Mon Jan 19 16:26:40 2009//Tgeant4-09-04-ref-00
    18 /G4OpenGLStoredQtViewer.cc/1.32/Mon Dec  6 16:50:27 2010//Tgeant4-09-04-ref-00
    19 /G4OpenGLStoredSceneHandler.cc/1.46/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
    20 /G4OpenGLStoredViewer.cc/1.29/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
    21 /G4OpenGLStoredWin32.cc/1.15/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
    22 /G4OpenGLStoredWin32Viewer.cc/1.22/Wed May 20 13:19:09 2009//Tgeant4-09-04-ref-00
    23 /G4OpenGLStoredX.cc/1.15/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
    24 /G4OpenGLStoredXViewer.cc/1.27/Thu Jun  3 08:26:55 2010//Tgeant4-09-04-ref-00
    25 /G4OpenGLStoredXm.cc/1.12/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
    26 /G4OpenGLStoredXmViewer.cc/1.26/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
    27 /G4OpenGLTransform3D.cc/1.9/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
    28 /G4OpenGLViewer.cc/1.63/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
    29 /G4OpenGLViewerMessenger.cc/1.21/Sun Nov  7 10:31:26 2010//Tgeant4-09-04-ref-00
    30 /G4OpenGLWin32Viewer.cc/1.20/Wed May 20 13:19:09 2009//Tgeant4-09-04-ref-00
    31 /G4OpenGLXViewer.cc/1.56/Result of merge//Tgeant4-09-04-ref-00
    32 /G4OpenGLXmBox.cc/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
    33 /G4OpenGLXmConvenienceRoutines.cc/1.13/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
    34 /G4OpenGLXmFourArrowButtons.cc/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
    35 /G4OpenGLXmFramedBox.cc/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
    36 /G4OpenGLXmMainMenubarCallbacks.cc/1.18/Tue Oct 20 12:47:45 2009//Tgeant4-09-04-ref-00
    37 /G4OpenGLXmPanningCallbacks.cc/1.12/Tue Nov  3 10:21:49 2009//Tgeant4-09-04-ref-00
    38 /G4OpenGLXmPushButton.cc/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
    39 /G4OpenGLXmRadioButton.cc/1.8/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
    40 /G4OpenGLXmRotationCallbacks.cc/1.17/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
    41 /G4OpenGLXmSeparator.cc/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
    42 /G4OpenGLXmSliderBar.cc/1.8/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
    43 /G4OpenGLXmStyleCallbacks.cc/1.15/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
    44 /G4OpenGLXmTextField.cc/1.9/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
    45 /G4OpenGLXmTopLevelShell.cc/1.7/Wed Feb  4 16:48:41 2009//Tgeant4-09-04-ref-00
    46 /G4OpenGLXmVWidgetComponent.cc/1.6/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
    47 /G4OpenGLXmVWidgetContainer.cc/1.7/Fri Mar 13 09:50:03 2009//Tgeant4-09-04-ref-00
    48 /G4OpenGLXmVWidgetObject.cc/1.7/Mon Dec  6 17:36:26 2010//Tgeant4-09-04-ref-00
    49 /G4OpenGLXmVWidgetShell.cc/1.6/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
    50 /G4OpenGLXmViewer.cc/1.31/Wed May 13 10:28:00 2009//Tgeant4-09-04-ref-00
    51 /G4OpenGLXmViewerMessenger.cc/1.5/Mon Jan 19 16:53:42 2009//Tgeant4-09-04-ref-00
    52 /G4OpenGLXmWindowHandlingCallbacks.cc/1.11/Wed May 13 10:28:00 2009//Tgeant4-09-04-ref-00
     1/G4OpenGLBitMapStore.cc/1.5/Mon Jan 19 16:53:42 2009//
     2/G4OpenGLFontBaseStore.cc/1.4/Mon Jan 19 16:53:42 2009//
     3/G4OpenGLImmediateQt.cc/1.6/Wed Feb  4 16:48:41 2009//
     4/G4OpenGLImmediateQtViewer.cc/1.22/Wed Jun 23 13:29:23 2010//
     5/G4OpenGLImmediateSceneHandler.cc/1.35/Thu Jun  3 20:35:19 2010//
     6/G4OpenGLImmediateViewer.cc/1.10/Wed Feb  4 16:48:41 2009//
     7/G4OpenGLImmediateWin32.cc/1.13/Wed May 20 09:58:10 2009//
     8/G4OpenGLImmediateWin32Viewer.cc/1.19/Wed May 20 10:19:51 2009//
     9/G4OpenGLImmediateX.cc/1.15/Wed Feb  4 16:48:41 2009//
     10/G4OpenGLImmediateXViewer.cc/1.19/Wed Feb  4 16:48:41 2009//
     11/G4OpenGLImmediateXm.cc/1.15/Wed Feb  4 16:48:41 2009//
     12/G4OpenGLImmediateXmViewer.cc/1.21/Wed Apr  8 16:55:44 2009//
     13/G4OpenGLQtExportDialog.cc/1.9/Fri Oct 24 14:17:10 2008//
     14/G4OpenGLQtMovieDialog.cc/1.8/Fri Oct 24 13:49:19 2008//
     15/G4OpenGLQtViewer.cc/1.55/dummy timestamp from new-entry//
     16/G4OpenGLSceneHandler.cc/1.60/Result of merge//
     17/G4OpenGLStoredQt.cc/1.10/Mon Jan 19 16:26:40 2009//
     18/G4OpenGLStoredQtViewer.cc/1.32/Mon Dec  6 16:50:27 2010//
     19/G4OpenGLStoredSceneHandler.cc/1.46/dummy timestamp from new-entry//
     20/G4OpenGLStoredViewer.cc/1.29/dummy timestamp from new-entry//
     21/G4OpenGLStoredWin32.cc/1.15/Mon Jan 19 16:53:42 2009//
     22/G4OpenGLStoredWin32Viewer.cc/1.22/Wed May 20 13:19:09 2009//
     23/G4OpenGLStoredX.cc/1.15/Mon Jan 19 16:53:42 2009//
     24/G4OpenGLStoredXViewer.cc/1.27/Thu Jun  3 08:26:55 2010//
     25/G4OpenGLStoredXm.cc/1.12/Mon Jan 19 16:53:42 2009//
     26/G4OpenGLStoredXmViewer.cc/1.26/dummy timestamp from new-entry//
     27/G4OpenGLTransform3D.cc/1.10/Mon Jan  3 14:39:51 2011//
     28/G4OpenGLViewer.cc/1.64/Result of merge//
     29/G4OpenGLViewerMessenger.cc/1.21/Sun Nov  7 10:31:26 2010//
     30/G4OpenGLWin32Viewer.cc/1.20/Wed May 20 13:19:09 2009//
     31/G4OpenGLXViewer.cc/1.57/Result of merge//
     32/G4OpenGLXmBox.cc/1.8/Wed Feb  4 16:48:41 2009//
     33/G4OpenGLXmConvenienceRoutines.cc/1.13/Wed Feb  4 16:48:41 2009//
     34/G4OpenGLXmFourArrowButtons.cc/1.7/Wed Feb  4 16:48:41 2009//
     35/G4OpenGLXmFramedBox.cc/1.8/Wed Feb  4 16:48:41 2009//
     36/G4OpenGLXmMainMenubarCallbacks.cc/1.18/Tue Oct 20 12:47:45 2009//
     37/G4OpenGLXmPanningCallbacks.cc/1.12/Tue Nov  3 10:21:49 2009//
     38/G4OpenGLXmPushButton.cc/1.8/Wed Feb  4 16:48:41 2009//
     39/G4OpenGLXmRadioButton.cc/1.8/Wed Feb  4 16:48:41 2009//
     40/G4OpenGLXmRotationCallbacks.cc/1.17/Mon Jan 19 16:53:42 2009//
     41/G4OpenGLXmSeparator.cc/1.7/Wed Feb  4 16:48:41 2009//
     42/G4OpenGLXmSliderBar.cc/1.8/Mon Jan 19 16:53:42 2009//
     43/G4OpenGLXmStyleCallbacks.cc/1.15/Mon Jan 19 16:53:42 2009//
     44/G4OpenGLXmTextField.cc/1.9/Wed Feb  4 16:48:41 2009//
     45/G4OpenGLXmTopLevelShell.cc/1.7/Wed Feb  4 16:48:41 2009//
     46/G4OpenGLXmVWidgetComponent.cc/1.6/Mon Jan 19 16:53:42 2009//
     47/G4OpenGLXmVWidgetContainer.cc/1.7/Fri Mar 13 09:50:03 2009//
     48/G4OpenGLXmVWidgetObject.cc/1.7/Mon Dec  6 17:36:26 2010//
     49/G4OpenGLXmVWidgetShell.cc/1.6/Mon Jan 19 16:53:42 2009//
     50/G4OpenGLXmViewer.cc/1.31/Wed May 13 10:28:00 2009//
     51/G4OpenGLXmViewerMessenger.cc/1.5/Mon Jan 19 16:53:42 2009//
     52/G4OpenGLXmWindowHandlingCallbacks.cc/1.11/Wed May 13 10:28:00 2009//
    5353D

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

    r1346 r1348  
    2525//
    2626//
    27 // $Id: G4OpenGLSceneHandler.cc,v 1.59 2010/05/30 09:53:05 allison Exp $
     27// $Id: G4OpenGLSceneHandler.cc,v 1.60 2010/12/11 17:04:07 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    488488  G4ViewParameters::DrawingStyle drawing_style = GetDrawingStyle (pVA);
    489489
    490   //Get colour, etc...
    491   G4bool transparency_enabled = true;
     490  // Get colour, etc...
     491  // Need access to data in G4OpenGLViewer.  static_cast doesn't work
     492  // with a virtual base class, so use dynamic_cast.  No need to test
     493  // the outcome since viewer is guaranteed to be a G4OpenGLViewer.
    492494  G4OpenGLViewer* pViewer = dynamic_cast<G4OpenGLViewer*>(fpViewer);
    493   if (pViewer) transparency_enabled = pViewer->transparency_enabled;
     495  const G4bool& transparency_enabled = pViewer->transparency_enabled;
    494496  const G4Colour& c = pVA->GetColour();
    495497  GLfloat materialColour [4];

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

    r1343 r1348  
    2525//
    2626//
    27 // $Id: G4OpenGLTransform3D.cc,v 1.9 2009/01/19 16:53:42 lgarnier Exp $
     27// $Id: G4OpenGLTransform3D.cc,v 1.10 2010/12/11 17:04:07 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    3737#include "G4OpenGLTransform3D.hh"
    3838
    39 G4OpenGLTransform3D::G4OpenGLTransform3D (const G4Transform3D &t):
    40   G4Transform3D (t) {}
    41 
    42 const GLdouble* G4OpenGLTransform3D::GetGLMatrix ()
     39G4OpenGLTransform3D::G4OpenGLTransform3D (const G4Transform3D &t)
    4340{
    4441  GLdouble *p = m;
    … …  
    4744    for (size_t k=0; k<3; k++)
    4845    {
    49       *p++ = operator()(k,i);
     46      *p++ = t(k,i);
    5047    }
    5148    *p++ = 0.;
    5249  }
    5350  m[15] = 1.;
    54   return m;
    5551}
    5652

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

    r1346 r1348  
    2525//
    2626//
    27 // $Id: G4OpenGLViewer.cc,v 1.63 2010/10/05 15:45:19 lgarnier Exp $
     27// $Id: G4OpenGLViewer.cc,v 1.64 2010/12/11 17:04:07 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    8686fPrintFilename ("G4OpenGL"),
    8787fPrintFilenameIndex(0),
     88fWinSize_x(0),
     89fWinSize_y(0),
    8890fPointSize (0),
    8991fSizeHasChanged(0)
    … …  
    103105}
    104106
    105 G4OpenGLViewer::~G4OpenGLViewer () {}
     107G4OpenGLViewer::~G4OpenGLViewer ()
     108{
     109  delete fGL2PSAction;
     110}
    106111
    107112void G4OpenGLViewer::InitializeGLView ()

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

    r1346 r1348  
    2525//
    2626//
    27 // $Id: G4OpenGLXViewer.cc,v 1.56 2010/11/10 17:57:16 allison Exp $
     27// $Id: G4OpenGLXViewer.cc,v 1.57 2010/12/11 17:04:07 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    7777
    7878#define NewString(str) \
    79  ((str) != NULL ? (strcpy((char*)malloc((unsigned)strlen(str) + 1), str)) : (char*)NULL)
     79  ((str) != 0 ? (strncpy((char*)malloc((unsigned)strlen(str) + 1), str, (unsigned)strlen(str) + 1)) : (char*)0)
    8080
    8181#define USE_DEFAULT_COLORMAP 1
    … …  
    256256  if (G4VisManager::GetVerbosity() >= G4VisManager::confirmations)
    257257    G4cout << "Window name: " << fName << G4endl;
    258   strncpy (charViewName, fName, 100);
     258  strncpy (charViewName, fName, 99); charViewName[99] = '\0';
    259259  char *window_name = charViewName;
    260260  char *icon_name = charViewName;
    … …  
    386386cmap (0)
    387387{
     388  // To satisfy Coverity
     389  xwa.visual = 0;
     390  iconName.value = 0;
     391  xwa.screen = 0;
     392  windowName.value = 0;
     393
    388394  GetXConnection ();
    389395  if (fViewId < 0) return;
Note: See TracChangeset for help on using the changeset viewer.