Browse Source

Remove unused/unnecessary event handlers.

QGC4.4
Bryant 10 years ago committed by Lorenz Meier
parent
commit
f00c960882
  1. 53
      src/ui/uas/UASView.cc
  2. 29
      src/ui/uas/UASView.h

53
src/ui/uas/UASView.cc

@ -229,49 +229,6 @@ void UASView::mouseDoubleClickEvent (QMouseEvent * event) @@ -229,49 +229,6 @@ void UASView::mouseDoubleClickEvent (QMouseEvent * event)
{
Q_UNUSED(event);
UASManager::instance()->setActiveUAS(uas);
// qDebug() << __FILE__ << __LINE__ << "DOUBLECLICKED";
}
void UASView::enterEvent(QEvent* event)
{
if (event->type() == QEvent::MouseMove)
{
emit uasInFocus(uas);
if (uas != UASManager::instance()->getActiveUAS())
{
grabMouse(QCursor(Qt::PointingHandCursor));
}
}
if (event->type() == QEvent::MouseButtonDblClick)
{
// qDebug() << __FILE__ << __LINE__ << "UAS CLICKED!";
}
}
void UASView::leaveEvent(QEvent* event)
{
if (event->type() == QEvent::MouseMove)
{
emit uasOutFocus(uas);
releaseMouse();
}
}
void UASView::showEvent(QShowEvent* event)
{
// React only to internal (pre-display)
// events
Q_UNUSED(event);
refreshTimer->start(updateInterval*10);
}
void UASView::hideEvent(QHideEvent* event)
{
// React only to internal (pre-display)
// events
Q_UNUSED(event);
// refreshTimer->stop();
}
void UASView::receiveHeartbeat(UASInterface* uas)
@ -477,6 +434,10 @@ void UASView::updateLoad(UASInterface* uas, double load) @@ -477,6 +434,10 @@ void UASView::updateLoad(UASInterface* uas, double load)
}
}
/**
* Right-clicking on the view provides a custom menu for interacting
* with the UAS.
*/
void UASView::contextMenuEvent (QContextMenuEvent* event)
{
QMenu menu(this);
@ -713,11 +674,9 @@ void UASView::changeEvent(QEvent *e) @@ -713,11 +674,9 @@ void UASView::changeEvent(QEvent *e)
}
}
/**
* Implement paintEvent() so that stylesheets work for our custom widget.
*/
void UASView::paintEvent(QPaintEvent *)
void UASView::paintEvent(QPaintEvent *event)
{
Q_UNUSED(event);
QStyleOption opt;
opt.init(this);
QPainter p(this);

29
src/ui/uas/UASView.h

@ -134,26 +134,23 @@ protected: @@ -134,26 +134,23 @@ protected:
bool lowPowerModeEnabled; ///< Low power mode reduces update rates
unsigned int generalUpdateCount; ///< Skip counter for updates
double filterTime; ///< Filter time estimate of battery
void mouseDoubleClickEvent (QMouseEvent * event);
/** @brief Mouse enters the widget */
void enterEvent(QEvent* event);
/** @brief Mouse leaves the widget */
void leaveEvent(QEvent* event);
/** @brief Start widget updating */
void showEvent(QShowEvent* event);
/** @brief Stop widget updating */
void hideEvent(QHideEvent* event);
void contextMenuEvent(QContextMenuEvent* event);
/**
* If a user double-clicks on this view, set the active UAS to this one.
*/
void mouseDoubleClickEvent(QMouseEvent *event);
/**
* Right-clicking on the view provides a custom menu for interacting
* with the UAS.
*/
void contextMenuEvent(QContextMenuEvent *event);
private:
Ui::UASView *m_ui;
virtual void paintEvent(QPaintEvent *);
signals:
void uasInFocus(UASInterface* uas);
void uasOutFocus(UASInterface* uas);
/**
* Implement paintEvent() so that stylesheets work for our custom widget.
*/
virtual void paintEvent(QPaintEvent *event);
};
#endif // UASVIEW_H

Loading…
Cancel
Save