Changeset 729 for trunk/geant4

Timestamp:

Feb 19, 2008, 10:21:31 AM (17 years ago)

Author:

garnier

Message:

correction du ticket #120

File:

• trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (4 diffs)

trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc

@@ -1257 +1257 @@
 */
 void G4OpenGLQtViewer::toggleFullScreen(bool check) {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::toggleFullScreen checked:%d() \n",check);
-#endif
   if (check != GLWindow->isFullScreen()) { //toggle
 #if QT_VERSION >= 0x030200
-#if QT_VERSION < 0x040000
     GLWindow->setWindowState(GLWindow->windowState() ^ Qt::WindowFullScreen);
-//     fFullScreenOn->setOn(check);
-//     fFullScreenOff->setOn(!check);
-#else
-    GLWindow->setWindowState(GLWindow->windowState() ^ Qt::WindowFullScreen);
-//     fFullScreenOn->setChecked(check);
-//     fFullScreenOff->setChecked(!check);
-#endif
 #else
     G4cerr << "This version of Qt could not do fullScreen. Resizing the widget is the only solution available.\n" << G4endl;
@@ -1542 +1531 @@
         coefTrans = ((G4double)getSceneNearWidth())/((G4double)WinSize_y);
       }
-#ifdef GEANT4_QT_DEBUG
-      printf("Coef trans %f\n",coefTrans);
-#endif
     } else {
       coefTrans = getSceneNearWidth()*fDeltaSceneTranslation;
@@ -1552 +1538 @@
     
     updateQWidget();
-    ((QApplication*)G4Qt::getInstance ())->processEvents();
+    if (fAutoMove)
+      ((QApplication*)G4Qt::getInstance ())->processEvents();
   }
 
@@ -1651 +1638 @@
     
 #ifdef GEANT4_QT_DEBUG
-//     printf("vp Vector : %f %f %f delta_alpha:%f delta_theta:%f cosalpha:%f sinalpha:%f\n",viewPoint.x(),viewPoint.y(),viewPoint.z(),delta_alpha,delta_theta,cosalpha,sinalpha);
-//     printf("up : %f %f %f\n",up.x(),up.y(),up.z());
-//     printf("new up : %f %f %f\n",new_up.x(),new_up.y(),new_up.z());
-//     printf("vp : %f %f %f\n",vp.x(),vp.y(),vp.z());
-//     printf("new_vp : %f %f %f\n",new_vp.x(),new_vp.y(),new_vp.z());
+//      printf("vp Vector : %f %f %f delta_alpha:%f delta_theta:%f cosalpha:%f sinalpha:%f\n",viewPoint.x(),viewPoint.y(),viewPoint.z(),delta_alpha,delta_theta,cosalpha,sinalpha);
+//      printf("up : %f %f %f\n",up.x(),up.y(),up.z());
+//      printf("new up : %f %f %f\n",new_up.x(),new_up.y(),new_up.z());
+//      printf("vp : %f %f %f\n",vp.x(),vp.y(),vp.z());
+//      printf("new_vp : %f %f %f\n",new_vp.x(),new_vp.y(),new_vp.z());
 #endif
     fVP.SetViewAndLights (viewPoint);
     updateQWidget();
     
-    ((QApplication*)G4Qt::getInstance ())->processEvents();
-  }
-
+    if (fAutoMove)
+      ((QApplication*)G4Qt::getInstance ())->processEvents();
+  }
+  
   fHoldRotateEvent = false;
 }