Changeset 718 for trunk/geant4
- Timestamp:
- Feb 7, 2008, 5:10:38 PM (17 years ago)
- Location:
- trunk/geant4/visualization/OpenGL
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/visualization/OpenGL/include/G4OpenGLQtViewer.hh
r717 r718 127 127 QAction *fFullScreenOn; 128 128 QAction *fFullScreenOff; 129 #if QT_VERSION < 0x040000130 QPopupMenu *fDrawingWireframe;131 QPopupMenu *fDrawingLineRemoval;132 QPopupMenu *fDrawingSurfaceRemoval;133 QPopupMenu *fDrawingLineSurfaceRemoval;134 #else135 129 QAction *fDrawingWireframe; 136 130 QAction *fDrawingLineRemoval; 137 131 QAction *fDrawingSurfaceRemoval; 138 132 QAction *fDrawingLineSurfaceRemoval; 139 #endif140 133 141 134 private slots : -
trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r717 r718 330 330 fShortcutsAction = new QAction("&Show shortcuts","&Show shortcuts",CTRL+Key_S,mMouseAction,0,true); 331 331 #else 332 fRotateAction = new QAction("&Rotate",CTRL+Key_R,mMouseAction ,0,true);333 fMoveAction = new QAction("&Move",CTRL+Key_M,mMouseAction ,0,true);334 fPickAction = new QAction("&Pick",CTRL+Key_P,mMouseAction ,0,true);335 fShortcutsAction = new QAction("&Show shortcuts",CTRL+Key_S,mMouseAction ,0,true);332 fRotateAction = new QAction("&Rotate",CTRL+Key_R,mMouseAction); 333 fMoveAction = new QAction("&Move",CTRL+Key_M,mMouseAction); 334 fPickAction = new QAction("&Pick",CTRL+Key_P,mMouseAction); 335 fShortcutsAction = new QAction("&Show shortcuts",CTRL+Key_S,mMouseAction); 336 336 #endif 337 337 fRotateAction->addTo(mMouseAction); … … 482 482 fContextMenu->insertItem("&Drawing",mDrawing); 483 483 484 fDrawingWireframe = new QPopupMenu(mDrawing); 485 mDrawing->insertItem("&Wireframe",fDrawingWireframe); 486 487 mDrawing->setCheckable(true); 488 fDrawingWireframe->setCheckable(true); 489 490 fDrawingLineRemoval = new QPopupMenu(mDrawing); 491 mDrawing->insertItem("&Hidden line removal",fDrawingLineRemoval); 492 fDrawingLineRemoval->setCheckable(true); 493 494 fDrawingSurfaceRemoval = new QPopupMenu(mDrawing); 495 mDrawing->insertItem("&Hidden surface removal",fDrawingSurfaceRemoval); 496 fDrawingSurfaceRemoval->setCheckable(true); 497 498 fDrawingLineSurfaceRemoval = new QPopupMenu(mDrawing); 499 mDrawing->insertItem("&Hidden line and surface removal",fDrawingLineSurfaceRemoval); 500 fDrawingLineSurfaceRemoval->setCheckable(true); 484 #if QT_VERSION < 0x030200 485 fDrawingWireframe = new QAction("&Wireframe","&Wireframe",CTRL+Key_W,mDrawing,0,true); 486 fDrawingLineRemoval = new QAction("&Hidden line removal","&Hidden line removal",CTRL+Key_L,mDrawing,0,true); 487 fDrawingSurfaceRemoval = new QAction("&Hidden surface removal","&Hidden surface removal",CTRL+Key_S,mDrawing,0,true); 488 fDrawingLineSurfaceRemoval = new QAction("&Hidden line and surface removal","&Hidden line and surface removal",CTRL+Key_R,mDrawing,0,true); 489 #else 490 fDrawingWireframe = new QAction("&Wireframe",CTRL+Key_W,mDrawing); 491 fDrawingLineRemoval = new QAction("&Hidden line removal",CTRL+Key_L,mDrawing); 492 fDrawingSurfaceRemoval = new QAction("&Hidden surface removal",CTRL+Key_S,mDrawing); 493 fDrawingLineSurfaceRemoval = new QAction("&Hidden line and surface removal",CTRL+Key_R,mDrawing); 494 #endif 495 fDrawingWireframe->setToggleAction(true); 496 fDrawingLineRemoval->setToggleAction(true); 497 fDrawingSurfaceRemoval->setToggleAction(true); 498 fDrawingLineSurfaceRemoval->setToggleAction(true); 499 500 fDrawingWireframe->addTo(mDrawing); 501 fDrawingLineRemoval->addTo(mDrawing); 502 fDrawingSurfaceRemoval->addTo(mDrawing); 503 fDrawingLineSurfaceRemoval->addTo(mDrawing); 504 501 505 502 506 #else … … 522 526 #if QT_VERSION < 0x040000 523 527 if (d_style == G4ViewParameters::wireframe) { 524 fDrawingWireframe->set ItemChecked(0,true);528 fDrawingWireframe->setOn(true); 525 529 } else if (d_style == G4ViewParameters::hlr) { 526 fDrawingLineRemoval->set ItemChecked(0,true);530 fDrawingLineRemoval->setOn(true); 527 531 } else if (d_style == G4ViewParameters::hsr) { 528 fDrawingSurfaceRemoval->set ItemChecked(0,true);532 fDrawingSurfaceRemoval->setOn(true); 529 533 } else if (d_style == G4ViewParameters::hlhsr) { 530 fDrawingLineSurfaceRemoval->set ItemChecked(0,true);534 fDrawingLineSurfaceRemoval->setOn(true); 531 535 } else { 532 536 mDrawing->clear(); … … 1011 1015 1012 1016 1013 if (aAction ==1) { 1014 #if QT_VERSION < 0x040000 1015 fDrawingWireframe->setItemChecked (0,true); 1016 fDrawingLineRemoval->setItemChecked (0,false); 1017 fDrawingSurfaceRemoval->setItemChecked (0,false); 1018 fDrawingLineSurfaceRemoval->setItemChecked (0,false); 1019 #else 1020 fDrawingWireframe->setChecked (true); 1017 // initialize 1018 if ((aAction >0) && (aAction <5)) { 1019 #if QT_VERSION < 0x040000 1020 fDrawingWireframe->setOn(false); 1021 fDrawingLineRemoval->setOn(false); 1022 fDrawingSurfaceRemoval->setOn(false); 1023 fDrawingLineSurfaceRemoval->setOn(false); 1024 #else 1025 fDrawingWireframe->setChecked (false); 1021 1026 fDrawingLineRemoval->setChecked (false); 1022 1027 fDrawingSurfaceRemoval->setChecked (false); 1023 1028 fDrawingLineSurfaceRemoval->setChecked (false); 1024 1029 #endif 1030 } 1031 if (aAction ==1) { 1032 #if QT_VERSION < 0x040000 1033 fDrawingWireframe->setOn(true); 1034 #else 1035 fDrawingWireframe->setChecked (true); 1036 #endif 1025 1037 1026 1038 d_style = G4ViewParameters::wireframe; … … 1028 1040 } else if (aAction ==2) { 1029 1041 #if QT_VERSION < 0x040000 1030 fDrawingWireframe->setItemChecked (0,false); 1031 fDrawingLineRemoval->setItemChecked (0,true); 1032 fDrawingSurfaceRemoval->setItemChecked (0,false); 1033 fDrawingLineSurfaceRemoval->setItemChecked (0,false); 1034 #else 1035 fDrawingWireframe->setChecked (false); 1042 fDrawingLineRemoval->setOn(true); 1043 #else 1036 1044 fDrawingLineRemoval->setChecked (true); 1037 fDrawingSurfaceRemoval->setChecked (false);1038 fDrawingLineSurfaceRemoval->setChecked (false);1039 1045 #endif 1040 1046 … … 1043 1049 } else if (aAction ==3) { 1044 1050 #if QT_VERSION < 0x040000 1045 fDrawingWireframe->setItemChecked (0,false); 1046 fDrawingLineRemoval->setItemChecked (0,false); 1047 fDrawingSurfaceRemoval->setItemChecked (0,true); 1048 fDrawingLineSurfaceRemoval->setItemChecked (0,false); 1049 #else 1050 fDrawingWireframe->setChecked (false); 1051 fDrawingLineRemoval->setChecked (false); 1051 fDrawingSurfaceRemoval->setOn(true); 1052 #else 1052 1053 fDrawingSurfaceRemoval->setChecked (true); 1053 fDrawingLineSurfaceRemoval->setChecked (false);1054 1054 #endif 1055 1055 … … 1058 1058 } else if (aAction ==4) { 1059 1059 #if QT_VERSION < 0x040000 1060 fDrawingWireframe->setItemChecked (0,false); 1061 fDrawingLineRemoval->setItemChecked (0,false); 1062 fDrawingSurfaceRemoval->setItemChecked (0,false); 1063 fDrawingLineSurfaceRemoval->setItemChecked (0,true); 1064 #else 1065 fDrawingWireframe->setChecked (false); 1066 fDrawingLineRemoval->setChecked (false); 1067 fDrawingSurfaceRemoval->setChecked (false); 1060 fDrawingLineSurfaceRemoval->setOn(true); 1061 #else 1068 1062 fDrawingLineSurfaceRemoval->setChecked (true); 1069 1063 #endif … … 1073 1067 1074 1068 updateQWidget(); 1075 #ifdef GEANT4_QT_DEBUG1076 printf("G4OpenGLQtViewer::toggleDrawingAction\n");1077 #endif1078 1069 } 1079 1070
Note: See TracChangeset
for help on using the changeset viewer.