1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00

Merge remote-tracking branch 'origin/next' into thread/OP-770_UAV_Export_Version_Info_Fix

This commit is contained in:
Fredrik Arvidsson 2013-05-27 21:11:30 +02:00
commit cc14dac819

View File

@ -7,8 +7,8 @@
TelemetryMonitorWidget::TelemetryMonitorWidget(QWidget *parent) : QGraphicsView(parent)
{
setMinimumSize(180, 100);
setMaximumSize(180, 100);
setMinimumSize(180, 25); // From 100->25 to shorten the qwidget.
setMaximumSize(180, 25); // as above.
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@ -18,7 +18,7 @@ TelemetryMonitorWidget::TelemetryMonitorWidget(QWidget *parent) : QGraphicsView(
setAttribute(Qt::WA_TranslucentBackground);
setWindowFlags(Qt::FramelessWindowHint);
QGraphicsScene *scene = new QGraphicsScene(0, 0, 180, 100, this);
QGraphicsScene *scene = new QGraphicsScene(0, 0, 180, 25, this); // keeping the scene in line with the widget for testing.
QSvgRenderer *renderer = new QSvgRenderer();
if (renderer->load(QString(":/core/images/tx-rx.svg"))) {
@ -172,6 +172,5 @@ void TelemetryMonitorWidget::resizeEvent(QResizeEvent *event)
{
Q_UNUSED(event);
graph->setPos(0, -130);
fitInView(graph, Qt::KeepAspectRatio);
}