Ignore:
Timestamp:
Nov 8, 2010, 12:08:40 PM (15 years ago)
Author:
garnier
Message:

HEAD

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

Legend:

Unmodified
Added
Removed

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

    r1340 r1343  
    1 /G4OpenGLBitMapStore.cc/1.5/Thu Sep 30 06:16:50 2010//
    2 /G4OpenGLFontBaseStore.cc/1.4/Thu Sep 30 06:16:50 2010//
    3 /G4OpenGLImmediateQt.cc/1.6/Thu Sep 30 06:16:50 2010//
    4 /G4OpenGLImmediateSceneHandler.cc/1.35/Thu Sep 30 06:16:50 2010//
    5 /G4OpenGLImmediateViewer.cc/1.10/Thu Sep 30 06:16:50 2010//
    6 /G4OpenGLImmediateWin32.cc/1.13/Thu Sep 30 06:16:50 2010//
    7 /G4OpenGLImmediateWin32Viewer.cc/1.19/Thu Sep 30 06:16:50 2010//
    8 /G4OpenGLImmediateX.cc/1.15/Thu Sep 30 06:16:50 2010//
    9 /G4OpenGLImmediateXViewer.cc/1.19/Thu Sep 30 06:16:50 2010//
    10 /G4OpenGLImmediateXm.cc/1.15/Thu Sep 30 06:16:51 2010//
    11 /G4OpenGLImmediateXmViewer.cc/1.21/Thu Sep 30 06:16:51 2010//
    12 /G4OpenGLQtExportDialog.cc/1.9/Thu Sep 30 06:16:51 2010//
    13 /G4OpenGLQtMovieDialog.cc/1.8/Thu Sep 30 06:16:56 2010//
    14 /G4OpenGLSceneHandler.cc/1.59/Thu Sep 30 06:16:59 2010//
    15 /G4OpenGLStoredQt.cc/1.10/Thu Sep 30 06:16:59 2010//
    16 /G4OpenGLStoredWin32.cc/1.15/Thu Sep 30 06:17:00 2010//
    17 /G4OpenGLStoredWin32Viewer.cc/1.22/Thu Sep 30 06:17:00 2010//
    18 /G4OpenGLStoredX.cc/1.15/Thu Sep 30 06:17:00 2010//
    19 /G4OpenGLStoredXViewer.cc/1.27/Thu Sep 30 06:17:00 2010//
    20 /G4OpenGLStoredXm.cc/1.12/Thu Sep 30 06:17:00 2010//
    21 /G4OpenGLStoredXmViewer.cc/1.26/Thu Sep 30 06:17:00 2010//
    22 /G4OpenGLTransform3D.cc/1.9/Thu Sep 30 06:17:00 2010//
    23 /G4OpenGLWin32Viewer.cc/1.20/Thu Sep 30 06:17:00 2010//
    24 /G4OpenGLXViewer.cc/1.55/Thu Sep 30 06:17:00 2010//
    25 /G4OpenGLXmBox.cc/1.8/Thu Sep 30 06:17:01 2010//
    26 /G4OpenGLXmConvenienceRoutines.cc/1.13/Thu Sep 30 06:17:01 2010//
    27 /G4OpenGLXmFourArrowButtons.cc/1.7/Thu Sep 30 06:17:01 2010//
    28 /G4OpenGLXmFramedBox.cc/1.8/Thu Sep 30 06:17:01 2010//
    29 /G4OpenGLXmMainMenubarCallbacks.cc/1.18/Thu Sep 30 06:17:01 2010//
    30 /G4OpenGLXmPanningCallbacks.cc/1.12/Thu Sep 30 06:17:01 2010//
    31 /G4OpenGLXmPushButton.cc/1.8/Thu Sep 30 06:17:01 2010//
    32 /G4OpenGLXmRadioButton.cc/1.8/Thu Sep 30 06:17:01 2010//
    33 /G4OpenGLXmRotationCallbacks.cc/1.17/Thu Sep 30 06:17:07 2010//
    34 /G4OpenGLXmSeparator.cc/1.7/Thu Sep 30 06:17:07 2010//
    35 /G4OpenGLXmSliderBar.cc/1.8/Thu Sep 30 06:17:07 2010//
    36 /G4OpenGLXmStyleCallbacks.cc/1.15/Thu Sep 30 06:17:07 2010//
    37 /G4OpenGLXmTextField.cc/1.9/Thu Sep 30 06:17:07 2010//
    38 /G4OpenGLXmTopLevelShell.cc/1.7/Thu Sep 30 06:17:07 2010//
    39 /G4OpenGLXmVWidgetComponent.cc/1.6/Thu Sep 30 06:17:09 2010//
    40 /G4OpenGLXmVWidgetContainer.cc/1.7/Thu Sep 30 06:17:09 2010//
    41 /G4OpenGLXmVWidgetObject.cc/1.7/Thu Sep 30 06:17:09 2010//
    42 /G4OpenGLXmVWidgetShell.cc/1.6/Thu Sep 30 06:17:09 2010//
    43 /G4OpenGLXmViewer.cc/1.31/Thu Sep 30 06:17:09 2010//
    44 /G4OpenGLXmViewerMessenger.cc/1.5/Thu Sep 30 06:17:09 2010//
    45 /G4OpenGLXmWindowHandlingCallbacks.cc/1.11/Thu Sep 30 06:17:09 2010//
    46 /G4OpenGLImmediateQtViewer.cc/1.22/Thu Sep 30 11:54:33 2010//
    47 /G4OpenGLStoredQtViewer.cc/1.32/Thu Sep 30 11:54:33 2010//
    481/G4OpenGLViewer.cc/1.63/Tue Oct  5 15:45:19 2010//
    49 /G4OpenGLStoredViewer.cc/1.29/Wed Oct  6 15:59:03 2010//
     2/G4OpenGLBitMapStore.cc/1.5/Mon Jan 19 16:53:42 2009//
     3/G4OpenGLFontBaseStore.cc/1.4/Mon Jan 19 16:53:42 2009//
     4/G4OpenGLImmediateQt.cc/1.6/Wed Feb  4 16:48:41 2009//
     5/G4OpenGLImmediateQtViewer.cc/1.22/Wed Jun 23 13:29:23 2010//
     6/G4OpenGLImmediateSceneHandler.cc/1.35/Thu Jun  3 20:35:19 2010//
     7/G4OpenGLImmediateViewer.cc/1.10/Wed Feb  4 16:48:41 2009//
     8/G4OpenGLImmediateWin32.cc/1.13/Wed May 20 09:58:10 2009//
     9/G4OpenGLImmediateWin32Viewer.cc/1.19/Wed May 20 10:19:51 2009//
     10/G4OpenGLImmediateX.cc/1.15/Wed Feb  4 16:48:41 2009//
     11/G4OpenGLImmediateXViewer.cc/1.19/Wed Feb  4 16:48:41 2009//
     12/G4OpenGLImmediateXm.cc/1.15/Wed Feb  4 16:48:41 2009//
     13/G4OpenGLImmediateXmViewer.cc/1.21/Wed Apr  8 16:55:44 2009//
     14/G4OpenGLQtExportDialog.cc/1.9/Fri Oct 24 14:17:10 2008//
     15/G4OpenGLQtMovieDialog.cc/1.8/Fri Oct 24 13:49:19 2008//
    5016/G4OpenGLQtViewer.cc/1.55/Fri Oct  8 10:07:31 2010//
    51 /G4OpenGLStoredSceneHandler.cc/1.43/Fri Nov  5 10:16:52 2010//
    52 /G4OpenGLViewerMessenger.cc/1.19/Fri Nov  5 10:16:52 2010//
     17/G4OpenGLSceneHandler.cc/1.59/Sun May 30 09:53:05 2010//
     18/G4OpenGLStoredQt.cc/1.10/Mon Jan 19 16:26:40 2009//
     19/G4OpenGLStoredQtViewer.cc/1.32/Mon Nov  8 11:03:16 2010//
     20/G4OpenGLStoredSceneHandler.cc/1.44/Sat Nov  6 12:09:41 2010//
     21/G4OpenGLStoredViewer.cc/1.29/Wed Oct  6 10:05:52 2010//
     22/G4OpenGLStoredWin32.cc/1.15/Mon Jan 19 16:53:42 2009//
     23/G4OpenGLStoredWin32Viewer.cc/1.22/Wed May 20 13:19:09 2009//
     24/G4OpenGLStoredX.cc/1.15/Mon Jan 19 16:53:42 2009//
     25/G4OpenGLStoredXViewer.cc/1.27/Thu Jun  3 08:26:55 2010//
     26/G4OpenGLStoredXm.cc/1.12/Mon Jan 19 16:53:42 2009//
     27/G4OpenGLStoredXmViewer.cc/1.26/Fri Apr 30 13:18:32 2010//
     28/G4OpenGLTransform3D.cc/1.9/Mon Jan 19 16:53:42 2009//
     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.55/Wed May 13 10:28:00 2009//
     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/Wed Feb  4 16:48:41 2009//
     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/Mon Nov  8 11:03:16 2010//
    5353D

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLBitMapStore.cc,v 1.5 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLFontBaseStore.cc,v 1.4 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLImmediateQt.cc,v 1.6 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.35 2010/06/03 20:35:19 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLImmediateViewer.cc,v 1.10 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLImmediateWin32.cc,v 1.13 2009/05/20 09:58:10 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLImmediateWin32Viewer.cc,v 1.19 2009/05/20 10:19:51 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLImmediateX.cc,v 1.15 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLImmediateXViewer.cc,v 1.19 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLImmediateXm.cc,v 1.15 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLImmediateXmViewer.cc,v 1.21 2009/04/08 16:55:44 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLQtExportDialog.cc,v 1.9 2008/10/24 14:17:10 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLQtMovieDialog.cc,v 1.8 2008/10/24 13:49:19 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLSceneHandler.cc,v 1.59 2010/05/30 09:53:05 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLStoredQt.cc,v 1.10 2009/01/19 16:26:40 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1340 r1343  
    6767
    6868void G4OpenGLStoredQtViewer::Initialise() {
     69#ifdef G4DEBUG_VIS_OGL
     70  printf("G4OpenGLStoredQtViewer::Initialise 1\n");
     71#endif
    6972  fReadyToPaint = false;
    7073  CreateMainWindow (this,QString(GetName()));
    … …  
    7679void G4OpenGLStoredQtViewer::initializeGL () {
    7780
    78   //  return;
    7981  InitializeGLView ();
    8082
     83#ifdef G4DEBUG_VIS_OGL
     84  printf("G4OpenGLStoredQtViewer::InitialiseGL () 1\n");
     85#endif
    8186
    8287  // clear the buffers and window.

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

    r1340 r1343  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredSceneHandler.cc,v 1.43 2010/11/05 06:25:23 allison Exp $
     27// $Id: G4OpenGLStoredSceneHandler.cc,v 1.44 2010/11/06 12:09:41 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    7979 const G4String& name):
    8080G4OpenGLSceneHandler (system, fSceneIdCount++, name),
    81 fMemoryForDisplayLists (true),
    8281fAddPrimitivePreambleNestingDepth (0),
    8382fTopPODL (0)
    … …  
    357356
    358357  fDisplayListBase = fDisplayListId;
     358  fMemoryForDisplayLists = true;
     359
    359360}
    360361
    … …  
    369370
    370371  fDisplayListBase = fDisplayListId;
     372  fMemoryForDisplayLists = true;
    371373
    372374  // Make sure screen corresponds to graphical database...
    … …  
    471473G4int G4OpenGLStoredSceneHandler::fSceneIdCount = 0;
    472474
    473 G4int G4OpenGLStoredSceneHandler::fDisplayListLimit = 50000;
    474 
    475 G4int G4OpenGLStoredSceneHandler::fDisplayListBase = 0;
     475G4int  G4OpenGLStoredSceneHandler::fDisplayListId = 0;
     476G4bool G4OpenGLStoredSceneHandler::fMemoryForDisplayLists = true;
     477G4int  G4OpenGLStoredSceneHandler::fDisplayListLimit = 50000;
     478G4int  G4OpenGLStoredSceneHandler::fDisplayListBase = 0;
    476479
    477480#endif

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLStoredWin32.cc,v 1.15 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLStoredWin32Viewer.cc,v 1.22 2009/05/20 13:19:09 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLStoredX.cc,v 1.15 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLStoredXViewer.cc,v 1.27 2010/06/03 08:26:55 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLStoredXm.cc,v 1.12 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLStoredXmViewer.cc,v 1.26 2010/04/30 13:18:32 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLTransform3D.cc,v 1.9 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1340 r1343  
    2525//
    2626//
    27 // $Id: G4OpenGLViewerMessenger.cc,v 1.19 2010/11/05 06:25:23 allison Exp $
     27// $Id: G4OpenGLViewerMessenger.cc,v 1.21 2010/11/07 10:31:26 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929
    … …  
    184184  fpCommandDisplayListLimit->SetGuidance
    185185    ("Set/reset display list limit (to avoid memory exhaustion).");
    186   fpCommandDisplayListLimit->SetParameterName
    187     ("displayListLimit", omitable = true);
     186  fpCommandDisplayListLimit->SetParameterName("limit", omitable = true);
    188187  fpCommandDisplayListLimit->SetDefaultValue(50000);
     188  fpCommandDisplayListLimit->SetRange("limit>=10000");
    189189
    190190  fpCommandEndTime =
    … …  
    280280    G4cout <<
    281281      "G4OpenGLViewerMessenger::SetNewValue: Current viewer is not of type"
    282       "\n  OGL.  Use \"/vis/viewer/select\" or \"/vis/open\"."
     282      "\n  OGL.  (It is \""
     283           << pViewer->GetName() <<
     284      "\".)\n  Use \"/vis/viewer/select\" or \"/vis/open\"."
    283285           << G4endl;
    284286    return;
    … …  
    332334      G4cout <<
    333335  "G4OpenGLViewerMessenger::SetNewValue: Current viewer is not of type OGLS."
     336  "\n  (It is \"" << pViewer->GetName() << "\".)"
    334337  "\n  This feature is only implemented for OGL Stored viewers."
    335338  "\n  Use \"/vis/viewer/select\" or \"/vis/open OGLS...\"."
    … …  
    424427    }
    425428
     429  G4VSceneHandler* pSceneHandler = pViewer->GetSceneHandler();
     430
     431  if (!pSceneHandler) {
     432    G4cout <<
     433  "G4OpenGLViewerMessenger::SetNewValue: This viewer has no scene handler."
     434  "\n  Shouldn't happen - please report circumstances."
     435  "\n  (Viewer is \"" << pViewer->GetName() << "\".)"
     436  "\n  Try \"/vis/open\", or similar, to get one."
     437           << G4endl;
     438    return;
     439  }
     440
    426441  G4OpenGLSceneHandler* pOGLSceneHandler =
    427     dynamic_cast<G4OpenGLSceneHandler*>(pViewer->GetSceneHandler());
     442    dynamic_cast<G4OpenGLSceneHandler*>(pSceneHandler);
    428443
    429444  if (!pOGLSceneHandler) {
    430445    G4cout <<
    431446  "G4OpenGLViewerMessenger::SetNewValue: Current scene handler is not of type"
    432   "\n  OGL.  Use \"/vis/sceneHandler/select\" or \"/vis/open\"."
     447  "\n  OGL.  (Viewer is \"" << pViewer->GetName() << "\".)"
     448  "\n  (Scene handler is \"" << pSceneHandler->GetName() << "\".)"
     449  "\n  Use \"/vis/sceneHandler/list\" and \"/vis/sceneHandler/select\""
     450  "\n  or \"/vis/open\"."
    433451           << G4endl;
    434452    return;
    … …  
    441459    G4cout <<
    442460  "G4OpenGLViewerMessenger::SetNewValue: Current scene handler is not of type"
    443   "\n  OGLS (Stored).  This feature is only implemented for OGL Stored"
     461  "\n  OGLS (Stored).  (Viewer is \"" << pViewer->GetName() << "\".)"
     462  "\n  (Scene handler is \"" << pSceneHandler->GetName() << "\".)"
     463  "\n  This feature is only implemented for OGL Stored"
    444464  "\n  scene handlers.  Use \"/vis/viewer/select\" or \"/vis/open OGLS...\"."
    445465           << G4endl;

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLWin32Viewer.cc,v 1.20 2009/05/20 13:19:09 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXViewer.cc,v 1.55 2009/05/13 10:28:00 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmBox.cc,v 1.8 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//Box container class

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmConvenienceRoutines.cc,v 1.13 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmFourArrowButtons.cc,v 1.7 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//Four arrow buttons class. Inherits from G4OpenGLXmVWidgetComponent

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmFramedBox.cc,v 1.8 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//Framed box container class

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmMainMenubarCallbacks.cc,v 1.18 2009/10/20 12:47:45 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmPanningCallbacks.cc,v 1.12 2009/11/03 10:21:49 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmPushButton.cc,v 1.8 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//Push button class. Inherits from G4OpenGLXmVWidgetComponent

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmRadioButton.cc,v 1.8 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//Radio button class. Inherits from G4OpenGLXmVWidgetComponent

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmRotationCallbacks.cc,v 1.17 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmSeparator.cc,v 1.7 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//Separator class. Inherits from G4OpenGLXmVWidgetComponent

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmSliderBar.cc,v 1.8 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//Slider bar class. Inherits from G4OpenGLXmVWidgetComponent

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmStyleCallbacks.cc,v 1.15 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmTextField.cc,v 1.9 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//Text field class. Inherits from G4OpenGLXmVWidgetComponent

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmTopLevelShell.cc,v 1.7 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//Top level shell class

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmVWidgetComponent.cc,v 1.6 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//Base class for all Motif component widgets

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmVWidgetContainer.cc,v 1.7 2009/03/13 09:50:03 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//Base class for all Motif container widgets

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmVWidgetObject.cc,v 1.7 2009/02/04 16:48:41 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//Virtual base class for all Motif widgets.

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmVWidgetShell.cc,v 1.6 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//Base class for all Motif shell widgets

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmViewer.cc,v 1.31 2009/05/13 10:28:00 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmViewerMessenger.cc,v 1.5 2009/01/19 16:53:42 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929
    3030#ifdef G4VIS_BUILD_OPENGLXM_DRIVER

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

    r1337 r1343  
    2626//
    2727// $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1.11 2009/05/13 10:28:00 lgarnier Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
Note: See TracChangeset for help on using the changeset viewer.