Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_panner.cpp

Timestamp:

May 10, 2017, 3:20:54 PM (7 years ago)

Author:

stoecker

Message:

update qwt and qwtpolar, many QT5 fixes (unfinished)

File:

• trunk/BNC/qwt/qwt_panner.cpp (modified) (15 diffs)

trunk/BNC/qwt/qwt_panner.cpp

@@ -10 +10 @@
 #include "qwt_panner.h"
 #include "qwt_picker.h"
+#include "qwt_painter.h"
 #include <qpainter.h>
 #include <qpixmap.h>
@@ -23 +24 @@
     for ( int i = 0; i < children.size(); i++ )
     {
-        QObject *obj = children[i];
-        if ( obj->inherits( "QwtPicker" ) )
-        {
-            QwtPicker *picker = ( QwtPicker * )obj;
-            if ( picker->isEnabled() )
-                pickers += picker;
-        }
+        QwtPicker *picker = qobject_cast<QwtPicker *>( children[i] );
+        if ( picker && picker->isEnabled() )
+            pickers += picker;
     }
 
@@ -40 +37 @@
     PrivateData():
         button( Qt::LeftButton ),
-        buttonState( Qt::NoButton ),
+        buttonModifiers( Qt::NoModifier ),
         abortKey( Qt::Key_Escape ),
-        abortKeyState( Qt::NoButton ),
+        abortKeyModifiers( Qt::NoModifier ),
 #ifndef QT_NO_CURSOR
         cursor( NULL ),
@@ -61 +58 @@
     }
 
-    int button;
-    int buttonState;
+    Qt::MouseButton button;
+    Qt::KeyboardModifiers  buttonModifiers;
+
     int abortKey;
-    int abortKeyState;
+    Qt::KeyboardModifiers abortKeyModifiers;
 
     QPoint initialPos;
@@ -106 +104 @@
 
 /*!
-   Change the mouse button
-   The defaults are Qt::LeftButton and Qt::NoButton
-*/
-void QwtPanner::setMouseButton( int button, int buttonState )
+   Change the mouse button and modifiers used for panning
+   The defaults are Qt::LeftButton and Qt::NoModifier
+*/
+void QwtPanner::setMouseButton( Qt::MouseButton button,
+    Qt::KeyboardModifiers modifiers )
 {
     d_data->button = button;
-    d_data->buttonState = buttonState;
-}
-
-//! Get the mouse button
-void QwtPanner::getMouseButton( int &button, int &buttonState ) const
+    d_data->buttonModifiers = modifiers;
+}
+
+//! Get mouse button and modifiers used for panning
+void QwtPanner::getMouseButton( Qt::MouseButton &button,
+    Qt::KeyboardModifiers &modifiers ) const
 {
     button = d_data->button;
-    buttonState = d_data->buttonState;
+    modifiers = d_data->buttonModifiers;
 }
 
 /*!
    Change the abort key
-   The defaults are Qt::Key_Escape and Qt::NoButton
+   The defaults are Qt::Key_Escape and Qt::NoModifiers
 
    \param key Key ( See Qt::Keycode )
-   \param state State
-*/
-void QwtPanner::setAbortKey( int key, int state )
+   \param modifiers Keyboard modifiers
+*/
+void QwtPanner::setAbortKey( int key, 
+    Qt::KeyboardModifiers modifiers )
 {
     d_data->abortKey = key;
-    d_data->abortKeyState = state;
-}
-
-//! Get the abort key
-void QwtPanner::getAbortKey( int &key, int &state ) const
+    d_data->abortKeyModifiers = modifiers;
+}
+
+//! Get the abort key and modifiers
+void QwtPanner::getAbortKey( int &key, 
+    Qt::KeyboardModifiers &modifiers ) const
 {
     key = d_data->abortKey;
-    state = d_data->abortKeyState;
+    modifiers = d_data->abortKeyModifiers;
 }
 
@@ -223 +225 @@
 
 /*!
-   Return true if a orientatio is enabled
+   \return True if an orientation is enabled
    \sa orientations(), setOrientations()
 */
@@ -257 +259 @@
 
     QPixmap pm( size() );
-    pm.fill( parentWidget(), 0, 0 );
+    QwtPainter::fillPixmap( parentWidget(), pm );
 
     QPainter painter( &pm );
@@ -298 +300 @@
 /*!
   Grab the widget into a pixmap.
+  \return Grabbed pixmap
 */
 QPixmap QwtPanner::grab() const
 {
+#if QT_VERSION >= 0x050000
+    return parentWidget()->grab( parentWidget()->rect() );
+#else
     return QPixmap::grabWidget( parentWidget() );
+#endif
 }
 
@@ -307 +314 @@
   \brief Event filter
 
-  When isEnabled() the mouse events of the observed widget are filtered.
+  When isEnabled() is true mouse events of the
+  observed widget are filtered.
 
   \param object Object to be filtered
   \param event Event
 
+  \return Always false, beside for paint events for the
+          parent widget.
+
   \sa widgetMousePressEvent(), widgetMouseReleaseEvent(),
       widgetMouseMoveEvent()
@@ -324 +335 @@
         case QEvent::MouseButtonPress:
         {
-            widgetMousePressEvent( ( QMouseEvent * )event );
+            widgetMousePressEvent( static_cast<QMouseEvent *>( event ) );
             break;
         }
         case QEvent::MouseMove:
         {
-            widgetMouseMoveEvent( ( QMouseEvent * )event );
+            widgetMouseMoveEvent( static_cast<QMouseEvent *>( event ) );
             break;
         }
         case QEvent::MouseButtonRelease:
         {
-            widgetMouseReleaseEvent( ( QMouseEvent * )event );
+            widgetMouseReleaseEvent( static_cast<QMouseEvent *>( event ) );
             break;
         }
         case QEvent::KeyPress:
         {
-            widgetKeyPressEvent( ( QKeyEvent * )event );
+            widgetKeyPressEvent( static_cast<QKeyEvent *>( event ) );
             break;
         }
         case QEvent::KeyRelease:
         {
-            widgetKeyReleaseEvent( ( QKeyEvent * )event );
+            widgetKeyReleaseEvent( static_cast<QKeyEvent *>( event ) );
             break;
         }
@@ -368 +379 @@
 void QwtPanner::widgetMousePressEvent( QMouseEvent *mouseEvent )
 {
-    if ( mouseEvent->button() != d_data->button )
+    if ( ( mouseEvent->button() != d_data->button )
+        || ( mouseEvent->modifiers() != d_data->buttonModifiers ) )
+    {
         return;
+    }
 
     QWidget *w = parentWidget();
@@ -375 +389 @@
         return;
 
-    if ( ( mouseEvent->modifiers() & Qt::KeyboardModifierMask ) !=
-        ( int )( d_data->buttonState & Qt::KeyboardModifierMask ) )
-    {
-        return;
-    }
-
 #ifndef QT_NO_CURSOR
     showCursor( true );
@@ -391 +399 @@
     // We don't want to grab the picker !
     QVector<QwtPicker *> pickers = qwtActivePickers( parentWidget() );
-    for ( int i = 0; i < ( int )pickers.size(); i++ )
+    for ( int i = 0; i < pickers.size(); i++ )
         pickers[i]->setEnabled( false );
 
@@ -397 +405 @@
     d_data->contentsMask = contentsMask();
 
-    for ( int i = 0; i < ( int )pickers.size(); i++ )
+    for ( int i = 0; i < pickers.size(); i++ )
         pickers[i]->setEnabled( true );
 
@@ -472 +480 @@
 void QwtPanner::widgetKeyPressEvent( QKeyEvent *keyEvent )
 {
-    if ( keyEvent->key() == d_data->abortKey )
-    {
-        const bool matched =
-            ( keyEvent->modifiers() & Qt::KeyboardModifierMask ) ==
-                ( int )( d_data->abortKeyState & Qt::KeyboardModifierMask );
-        if ( matched )
-        {
-            hide();
-#ifndef QT_NO_CURSOR
-            showCursor( false );
-#endif
-            d_data->pixmap = QPixmap();
-        }
+    if ( ( keyEvent->key() == d_data->abortKey )
+        && ( keyEvent->modifiers() == d_data->abortKeyModifiers ) )
+    {
+        hide();
+
+#ifndef QT_NO_CURSOR
+        showCursor( false );
+#endif
+        d_data->pixmap = QPixmap();
     }
 }