rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

OP-1222 Added support for gps and airspeedsensors in connection diagram.

Browse Source 
Optimized bounding rect handling. Got rid of need for background element.
This commit is contained in:
m_thread 2014-09-05 17:30:20 +02:00
parent cefffefd7b
commit 1d50f9e949
2 changed files with 62 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp
View File

@ -31,8 +31,10 @@
#include "connectiondiagram.h" #include "connectiondiagram.h"
#include "ui_connectiondiagram.h" #include "ui_connectiondiagram.h"
const char* ConnectionDiagram::FILE_NAME = ":/setupwizard/resources/connection-diagrams.svg";
ConnectionDiagram::ConnectionDiagram(QWidget *parent, VehicleConfigurationSource *configSource) : ConnectionDiagram::ConnectionDiagram(QWidget *parent, VehicleConfigurationSource *configSource) :
QDialog(parent), ui(new Ui::ConnectionDiagram), m_configSource(configSource), m_background(0) QDialog(parent), ui(new Ui::ConnectionDiagram), m_configSource(configSource)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowTitle(tr("Connection Diagram")); setWindowTitle(tr("Connection Diagram"));
@ -48,33 +50,24 @@ void ConnectionDiagram::resizeEvent(QResizeEvent *event)
{ {
QWidget::resizeEvent(event); QWidget::resizeEvent(event);
ui->connectionDiagram->fitInView(m_background, Qt::KeepAspectRatio); ui->connectionDiagram->fitInView(m_scene->itemsBoundingRect(), Qt::KeepAspectRatio);
} }
void ConnectionDiagram::showEvent(QShowEvent *event) void ConnectionDiagram::showEvent(QShowEvent *event)
{ {
QWidget::showEvent(event); QWidget::showEvent(event);
ui->connectionDiagram->fitInView(m_background, Qt::KeepAspectRatio); ui->connectionDiagram->fitInView(m_scene->itemsBoundingRect(), Qt::KeepAspectRatio);
} }
void ConnectionDiagram::setupGraphicsScene() void ConnectionDiagram::setupGraphicsScene()
{ {
m_renderer = new QSvgRenderer(); m_renderer = new QSvgRenderer();
if (QFile::exists(QString(":/setupwizard/resources/connection-diagrams.svg")) && if (QFile::exists(QString(FILE_NAME)) &&
m_renderer->load(QString(":/setupwizard/resources/connection-diagrams.svg")) && m_renderer->load(QString(FILE_NAME)) &&
m_renderer->isValid()) { m_renderer->isValid()) {
m_scene = new QGraphicsScene(this); m_scene = new QGraphicsScene(this);
ui->connectionDiagram->setScene(m_scene); ui->connectionDiagram->setScene(m_scene);
// ui->connectionDiagram->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
m_background = new QGraphicsSvgItem();
m_background->setSharedRenderer(m_renderer);
m_background->setElementId("background");
m_background->setOpacity(0);
// m_background->setFlags(QGraphicsItem::ItemClipsToShape);
m_background->setZValue(-1);
m_scene->addItem(m_background);
QList<QString> elementsToShow; QList<QString> elementsToShow;
@ -178,10 +171,62 @@ void ConnectionDiagram::setupGraphicsScene()
break; break;
} }
switch (m_configSource->getGpsType()) {
case VehicleConfigurationSource::GPS_DISABLED:
break;
case VehicleConfigurationSource::GPS_NMEA:
if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_NANO) {
elementsToShow << "nano-generic-nmea";
} else if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_REVO) {
elementsToShow << "generic-nmea";
}
break;
case VehicleConfigurationSource::GPS_PLATINUM:
if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_NANO) {
elementsToShow << "nano-OPGPS-v9";
} else if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_REVO) {
elementsToShow << "OPGPS-v9";
}
break;
case VehicleConfigurationSource::GPS_UBX:
if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_NANO) {
elementsToShow << "nano-OPGPS-v8-ublox";
} else if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_REVO) {
elementsToShow << "OPGPS-v8-ublox";
}
break;
default:
break;
}
if (m_configSource->getVehicleType() == VehicleConfigurationSource::VEHICLE_FIXEDWING &&
m_configSource->getAirspeedType() != VehicleConfigurationSource::AIRSPEED_ESTIMATE) {
switch (m_configSource->getAirspeedType()) {
case VehicleConfigurationSource::AIRSPEED_EAGLETREE:
if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_NANO) {
elementsToShow << "nano-eagletree-speed-sensor";
} else if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_REVO) {
elementsToShow << "eagletree-speed-sensor";
}
break;
case VehicleConfigurationSource::AIRSPEED_MS4525:
if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_NANO) {
elementsToShow << "nano-ms4525-speed-sensor";
} else if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_REVO) {
elementsToShow << "ms4525-speed-sensor";
}
break;
default:
break;
}
}
setupGraphicsSceneItems(elementsToShow); setupGraphicsSceneItems(elementsToShow);
ui->connectionDiagram->setSceneRect(m_background->boundingRect()); ui->connectionDiagram->setSceneRect(m_scene->itemsBoundingRect());
ui->connectionDiagram->fitInView(m_background, Qt::KeepAspectRatio); //ui->connectionDiagram->setSceneRect(m_background);
ui->connectionDiagram->fitInView(m_scene->itemsBoundingRect(), Qt::KeepAspectRatio);
//ui->connectionDiagram->fitInView(m_background, Qt::KeepAspectRatio);
qDebug() << "Scene complete"; qDebug() << "Scene complete";
} }
@ -191,8 +236,6 @@ void ConnectionDiagram::setupGraphicsSceneItems(QList<QString> elementsToShow)
{ {
qreal z = 0; qreal z = 0;
// QRectF backgBounds = m_renderer->boundsOnElement("background");
foreach(QString elementId, elementsToShow) { foreach(QString elementId, elementsToShow) {
if (m_renderer->elementExists(elementId)) { if (m_renderer->elementExists(elementId)) {
QGraphicsSvgItem *element = new QGraphicsSvgItem(); QGraphicsSvgItem *element = new QGraphicsSvgItem();
@ -204,10 +247,6 @@ void ConnectionDiagram::setupGraphicsSceneItems(QList<QString> elementsToShow)
QMatrix matrix = m_renderer->matrixForElement(elementId); QMatrix matrix = m_renderer->matrixForElement(elementId);
QRectF orig = matrix.mapRect(m_renderer->boundsOnElement(elementId)); QRectF orig = matrix.mapRect(m_renderer->boundsOnElement(elementId));
element->setPos(orig.x(), orig.y()); element->setPos(orig.x(), orig.y());
// QRectF orig = m_renderer->boundsOnElement(elementId);
// element->setPos(orig.x() - backgBounds.x(), orig.y() - backgBounds.y());
m_scene->addItem(element); m_scene->addItem(element);
qDebug() << "Adding " << elementId << " to scene at " << element->pos(); qDebug() << "Adding " << elementId << " to scene at " << element->pos();
} else { } else {

2
ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.h
View File

@ -48,11 +48,11 @@ public:
~ConnectionDiagram(); ~ConnectionDiagram();
private: private:
static const char *FILE_NAME;
Ui::ConnectionDiagram *ui; Ui::ConnectionDiagram *ui;
VehicleConfigurationSource *m_configSource; VehicleConfigurationSource *m_configSource;
QSvgRenderer *m_renderer; QSvgRenderer *m_renderer;
QGraphicsSvgItem *m_background;
QGraphicsScene *m_scene; QGraphicsScene *m_scene;
void setupGraphicsScene(); void setupGraphicsScene();