Changeset 718 for trunk

Timestamp:

Feb 7, 2008, 5:10:38 PM (16 years ago)

Author:

garnier

Message:

Correction du ticket #121

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtViewer.hh (modified) (1 diff)
• src/G4OpenGLQtViewer.cc (modified) (8 diffs)

trunk/geant4/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -127 +127 @@
   QAction *fFullScreenOn;
   QAction *fFullScreenOff;
-#if QT_VERSION < 0x040000
-  QPopupMenu *fDrawingWireframe;
-  QPopupMenu *fDrawingLineRemoval;
-  QPopupMenu *fDrawingSurfaceRemoval;
-  QPopupMenu *fDrawingLineSurfaceRemoval;
-#else
   QAction *fDrawingWireframe;
   QAction *fDrawingLineRemoval;
   QAction *fDrawingSurfaceRemoval;
   QAction *fDrawingLineSurfaceRemoval;
-#endif
 
 private slots :

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

@@ -330 +330 @@
   fShortcutsAction =  new QAction("&Show shortcuts","&Show shortcuts",CTRL+Key_S,mMouseAction,0,true);
 #else
-  fRotateAction =  new QAction("&Rotate",CTRL+Key_R,mMouseAction,0,true);
-  fMoveAction =  new QAction("&Move",CTRL+Key_M,mMouseAction,0,true);
-  fPickAction =  new QAction("&Pick",CTRL+Key_P,mMouseAction,0,true);
-  fShortcutsAction =  new QAction("&Show shortcuts",CTRL+Key_S,mMouseAction,0,true);
+  fRotateAction =  new QAction("&Rotate",CTRL+Key_R,mMouseAction);
+  fMoveAction =  new QAction("&Move",CTRL+Key_M,mMouseAction);
+  fPickAction =  new QAction("&Pick",CTRL+Key_P,mMouseAction);
+  fShortcutsAction =  new QAction("&Show shortcuts",CTRL+Key_S,mMouseAction);
 #endif
   fRotateAction->addTo(mMouseAction);
@@ -482 +482 @@
   fContextMenu->insertItem("&Drawing",mDrawing);
 
-  fDrawingWireframe = new QPopupMenu(mDrawing);
-  mDrawing->insertItem("&Wireframe",fDrawingWireframe);
-
-  mDrawing->setCheckable(true);
-  fDrawingWireframe->setCheckable(true);
-
-  fDrawingLineRemoval = new QPopupMenu(mDrawing);
-  mDrawing->insertItem("&Hidden line removal",fDrawingLineRemoval);
-  fDrawingLineRemoval->setCheckable(true);
-
-  fDrawingSurfaceRemoval = new QPopupMenu(mDrawing);
-  mDrawing->insertItem("&Hidden surface removal",fDrawingSurfaceRemoval);
-  fDrawingSurfaceRemoval->setCheckable(true);
-
-  fDrawingLineSurfaceRemoval = new QPopupMenu(mDrawing);
-  mDrawing->insertItem("&Hidden line and surface removal",fDrawingLineSurfaceRemoval);
-  fDrawingLineSurfaceRemoval->setCheckable(true);
+#if QT_VERSION < 0x030200
+  fDrawingWireframe = new QAction("&Wireframe","&Wireframe",CTRL+Key_W,mDrawing,0,true);
+  fDrawingLineRemoval = new QAction("&Hidden line removal","&Hidden line removal",CTRL+Key_L,mDrawing,0,true);
+  fDrawingSurfaceRemoval = new QAction("&Hidden surface removal","&Hidden surface removal",CTRL+Key_S,mDrawing,0,true);
+  fDrawingLineSurfaceRemoval = new QAction("&Hidden line and surface removal","&Hidden line and surface removal",CTRL+Key_R,mDrawing,0,true);
+#else
+  fDrawingWireframe = new QAction("&Wireframe",CTRL+Key_W,mDrawing);
+  fDrawingLineRemoval = new QAction("&Hidden line removal",CTRL+Key_L,mDrawing);
+  fDrawingSurfaceRemoval = new QAction("&Hidden surface removal",CTRL+Key_S,mDrawing);
+  fDrawingLineSurfaceRemoval = new QAction("&Hidden line and surface removal",CTRL+Key_R,mDrawing);
+#endif
+  fDrawingWireframe->setToggleAction(true);
+  fDrawingLineRemoval->setToggleAction(true);
+  fDrawingSurfaceRemoval->setToggleAction(true);
+  fDrawingLineSurfaceRemoval->setToggleAction(true);
+
+  fDrawingWireframe->addTo(mDrawing);
+  fDrawingLineRemoval->addTo(mDrawing);
+  fDrawingSurfaceRemoval->addTo(mDrawing);
+  fDrawingLineSurfaceRemoval->addTo(mDrawing);
+
 
 #else
@@ -522 +526 @@
 #if QT_VERSION < 0x040000
   if (d_style == G4ViewParameters::wireframe) {
-    fDrawingWireframe->setItemChecked(0,true);
+    fDrawingWireframe->setOn(true);
   } else if (d_style == G4ViewParameters::hlr) {
-    fDrawingLineRemoval->setItemChecked(0,true);
+    fDrawingLineRemoval->setOn(true);
   } else if (d_style == G4ViewParameters::hsr) {
-    fDrawingSurfaceRemoval->setItemChecked(0,true);
+    fDrawingSurfaceRemoval->setOn(true);
   } else if (d_style == G4ViewParameters::hlhsr) {
-    fDrawingLineSurfaceRemoval->setItemChecked(0,true);
+    fDrawingLineSurfaceRemoval->setOn(true);
   } else {
     mDrawing->clear();
@@ -1011 +1015 @@
   
 
-  if (aAction ==1) {
-#if QT_VERSION < 0x040000
-    fDrawingWireframe->setItemChecked (0,true);
-    fDrawingLineRemoval->setItemChecked (0,false);
-    fDrawingSurfaceRemoval->setItemChecked (0,false);
-    fDrawingLineSurfaceRemoval->setItemChecked (0,false);
-#else
-    fDrawingWireframe->setChecked (true);
+  // initialize
+  if ((aAction >0) && (aAction <5)) {
+#if QT_VERSION < 0x040000
+    fDrawingWireframe->setOn(false);
+    fDrawingLineRemoval->setOn(false);
+    fDrawingSurfaceRemoval->setOn(false);
+    fDrawingLineSurfaceRemoval->setOn(false);
+#else
+    fDrawingWireframe->setChecked (false);
     fDrawingLineRemoval->setChecked (false);
     fDrawingSurfaceRemoval->setChecked (false);
     fDrawingLineSurfaceRemoval->setChecked (false);
 #endif
+  }
+  if (aAction ==1) {
+#if QT_VERSION < 0x040000
+    fDrawingWireframe->setOn(true);
+#else
+    fDrawingWireframe->setChecked (true);
+#endif
 
     d_style = G4ViewParameters::wireframe;
@@ -1028 +1040 @@
   } else  if (aAction ==2) {
 #if QT_VERSION < 0x040000
-    fDrawingWireframe->setItemChecked (0,false);
-    fDrawingLineRemoval->setItemChecked (0,true);
-    fDrawingSurfaceRemoval->setItemChecked (0,false);
-    fDrawingLineSurfaceRemoval->setItemChecked (0,false);
-#else
-    fDrawingWireframe->setChecked (false);
+    fDrawingLineRemoval->setOn(true);
+#else
     fDrawingLineRemoval->setChecked (true);
-    fDrawingSurfaceRemoval->setChecked (false);
-    fDrawingLineSurfaceRemoval->setChecked (false);
 #endif
 
@@ -1043 +1049 @@
   } else  if (aAction ==3) {
 #if QT_VERSION < 0x040000
-    fDrawingWireframe->setItemChecked (0,false);
-    fDrawingLineRemoval->setItemChecked (0,false);
-    fDrawingSurfaceRemoval->setItemChecked (0,true);
-    fDrawingLineSurfaceRemoval->setItemChecked (0,false);
-#else
-    fDrawingWireframe->setChecked (false);
-    fDrawingLineRemoval->setChecked (false);
+    fDrawingSurfaceRemoval->setOn(true);
+#else
     fDrawingSurfaceRemoval->setChecked (true);
-    fDrawingLineSurfaceRemoval->setChecked (false);
 #endif
 
@@ -1058 +1058 @@
   } else  if (aAction ==4) {
 #if QT_VERSION < 0x040000
-    fDrawingWireframe->setItemChecked (0,false);
-    fDrawingLineRemoval->setItemChecked (0,false);
-    fDrawingSurfaceRemoval->setItemChecked (0,false);
-    fDrawingLineSurfaceRemoval->setItemChecked (0,true);
-#else
-    fDrawingWireframe->setChecked (false);
-    fDrawingLineRemoval->setChecked (false);
-    fDrawingSurfaceRemoval->setChecked (false);
+    fDrawingLineSurfaceRemoval->setOn(true);
+#else
     fDrawingLineSurfaceRemoval->setChecked (true);
 #endif
@@ -1073 +1067 @@
 
   updateQWidget();
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::toggleDrawingAction\n");
-#endif
 }