rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-03 11:24:10 +01:00
Code Issues Releases Activity

Merge branch 'master' of ssh://git.openpilot.org/OpenPilot

Browse Source
This commit is contained in:
David Ankers 2012-01-29 04:31:42 +11:00
commit e307ab4d74
4 changed files with 2857 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/openpilotgcs/src/plugins/config/configgadget.qrc
View File

@ -17,5 +17,6 @@
<file>images/gyroscope.png</file> <file>images/gyroscope.png</file>
<file>images/TX.svg</file> <file>images/TX.svg</file>
<file>images/camera.png</file> <file>images/camera.png</file>
<file>images/TX2.svg</file>
</qresource> </qresource>
</RCC> </RCC>

6
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
View File

@ -41,8 +41,8 @@
#include <utils/stylehelper.h> #include <utils/stylehelper.h>
#include <QMessageBox> #include <QMessageBox>
#define ACCESS_MIN_MOVE -6 #define ACCESS_MIN_MOVE -3
#define ACCESS_MAX_MOVE 6 #define ACCESS_MAX_MOVE 3
#define STICK_MIN_MOVE -8 #define STICK_MIN_MOVE -8
#define STICK_MAX_MOVE 8 #define STICK_MAX_MOVE 8
@ -108,7 +108,7 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) : ConfigTaskWidget(parent)
m_renderer = new QSvgRenderer(); m_renderer = new QSvgRenderer();
QGraphicsScene *l_scene = m_config->graphicsView->scene(); QGraphicsScene *l_scene = m_config->graphicsView->scene();
m_config->graphicsView->setBackgroundBrush(QBrush(Utils::StyleHelper::baseColor())); m_config->graphicsView->setBackgroundBrush(QBrush(Utils::StyleHelper::baseColor()));
if (QFile::exists(":/configgadget/images/TX.svg") && m_renderer->load(QString(":/configgadget/images/TX.svg")) && m_renderer->isValid()) if (QFile::exists(":/configgadget/images/TX2.svg") && m_renderer->load(QString(":/configgadget/images/TX2.svg")) && m_renderer->isValid())
{ {
l_scene->clear(); // Deletes all items contained in the scene as well. l_scene->clear(); // Deletes all items contained in the scene as well.

2852
ground/openpilotgcs/src/plugins/config/images/TX2.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 425 KiB

2
ground/openpilotgcs/src/plugins/gcscontrol/joystickcontrol.cpp
View File

@ -149,7 +149,7 @@ void JoystickControl::paintEvent(QPaintEvent *event)
void JoystickControl::resizeEvent(QResizeEvent *event) void JoystickControl::resizeEvent(QResizeEvent *event)
{ {
Q_UNUSED(event); Q_UNUSED(event);
fitInView(m_background, Qt::IgnoreAspectRatio ); fitInView(m_background, Qt::KeepAspectRatio);
} }
/** /**