Changeset 704 for trunk/geant4/visualization/OpenGL/src

Timestamp:

Jan 30, 2008, 12:41:47 PM (16 years ago)

Author:

garnier

Message:

update sur cvs

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLQtExportDialog.cc (modified) (1 diff)
• G4OpenGLQtViewer.cc (modified) (6 diffs)
• G4OpenGLStoredQtViewer.cc (modified) (3 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtExportDialog.cc,v 1.5 2008/01/15 11:05:08 lgarnier Exp $
+// $Id: G4OpenGLQtExportDialog.cc,v 1.6 2008/01/30 10:54:13 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
 // 
 
-#define GEANT4_QT_DEBUG
+//#define GEANT4_QT_DEBUG
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.9 2008/01/15 11:05:08 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.10 2008/01/30 10:54:13 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -36 +36 @@
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 
-#define GEANT4_QT_DEBUG
+//#define GEANT4_QT_DEBUG
 
 #include "G4OpenGLQtViewer.hh"
@@ -768 +768 @@
   QAction *fullOff = mFullScreen->addAction("Off");
 #endif
-  createRadioAction(fullOn,fullOff,SLOT(toggleFullScreen(bool)),2);
+  createRadioAction(fullOn,fullOff,SLOT(toggleFullScreen()),2);
 #endif
 
@@ -1234 +1234 @@
 /**
    SLOT Activate by a click on the full screen menu
-@param check : 1 , 0
-*/
-void G4OpenGLQtViewer::toggleFullScreen(bool check) {
+*/
+void G4OpenGLQtViewer::toggleFullScreen() {
 #if QT_VERSION >= 0x030200
   GLWindow->setWindowState(GLWindow->windowState() ^ Qt::WindowFullScreen);
@@ -1819 +1818 @@
   holdKeyEvent = true;
 
-  if ((event->key() == Qt::Key_Down) && (event->modifiers() & Qt::ShiftModifier)) // go backward
+  if (event->key() == Qt::Key_Escape) { // escaped from full screen
+    toggleFullScreen();
+    
+  }  else if ((event->key() == Qt::Key_Down) && (event->modifiers() & Qt::ShiftModifier)) // go backward
     {
       G4MouseMoveEvent(0,0,1);
@@ -1879 +1881 @@
 }
 */
-

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.cc,v 1.8 2008/01/15 11:05:08 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.cc,v 1.9 2008/01/30 10:54:13 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -34 +34 @@
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 
-#define GEANT4_QT_DEBUG
+//#define GEANT4_QT_DEBUG
 
 #include "G4OpenGLStoredQtViewer.hh"
@@ -365 +365 @@
 
 #endif
-