Changeset 709 for trunk/geant4/visualization/OpenGL
- Timestamp:
- Feb 4, 2008, 3:57:01 PM (17 years ago)
- Location:
- trunk/geant4/visualization/OpenGL/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r707 r709 102 102 void G4OpenGLQtViewer::setupViewport(int aWidth, int aHeight) 103 103 { 104 int side = qMin(aWidth, aHeight); 104 int side = aWidth; 105 if (aHeight < aWidth) side = aHeight; 105 106 glViewport((aWidth - side) / 2, (aHeight - side) / 2, side, side); 106 107 … … 357 358 // INIT mMouse 358 359 #if QT_VERSION < 0x040000 359 fMouseRotate->setItemChecked ed(0,true);360 fMouseRotate->setItemChecked(0,true); 360 361 361 362 QObject ::connect(fMouseRotate, … … 1532 1533 glRenderMode (GL_FEEDBACK); 1533 1534 1534 int side = qMin(aWidth, aHeight); 1535 int side = aWidth; 1536 if (aHeight < aWidth) side = aHeight; 1535 1537 glViewport((aWidth - side) / 2, (aHeight - side) / 2, side, side); 1536 1538 DrawView(); … … 1778 1780 holdKeyEvent = true; 1779 1781 1782 #if QT_VERSION < 0x040000 1783 if ((event->key() == Qt::Key_Down) && (event->state() & Qt::AltButton )) { // go backward 1784 #else 1780 1785 if ((event->key() == Qt::Key_Down) && (event->modifiers() & Qt::AltModifier )) { // go backward 1786 #endif 1781 1787 G4MouseMoveEvent(0,0,1); 1782 1788 } 1789 #if QT_VERSION < 0x040000 1790 else if ((event->key() == Qt::Key_Up) && (event->state() & Qt::AltButton)) { // go forward 1791 #else 1783 1792 else if ((event->key() == Qt::Key_Up) && (event->modifiers() & Qt::AltModifier)) { // go forward 1793 #endif 1784 1794 G4MouseMoveEvent(0,0,-1); 1785 1795 } 1796 #if QT_VERSION < 0x040000 1797 if ((event->key() == Qt::Key_Down) && (event->state() & Qt::ShiftButton)) { // rotate phi 1798 #else 1786 1799 if ((event->key() == Qt::Key_Down) && (event->modifiers() & Qt::ShiftModifier)) { // rotate phi 1800 #endif 1787 1801 G4MouseRotateEvent(0,-1); 1788 1802 } 1803 #if QT_VERSION < 0x040000 1804 else if ((event->key() == Qt::Key_Up) && (event->state() & Qt::ShiftButton)) { // rotate phi 1805 #else 1789 1806 else if ((event->key() == Qt::Key_Up) && (event->modifiers() & Qt::ShiftModifier)) { // rotate phi 1807 #endif 1790 1808 G4MouseRotateEvent(0,1); 1791 1809 } 1810 #if QT_VERSION < 0x040000 1811 if ((event->key() == Qt::Key_Left) && (event->state() & Qt::ShiftButton)) { // rotate theta 1812 #else 1792 1813 if ((event->key() == Qt::Key_Left) && (event->modifiers() & Qt::ShiftModifier)) { // rotate theta 1814 #endif 1793 1815 G4MouseRotateEvent(1,0); 1794 1816 } 1817 #if QT_VERSION < 0x040000 1795 1818 else if ((event->key() == Qt::Key_Right) && (event->modifiers() & Qt::ShiftModifier)) { // rotate theta 1819 #else 1820 else if ((event->key() == Qt::Key_Right) && (event->modifiers() & Qt::ShiftModifier)) { // rotate theta 1821 #endif 1796 1822 G4MouseRotateEvent(-1,0); 1797 1823 } -
trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc
r707 r709 49 49 G4OpenGLViewer (sceneHandler), 50 50 G4OpenGLQtViewer (sceneHandler), 51 G4OpenGLStoredViewer (sceneHandler), 52 QGLWidget(QGLFormat(QGL::SampleBuffers)) // FIXME : gerer le pb du parent ! 53 { 51 G4OpenGLStoredViewer (sceneHandler) // FIXME : gerer le pb du parent ! 52 { 53 #if QT_VERSION < 0x040000 54 setFocusPolicy(QWidget::StrongFocus); // enable keybord events 55 #else 54 56 setFocusPolicy(Qt::StrongFocus); // enable keybord events 57 #endif 55 58 nbPaint =0; 56 59 hasToRepaint =false; … … 299 302 void G4OpenGLStoredQtViewer::mousePressEvent(QMouseEvent *event) 300 303 { 304 #if QT_VERSION < 0x040000 305 if ((event->button() & Qt::LeftButton) 306 && !((event->state() & Qt::ShiftButton) 307 || (event->state() & Qt::ControlButton) 308 || (event->state() & Qt::AltButton) 309 || (event->state() & Qt::MetaButton))) { 310 #else 301 311 if ((event->buttons() & Qt::LeftButton) 302 312 && !((event->modifiers() & Qt::ShiftModifier) … … 304 314 || (event->modifiers() & Qt::AltModifier) 305 315 || (event->modifiers() & Qt::MetaModifier))) { 316 #endif 306 317 #ifdef GEANT4_QT_DEBUG 307 318 printf("G4OpenGLStoredQtViewer::mousePressEvent\n");
Note: See TracChangeset
for help on using the changeset viewer.