Changeset 1343 for trunk/source/visualization/OpenGL/src/G4OpenGLViewerMessenger.cc

Timestamp:

Nov 8, 2010, 12:08:40 PM (14 years ago)

Author:

garnier

Message:

HEAD

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLViewerMessenger.cc (modified) (6 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewerMessenger.cc,v 1.19 2010/11/05 06:25:23 allison Exp $
+// $Id: G4OpenGLViewerMessenger.cc,v 1.21 2010/11/07 10:31:26 allison Exp $
 // GEANT4 tag $Name:  $
 
@@ -184 +184 @@
   fpCommandDisplayListLimit->SetGuidance
     ("Set/reset display list limit (to avoid memory exhaustion).");
-  fpCommandDisplayListLimit->SetParameterName
-    ("displayListLimit", omitable = true);
+  fpCommandDisplayListLimit->SetParameterName("limit", omitable = true);
   fpCommandDisplayListLimit->SetDefaultValue(50000);
+  fpCommandDisplayListLimit->SetRange("limit>=10000");
 
   fpCommandEndTime =
@@ -280 +280 @@
     G4cout <<
       "G4OpenGLViewerMessenger::SetNewValue: Current viewer is not of type"
-      "\n  OGL.  Use \"/vis/viewer/select\" or \"/vis/open\"."
+      "\n  OGL.  (It is \""
+           << pViewer->GetName() <<
+      "\".)\n  Use \"/vis/viewer/select\" or \"/vis/open\"."
            << G4endl;
     return;
@@ -332 +334 @@
       G4cout <<
   "G4OpenGLViewerMessenger::SetNewValue: Current viewer is not of type OGLS."
+  "\n  (It is \"" << pViewer->GetName() << "\".)"
   "\n  This feature is only implemented for OGL Stored viewers."
   "\n  Use \"/vis/viewer/select\" or \"/vis/open OGLS...\"."
@@ -424 +427 @@
     }
 
+  G4VSceneHandler* pSceneHandler = pViewer->GetSceneHandler();
+
+  if (!pSceneHandler) {
+    G4cout <<
+  "G4OpenGLViewerMessenger::SetNewValue: This viewer has no scene handler."
+  "\n  Shouldn't happen - please report circumstances."
+  "\n  (Viewer is \"" << pViewer->GetName() << "\".)"
+  "\n  Try \"/vis/open\", or similar, to get one."
+           << G4endl;
+    return;
+  }
+
   G4OpenGLSceneHandler* pOGLSceneHandler =
-    dynamic_cast<G4OpenGLSceneHandler*>(pViewer->GetSceneHandler());
+    dynamic_cast<G4OpenGLSceneHandler*>(pSceneHandler);
 
   if (!pOGLSceneHandler) {
     G4cout <<
   "G4OpenGLViewerMessenger::SetNewValue: Current scene handler is not of type"
-  "\n  OGL.  Use \"/vis/sceneHandler/select\" or \"/vis/open\"."
+  "\n  OGL.  (Viewer is \"" << pViewer->GetName() << "\".)"
+  "\n  (Scene handler is \"" << pSceneHandler->GetName() << "\".)"
+  "\n  Use \"/vis/sceneHandler/list\" and \"/vis/sceneHandler/select\""
+  "\n  or \"/vis/open\"."
            << G4endl;
     return;
@@ -441 +459 @@
     G4cout <<
   "G4OpenGLViewerMessenger::SetNewValue: Current scene handler is not of type"
-  "\n  OGLS (Stored).  This feature is only implemented for OGL Stored"
+  "\n  OGLS (Stored).  (Viewer is \"" << pViewer->GetName() << "\".)"
+  "\n  (Scene handler is \"" << pSceneHandler->GetName() << "\".)"
+  "\n  This feature is only implemented for OGL Stored"
   "\n  scene handlers.  Use \"/vis/viewer/select\" or \"/vis/open OGLS...\"."
            << G4endl;