mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-03-15 07:29:15 +01:00
My bad, didn't remove old include file in my build directory
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1144 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
parent
bf7be8cbba
commit
7967dd8c84
@ -1,5 +1,5 @@
|
||||
<RCC>
|
||||
<qresource prefix="/gsccontrol">
|
||||
<qresource prefix="/gcscontrol">
|
||||
<file>images/joystickBackground.svg</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
@ -1,5 +1,4 @@
|
||||
#include "joystickcontrol.h"
|
||||
#include "ui_joystickcontrol.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include <QDebug>
|
||||
#include <QStringList>
|
||||
@ -9,6 +8,7 @@
|
||||
#include <QtGui/QPushButton>
|
||||
#include <QtGui/QMessageBox>
|
||||
#include <QMouseEvent>
|
||||
#include <QtGlobal>
|
||||
|
||||
JoystickControl::JoystickControl(QWidget *parent) :
|
||||
QGraphicsView(parent)
|
||||
@ -19,14 +19,15 @@ JoystickControl::JoystickControl(QWidget *parent) :
|
||||
setRenderHints(QPainter::Antialiasing);
|
||||
|
||||
m_renderer = new QSvgRenderer();
|
||||
m_renderer->load(QString(":/gcscontrol/images/joystickBackground.svg"));
|
||||
m_background = new QGraphicsSvgItem();
|
||||
Q_ASSERT( m_renderer->load(QString(":/gcscontrol/images/joystickBackground.svg")) );
|
||||
|
||||
m_background = new QGraphicsSvgItem(QString(":/gcscontrol/images/joystickBackground.svg"));
|
||||
m_background->setSharedRenderer(m_renderer);
|
||||
|
||||
QGraphicsScene *l_scene = scene();
|
||||
l_scene->clear(); // This also deletes all items contained in the scene.
|
||||
l_scene->addItem(m_background);
|
||||
|
||||
l_scene->setSceneRect(m_background->boundingRect());
|
||||
}
|
||||
|
||||
JoystickControl::~JoystickControl()
|
||||
@ -47,6 +48,7 @@ void JoystickControl::mousePressEvent(QMouseEvent *event)
|
||||
Qt::MouseButton button = event->button();
|
||||
QPoint point = event->pos();
|
||||
QSize widgetSize = this->size();
|
||||
|
||||
double x = 2 * ( ((double)point.x()) / ((double)widgetSize.width()) - .5 );
|
||||
double y = 2 * ( ((double)point.y()) / ((double)widgetSize.height()) - .5);
|
||||
|
||||
@ -81,7 +83,8 @@ void JoystickControl::paintEvent(QPaintEvent *event)
|
||||
qDebug()<<"Dial file not loaded, not rendering";
|
||||
// return;
|
||||
}
|
||||
QGraphicsView::paintEvent(event);
|
||||
|
||||
QGraphicsView::paintEvent(event);
|
||||
}
|
||||
|
||||
void JoystickControl::resizeEvent(QResizeEvent *event)
|
||||
|
Loading…
x
Reference in New Issue
Block a user