Changeset 617 for trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc

Timestamp:

Nov 26, 2007, 6:10:35 PM (17 years ago)

Author:

garnier

Message:

r670@mac-90108: laurentgarnier | 2007-11-26 18:13:28 +0100
mise a jour pour Qt3 linux

File:

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

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

@@ -320 +320 @@
   Q_CHECK_PTR( mMouseAction );
 
+#if QT_VERSION < 0x030200
+  QAction *rotate = new QAction("&Rotate scene","&Rotate scene",CTRL+Key_N,mMouseAction);
+  QAction *move =  new QAction("&Move scene","&Move scene",CTRL+Key_M,mMouseAction);
+#else
   QAction *rotate = new QAction("&Rotate scene",CTRL+Key_N,mMouseAction);
   QAction *move =  new QAction("&Move scene",CTRL+Key_M,mMouseAction);
+#endif
   rotate->addTo(mMouseAction);
   move->addTo(mMouseAction);
@@ -344 +349 @@
   QPopupMenu *mRepresentation = new QPopupMenu(fContextMenu);
 
+#if QT_VERSION < 0x030200
+  QAction *polyhedron = new QAction("&Polyhedron","&Polyhedron",CTRL+Key_P,mRepresentation);
+  QAction *nurbs = new QAction("&NURBS","&NURBS",CTRL+Key_N,mRepresentation);
+#else
   QAction *polyhedron = new QAction("&Polyhedron",CTRL+Key_P,mRepresentation);
   QAction *nurbs = new QAction("&NURBS",CTRL+Key_N,mRepresentation);
+#endif
   polyhedron->addTo(mRepresentation);
   nurbs->addTo(mRepresentation);
@@ -488 +498 @@
   mStyle->insertItem("&Background color",mBackground);
 
+#if QT_VERSION < 0x030200
+  QAction *white = new QAction("&White","&White",CTRL+Key_W,mBackground);
+  QAction *black =  new QAction("&Black","&Black",CTRL+Key_B,mBackground);
+#else
   QAction *white = new QAction("&White",CTRL+Key_W,mBackground);
   QAction *black =  new QAction("&Black",CTRL+Key_B,mBackground);
+#endif
   white->addTo(mBackground);
   black->addTo(mBackground);
@@ -513 +528 @@
   fContextMenu->insertItem("&Actions",mActions);
 
+#if QT_VERSION < 0x030200
+  QAction *controlPanels = new QAction("&Control panels","&Control panels",CTRL+Key_C,mActions);
+  QAction *exitG4 =  new QAction("&Exit to G4Vis >","&Exit to G4Vis >",CTRL+Key_E,mActions);
+  QAction *createEPS =  new QAction("&Save as ...","&Save as ...",CTRL+Key_S,mActions);
+#else
   QAction *controlPanels = new QAction("&Control panels",CTRL+Key_C,mActions);
   QAction *exitG4 =  new QAction("&Exit to G4Vis >",CTRL+Key_E,mActions);
   QAction *createEPS =  new QAction("&Save as ...",CTRL+Key_S,mActions);
+#endif
   controlPanels->addTo(mActions);
   exitG4->addTo(mActions);
@@ -562 +583 @@
   mSpecial->insertItem("Transparency",mTransparency);
 
+#if QT_VERSION < 0x030200
+  QAction *transparencyOn = new QAction("&On","&On",CTRL+Key_O,mTransparency);
+  QAction *transparencyOff = new QAction("&Off","&Off",CTRL+Key_F,mTransparency);
+#else
   QAction *transparencyOn = new QAction("&On",CTRL+Key_O,mTransparency);
   QAction *transparencyOff = new QAction("&Off",CTRL+Key_F,mTransparency);
+#endif
   transparencyOn->addTo(mTransparency);
   transparencyOff->addTo(mTransparency);
@@ -588 +614 @@
   mSpecial->insertItem("Antialiasing",mAntialiasing);
 
+#if QT_VERSION < 0x030200
+  QAction *antialiasingOn = new QAction("&On","&On",CTRL+Key_O,mAntialiasing);
+  QAction *antialiasingOff = new QAction("&Off","&Off",CTRL+Key_F,mAntialiasing);
+#else
   QAction *antialiasingOn = new QAction("&On",CTRL+Key_O,mAntialiasing);
   QAction *antialiasingOff = new QAction("&Off",CTRL+Key_F,mAntialiasing);
+#endif
   antialiasingOn->addTo(mAntialiasing);
   antialiasingOff->addTo(mAntialiasing);
@@ -611 +642 @@
   mSpecial->insertItem("Haloing",mHaloing);
 
+#if QT_VERSION < 0x030200
+  QAction *haloingOn = new QAction("&On","&On",CTRL+Key_O,mHaloing);
+  QAction *haloingOff = new QAction("&Off","&Off",CTRL+Key_F,mHaloing);
+#else
   QAction *haloingOn = new QAction("&On",CTRL+Key_O,mHaloing);
   QAction *haloingOff = new QAction("&Off",CTRL+Key_F,mHaloing);
+#endif
   haloingOn->addTo(mHaloing);
   haloingOff->addTo(mHaloing);
@@ -632 +668 @@
   mSpecial->insertItem("Auxiliairy edges",mAux);
 
+#if QT_VERSION < 0x030200
+  QAction *auxOn = new QAction("&On","&On",CTRL+Key_O,mAux);
+  QAction *auxOff = new QAction("&Off","&Off",CTRL+Key_F,mAux);
+#else
   QAction *auxOn = new QAction("&On",CTRL+Key_O,mAux);
   QAction *auxOff = new QAction("&Off",CTRL+Key_F,mAux);
+#endif
   auxOn->addTo(mAux);
   auxOff->addTo(mAux);
@@ -649 +690 @@
 
 
+#if QT_VERSION >= 0x030200
 #if QT_VERSION < 0x040000
   QPopupMenu *mFullScreen = new QPopupMenu(mSpecial);
@@ -663 +705 @@
 #endif
   createRadioAction(fullOn,fullOff,SLOT(toggleFullScreen(bool)),2);
+#endif
 
 }
@@ -976 +1019 @@
 */
 void G4OpenGLQtViewer::toggleFullScreen(bool check) {
+#if QT_VERSION >= 0x030200
   GLWindow->setWindowState(GLWindow->windowState() ^ Qt::WindowFullScreen);
-
+#else
+  G4cerr << "This version of G4UI Could not generate the selected format" << G4endl;
+#endif
 #ifdef GEANT4_QT_DEBUG
   printf("G4OpenGLQtViewer::toggleRepresentation %d\n",check);