Changeset 1137 for trunk/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc

Timestamp:

Nov 2, 2009, 3:50:24 PM (15 years ago)

Author:

garnier

Message:

en cours de debug

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc (modified) (5 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLXmPanningCallbacks.cc,v 1.10 2009/02/04 16:48:41 lgarnier Exp $
+// $Id: G4OpenGLXmPanningCallbacks.cc,v 1.11 2009/10/20 12:47:45 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -49 +49 @@
                                     XtPointer callData) 
 {
+
   XmScaleCallbackStruct *cbs = (XmScaleCallbackStruct*) callData;
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
   short dp = -1;
   G4float ten_to_the_dp = 10.;
+
+  // No callback allowed when no scene
+  if (!pView->GetSceneHandler()->GetScene()) {
+    return;
+  }
 
   XtVaGetValues (w, 
@@ -85 +91 @@
                                      XtPointer callData) 
 {
+
   XmScaleCallbackStruct *cbs = (XmScaleCallbackStruct*) callData;
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
   short dp = -1;
   G4float ten_to_the_dp = 10.;
+
+  // No callback allowed when no scene
+  if (!pView->GetSceneHandler()->GetScene()) {
+    return;
+  }
 
   XtVaGetValues (w, 
@@ -134 +146 @@
 
 {
+
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
   G4double delta;
   
+  // No callback allowed when no scene
+  if (!pView->GetSceneHandler()->GetScene()) {
+    return;
+  }
+
   if (pView->pan_right) {
     delta = (G4double)pView->pan_sens;
@@ -187 +205 @@
                                            XtIntervalId* timer_id) 
 {
+
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
   G4double delta;
   
+  // No callback allowed when no scene
+  if (!pView->GetSceneHandler()->GetScene()) {
+    return;
+  }
   if (pView->pan_up) {
     delta = (G4double)pView->pan_sens;