Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_event_pattern.cpp
- Timestamp:
- May 10, 2017, 3:20:54 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/qwt/qwt_event_pattern.cpp
r4271 r8127 38 38 void QwtEventPattern::initMousePattern( int numButtons ) 39 39 { 40 const int altButton = Qt::AltModifier;41 const int controlButton = Qt::ControlModifier;42 const int shiftButton = Qt::ShiftModifier;43 44 40 d_mousePattern.resize( MousePatternCount ); 45 41 … … 49 45 { 50 46 setMousePattern( MouseSelect1, Qt::LeftButton ); 51 setMousePattern( MouseSelect2, Qt::LeftButton, controlButton);52 setMousePattern( MouseSelect3, Qt::LeftButton, altButton);47 setMousePattern( MouseSelect2, Qt::LeftButton, Qt::ControlModifier ); 48 setMousePattern( MouseSelect3, Qt::LeftButton, Qt::AltModifier ); 53 49 break; 54 50 } … … 57 53 setMousePattern( MouseSelect1, Qt::LeftButton ); 58 54 setMousePattern( MouseSelect2, Qt::RightButton ); 59 setMousePattern( MouseSelect3, Qt::LeftButton, altButton);55 setMousePattern( MouseSelect3, Qt::LeftButton, Qt::AltModifier ); 60 56 break; 61 57 } … … 67 63 } 68 64 } 69 for ( int i = 0; i < 3; i++ ) 70 { 71 setMousePattern( MouseSelect4 + i, 72 d_mousePattern[MouseSelect1 + i].button, 73 d_mousePattern[MouseSelect1 + i].state | shiftButton ); 74 } 65 66 setMousePattern( MouseSelect4, d_mousePattern[MouseSelect1].button, 67 d_mousePattern[MouseSelect1].modifiers | Qt::ShiftModifier ); 68 69 setMousePattern( MouseSelect5, d_mousePattern[MouseSelect2].button, 70 d_mousePattern[MouseSelect2].modifiers | Qt::ShiftModifier ); 71 72 setMousePattern( MouseSelect6, d_mousePattern[MouseSelect3].button, 73 d_mousePattern[MouseSelect3].modifiers | Qt::ShiftModifier ); 75 74 } 76 75 … … 103 102 \param pattern Index of the pattern 104 103 \param button Button 105 \param state State104 \param modifiers Keyboard modifiers 106 105 107 106 \sa QMouseEvent 108 107 */ 109 void QwtEventPattern::setMousePattern( uint pattern, int button, int state ) 110 { 111 if ( pattern < ( uint )d_mousePattern.count() ) 108 void QwtEventPattern::setMousePattern( MousePatternCode pattern, 109 Qt::MouseButton button, Qt::KeyboardModifiers modifiers ) 110 { 111 if ( pattern >= 0 && pattern < MousePatternCount ) 112 112 { 113 d_mousePattern[ int( pattern )].button = button;114 d_mousePattern[ int( pattern )].state = state;113 d_mousePattern[ pattern ].button = button; 114 d_mousePattern[ pattern ].modifiers = modifiers; 115 115 } 116 116 } … … 121 121 \param pattern Index of the pattern 122 122 \param key Key 123 \param state State123 \param modifiers Keyboard modifiers 124 124 125 125 \sa QKeyEvent 126 126 */ 127 void QwtEventPattern::setKeyPattern( uint pattern, int key, int state ) 128 { 129 if ( pattern < ( uint )d_keyPattern.count() ) 127 void QwtEventPattern::setKeyPattern( KeyPatternCode pattern, 128 int key, Qt::KeyboardModifiers modifiers ) 129 { 130 if ( pattern >= 0 && pattern < KeyPatternCount ) 130 131 { 131 d_keyPattern[ int( pattern )].key = key;132 d_keyPattern[ int( pattern )].state = state;132 d_keyPattern[ pattern ].key = key; 133 d_keyPattern[ pattern ].modifiers = modifiers; 133 134 } 134 135 } … … 146 147 } 147 148 148 //! Return mouse patterns149 //! \return Mouse pattern 149 150 const QVector<QwtEventPattern::MousePattern> & 150 151 QwtEventPattern::mousePattern() const … … 153 154 } 154 155 155 //! Return key patterns156 //! \return Key pattern 156 157 const QVector<QwtEventPattern::KeyPattern> & 157 158 QwtEventPattern::keyPattern() const … … 160 161 } 161 162 162 //! Return ,ouse patterns163 //! \return Mouse pattern 163 164 QVector<QwtEventPattern::MousePattern> &QwtEventPattern::mousePattern() 164 165 { … … 166 167 } 167 168 168 //! Return Key patterns169 //! \return Key pattern 169 170 QVector<QwtEventPattern::KeyPattern> &QwtEventPattern::keyPattern() 170 171 { … … 179 180 are set. 180 181 181 \param patternIndex of the event pattern182 \param code Index of the event pattern 182 183 \param event Mouse event 183 184 \return true if matches … … 185 186 \sa keyMatch() 186 187 */ 187 bool QwtEventPattern::mouseMatch( uint pattern,188 bool QwtEventPattern::mouseMatch( MousePatternCode code, 188 189 const QMouseEvent *event ) const 189 190 { 190 bool ok = false; 191 192 if ( event && pattern < ( uint )d_mousePattern.count() ) 193 ok = mouseMatch( d_mousePattern[int( pattern )], event ); 194 195 return ok; 191 if ( code >= 0 && code < MousePatternCount ) 192 return mouseMatch( d_mousePattern[ code ], event ); 193 194 return false; 196 195 } 197 196 … … 213 212 const QMouseEvent *event ) const 214 213 { 215 if ( event ->button() != pattern.button)214 if ( event == NULL ) 216 215 return false; 217 216 218 const bool matched = 219 ( event->modifiers() & Qt::KeyboardModifierMask ) == 220 ( int )( pattern.state & Qt::KeyboardModifierMask ); 221 222 return matched; 217 const MousePattern mousePattern( event->button(), event->modifiers() ); 218 return mousePattern == pattern; 223 219 } 224 220 … … 230 226 are set. 231 227 232 \param patternIndex of the event pattern228 \param code Index of the event pattern 233 229 \param event Key event 234 230 \return true if matches … … 236 232 \sa mouseMatch() 237 233 */ 238 bool QwtEventPattern::keyMatch( uint pattern,234 bool QwtEventPattern::keyMatch( KeyPatternCode code, 239 235 const QKeyEvent *event ) const 240 236 { 241 bool ok = false; 242 243 if ( event && pattern < ( uint )d_keyPattern.count() ) 244 ok = keyMatch( d_keyPattern[int( pattern )], event ); 245 246 return ok; 237 if ( code >= 0 && code < KeyPatternCount ) 238 return keyMatch( d_keyPattern[ code ], event ); 239 240 return false; 247 241 } 248 242 … … 264 258 const KeyPattern &pattern, const QKeyEvent *event ) const 265 259 { 266 if ( event ->key() != pattern.key)260 if ( event == NULL ) 267 261 return false; 268 262 269 const bool matched = 270 ( event->modifiers() & Qt::KeyboardModifierMask ) == 271 ( int )( pattern.state & Qt::KeyboardModifierMask ); 272 273 return matched; 274 } 263 const KeyPattern keyPattern( event->key(), event->modifiers() ); 264 return keyPattern == pattern; 265 }
Note:
See TracChangeset
for help on using the changeset viewer.