Changeset 617 for trunk/geant4/visualization
- Timestamp:
- Nov 26, 2007, 6:10:35 PM (17 years ago)
- Location:
- trunk/geant4/visualization
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r612 r617 320 320 Q_CHECK_PTR( mMouseAction ); 321 321 322 #if QT_VERSION < 0x030200 323 QAction *rotate = new QAction("&Rotate scene","&Rotate scene",CTRL+Key_N,mMouseAction); 324 QAction *move = new QAction("&Move scene","&Move scene",CTRL+Key_M,mMouseAction); 325 #else 322 326 QAction *rotate = new QAction("&Rotate scene",CTRL+Key_N,mMouseAction); 323 327 QAction *move = new QAction("&Move scene",CTRL+Key_M,mMouseAction); 328 #endif 324 329 rotate->addTo(mMouseAction); 325 330 move->addTo(mMouseAction); … … 344 349 QPopupMenu *mRepresentation = new QPopupMenu(fContextMenu); 345 350 351 #if QT_VERSION < 0x030200 352 QAction *polyhedron = new QAction("&Polyhedron","&Polyhedron",CTRL+Key_P,mRepresentation); 353 QAction *nurbs = new QAction("&NURBS","&NURBS",CTRL+Key_N,mRepresentation); 354 #else 346 355 QAction *polyhedron = new QAction("&Polyhedron",CTRL+Key_P,mRepresentation); 347 356 QAction *nurbs = new QAction("&NURBS",CTRL+Key_N,mRepresentation); 357 #endif 348 358 polyhedron->addTo(mRepresentation); 349 359 nurbs->addTo(mRepresentation); … … 488 498 mStyle->insertItem("&Background color",mBackground); 489 499 500 #if QT_VERSION < 0x030200 501 QAction *white = new QAction("&White","&White",CTRL+Key_W,mBackground); 502 QAction *black = new QAction("&Black","&Black",CTRL+Key_B,mBackground); 503 #else 490 504 QAction *white = new QAction("&White",CTRL+Key_W,mBackground); 491 505 QAction *black = new QAction("&Black",CTRL+Key_B,mBackground); 506 #endif 492 507 white->addTo(mBackground); 493 508 black->addTo(mBackground); … … 513 528 fContextMenu->insertItem("&Actions",mActions); 514 529 530 #if QT_VERSION < 0x030200 531 QAction *controlPanels = new QAction("&Control panels","&Control panels",CTRL+Key_C,mActions); 532 QAction *exitG4 = new QAction("&Exit to G4Vis >","&Exit to G4Vis >",CTRL+Key_E,mActions); 533 QAction *createEPS = new QAction("&Save as ...","&Save as ...",CTRL+Key_S,mActions); 534 #else 515 535 QAction *controlPanels = new QAction("&Control panels",CTRL+Key_C,mActions); 516 536 QAction *exitG4 = new QAction("&Exit to G4Vis >",CTRL+Key_E,mActions); 517 537 QAction *createEPS = new QAction("&Save as ...",CTRL+Key_S,mActions); 538 #endif 518 539 controlPanels->addTo(mActions); 519 540 exitG4->addTo(mActions); … … 562 583 mSpecial->insertItem("Transparency",mTransparency); 563 584 585 #if QT_VERSION < 0x030200 586 QAction *transparencyOn = new QAction("&On","&On",CTRL+Key_O,mTransparency); 587 QAction *transparencyOff = new QAction("&Off","&Off",CTRL+Key_F,mTransparency); 588 #else 564 589 QAction *transparencyOn = new QAction("&On",CTRL+Key_O,mTransparency); 565 590 QAction *transparencyOff = new QAction("&Off",CTRL+Key_F,mTransparency); 591 #endif 566 592 transparencyOn->addTo(mTransparency); 567 593 transparencyOff->addTo(mTransparency); … … 588 614 mSpecial->insertItem("Antialiasing",mAntialiasing); 589 615 616 #if QT_VERSION < 0x030200 617 QAction *antialiasingOn = new QAction("&On","&On",CTRL+Key_O,mAntialiasing); 618 QAction *antialiasingOff = new QAction("&Off","&Off",CTRL+Key_F,mAntialiasing); 619 #else 590 620 QAction *antialiasingOn = new QAction("&On",CTRL+Key_O,mAntialiasing); 591 621 QAction *antialiasingOff = new QAction("&Off",CTRL+Key_F,mAntialiasing); 622 #endif 592 623 antialiasingOn->addTo(mAntialiasing); 593 624 antialiasingOff->addTo(mAntialiasing); … … 611 642 mSpecial->insertItem("Haloing",mHaloing); 612 643 644 #if QT_VERSION < 0x030200 645 QAction *haloingOn = new QAction("&On","&On",CTRL+Key_O,mHaloing); 646 QAction *haloingOff = new QAction("&Off","&Off",CTRL+Key_F,mHaloing); 647 #else 613 648 QAction *haloingOn = new QAction("&On",CTRL+Key_O,mHaloing); 614 649 QAction *haloingOff = new QAction("&Off",CTRL+Key_F,mHaloing); 650 #endif 615 651 haloingOn->addTo(mHaloing); 616 652 haloingOff->addTo(mHaloing); … … 632 668 mSpecial->insertItem("Auxiliairy edges",mAux); 633 669 670 #if QT_VERSION < 0x030200 671 QAction *auxOn = new QAction("&On","&On",CTRL+Key_O,mAux); 672 QAction *auxOff = new QAction("&Off","&Off",CTRL+Key_F,mAux); 673 #else 634 674 QAction *auxOn = new QAction("&On",CTRL+Key_O,mAux); 635 675 QAction *auxOff = new QAction("&Off",CTRL+Key_F,mAux); 676 #endif 636 677 auxOn->addTo(mAux); 637 678 auxOff->addTo(mAux); … … 649 690 650 691 692 #if QT_VERSION >= 0x030200 651 693 #if QT_VERSION < 0x040000 652 694 QPopupMenu *mFullScreen = new QPopupMenu(mSpecial); … … 663 705 #endif 664 706 createRadioAction(fullOn,fullOff,SLOT(toggleFullScreen(bool)),2); 707 #endif 665 708 666 709 } … … 976 1019 */ 977 1020 void G4OpenGLQtViewer::toggleFullScreen(bool check) { 1021 #if QT_VERSION >= 0x030200 978 1022 GLWindow->setWindowState(GLWindow->windowState() ^ Qt::WindowFullScreen); 979 1023 #else 1024 G4cerr << "This version of G4UI Could not generate the selected format" << G4endl; 1025 #endif 980 1026 #ifdef GEANT4_QT_DEBUG 981 1027 printf("G4OpenGLQtViewer::toggleRepresentation %d\n",check); -
trunk/geant4/visualization/management/src/G4VisCommandsSceneHandler.cc
r593 r617 68 68 69 69 G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity(); 70 printf("G4VisCommandSceneHandlerCreate::SetNewValue 2\n"); 70 71 71 72 G4String& sceneName = newValue; … … 209 210 G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity(); 210 211 212 printf("G4VisCommandSceneHandlerCreate::SetNewValue 1\n"); 213 211 214 G4String graphicsSystem, newName; 212 215 std::istringstream is (newValue); … … 326 329 G4String newValue) { 327 330 G4String name, verbosityString; 331 printf("G4VisCommandSceneHandlerCreate::SetNewValue 3\n"); 328 332 std::istringstream is (newValue); 329 333 is >> name >> verbosityString; … … 390 394 391 395 G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity(); 396 printf("G4VisCommandSceneHandlerCreate::SetNewValue 4\n"); 392 397 393 398 G4String& selectName = newValue;
Note: See TracChangeset
for help on using the changeset viewer.