rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00
Code Issues Releases Activity

OP-963 TelemetryMonitorWidget added some doc + polishing

Browse Source
This commit is contained in:
Philippe Renon 2013-06-14 00:15:03 +02:00
parent 7486263262
commit 9a93d88388
4 changed files with 54 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ground/openpilotgcs/src/plugins/telemetry/images/tx-rx.svg
View File

@ -106,7 +106,7 @@
x="13"
y="35">Tx</tspan></text>
<rect
id="bg_tx0"
id="tx_bg0"
ry="13"
y="10"
x="72"
@ -114,7 +114,7 @@
height="25"
style="fill:#4d4d4d;stroke:none" />
<rect
id="bg_tx1"
id="tx_bg1"
ry="13"
y="10"
x="132"
@ -122,7 +122,7 @@
height="25"
style="fill:#4d4d4d;stroke:none" />
<rect
id="bg_tx2"
id="tx_bg2"
ry="13"
y="10"
x="192"
@ -130,7 +130,7 @@
height="25"
style="fill:#4d4d4d;stroke:none" />
<rect
id="bg_tx3"
id="tx_bg3"
ry="13"
y="10"
x="252"
@ -138,7 +138,7 @@
height="25"
style="fill:#4d4d4d;stroke:none" />
<rect
id="bg_tx4"
id="tx_bg4"
ry="13"
y="10"
x="312"
@ -146,7 +146,7 @@
height="25"
style="fill:#4d4d4d;stroke:none" />
<rect
id="bg_tx5"
id="tx_bg5"
ry="13"
y="10"
x="372"
@ -154,7 +154,7 @@
height="25"
style="fill:#4d4d4d;stroke:none" />
<rect
id="bg_tx6"
id="tx_bg6"
ry="13"
y="10"
x="432"
@ -174,7 +174,7 @@
id="tspan3046"
sodipodi:role="line">Rx</tspan></text>
<rect
id="bg_rx0"
id="rx_bg0"
ry="13"
y="46"
x="72"
@ -182,7 +182,7 @@
height="25"
style="fill:#4d4d4d;stroke:none" />
<rect
id="bg_rx1"
id="rx_bg1"
ry="13"
y="46"
x="132"
@ -190,7 +190,7 @@
height="25"
style="fill:#4d4d4d;stroke:none" />
<rect
id="bg_rx2"
id="rx_bg2"
ry="13"
y="46"
x="192"
@ -198,7 +198,7 @@
height="25"
style="fill:#4d4d4d;stroke:none" />
<rect
id="bg_rx3"
id="rx_bg3"
ry="13"
y="46"
x="252"
@ -206,7 +206,7 @@
height="25"
style="fill:#4d4d4d;stroke:none" />
<rect
id="bg_rx4"
id="rx_bg4"
ry="13"
y="46"
x="312"
@ -214,7 +214,7 @@
height="25"
style="fill:#4d4d4d;stroke:none" />
<rect
id="bg_rx5"
id="rx_bg5"
ry="13"
y="46"
x="372"
@ -222,7 +222,7 @@
height="25"
style="fill:#4d4d4d;stroke:none" />
<rect
id="bg_rx6"
id="rx_bg6"
ry="13"
y="46"
x="432"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

2
ground/openpilotgcs/src/plugins/telemetry/monitorgadget.cpp
View File

@ -47,7 +47,7 @@ MonitorGadget::~MonitorGadget()
*/
void MonitorGadget::loadConfiguration(IUAVGadgetConfiguration *config)
{
MonitorGadgetConfiguration *m = qobject_cast<MonitorGadgetConfiguration *>(config);
//MonitorGadgetConfiguration *m = qobject_cast<MonitorGadgetConfiguration *>(config);
//m_widget->setSystemFile(m->getSystemFile()); // Triggers widget repaint
}

59
ground/openpilotgcs/src/plugins/telemetry/monitorwidget.cpp
View File

@ -33,20 +33,29 @@ namespace {
return item;
}
// TODO elementId must be a rectangle and not a text element...
/**
* Create a text item based on a svg rectangle.
* The rectangle must be in the correct location (hint: use a "text" layer on top of the "background layer")
* The font size will be set to match as well as possible the rectangle height but it is not guaranteed.
*
* It is possible to show the text rectangle to help understand layout issues.
*
*/
// TODO move to some utility class that can be reused by other SVG manipulating code
QGraphicsTextItem *createTextItem(QGraphicsSvgItem *parent, QString elementId, QString fontName)
QGraphicsTextItem *createTextItem(QGraphicsSvgItem *parent, QString elementId, QString fontName,
bool showRect = false)
{
#ifdef DEBUG_TEXT
// create and display the text rectangle
createSvgItem(parent, elementId);
#endif
if (showRect) {
// create and display the text rectangle
// needs to be done first otherwise the rectangle will blank out the text.
createSvgItem(parent, elementId);
}
QGraphicsTextItem *item = new QGraphicsTextItem();
QSvgRenderer *renderer = parent->renderer();
// move new text item to location of target element
// move new text item to location of rectangle element
QMatrix elementMatrix = renderer->matrixForElement(elementId);
QRectF elementRect = elementMatrix.mapRect(renderer->boundsOnElement(elementId));
@ -57,26 +66,32 @@ namespace {
item->setParentItem(parent);
item->setTransform(matrix, false);
// to right align or center text we must provide a text width
//item->setTextWidth(elementRect.width());
// create font to match the rectangle height
// there is not guaranteed that all fonts will play well...
QFont font(fontName);
//font.setStyleHint(QFont::TypeWriter);
// not sure if PreferMatch helps to get the correct font size (i.e. that fits the text rectangle nicely)
font.setStyleStrategy(QFont::PreferMatch);
font.setPointSizeF(fontPointSizeF);
item->setFont(font);
// qDebug() << "Font point size: " << fontPointSizeF;
// qDebug() << "Font pixel size: " << font.pixelSize();
// qDebug() << "Font point size: " << font.pointSize();
// qDebug() << "Font point size F: " << font.pointSizeF();
// qDebug() << "Font exact match: " << font.exactMatch();
#ifdef DEBUG_FONT
// just in case
qDebug() << "Font point size: " << fontPointSizeF;
qDebug() << "Font pixel size: " << font.pixelSize();
qDebug() << "Font point size: " << font.pointSize();
qDebug() << "Font point size F: " << font.pointSizeF();
qDebug() << "Font exact match: " << font.exactMatch();
// QFontInfo fontInfo(font);
// qDebug() << "Font info pixel size: " << fontInfo.pixelSize();
// qDebug() << "Font info point size: " << fontInfo.pointSize();
// qDebug() << "Font info point size F: " << fontInfo.pointSizeF();
// qDebug() << "Font info exact match: " << fontInfo.exactMatch();
QFontInfo fontInfo(font);
qDebug() << "Font info pixel size: " << fontInfo.pixelSize();
qDebug() << "Font info point size: " << fontInfo.pointSize();
qDebug() << "Font info point size F: " << fontInfo.pointSizeF();
qDebug() << "Font info exact match: " << fontInfo.exactMatch();
#endif
return item;
}
@ -85,7 +100,7 @@ namespace {
MonitorWidget::MonitorWidget(QWidget *parent) :
QGraphicsView(parent), aspectRatioMode(Qt::KeepAspectRatio)
{
// setMinimumWidth(180);
//setMinimumWidth(180);
QGraphicsScene *scene = new QGraphicsScene();
setScene(scene);
@ -107,6 +122,7 @@ MonitorWidget::MonitorWidget(QWidget *parent) :
graph = new QGraphicsSvgItem();
graph->setSharedRenderer(renderer);
graph->setElementId("background");
graph->setFlags(QGraphicsItem::ItemClipsChildrenToShape | QGraphicsItem::ItemClipsToShape);
scene->addItem(graph);
@ -117,7 +133,7 @@ MonitorWidget::MonitorWidget(QWidget *parent) :
i = 0;
while (true) {
QString id = QString("tx%0").arg(i);
QString bgId = QString("bg_tx%0").arg(i);
QString bgId = QString("tx_bg%0").arg(i);
if (!renderer->elementExists(id) || !renderer->elementExists(bgId)) {
break;
}
@ -131,7 +147,7 @@ MonitorWidget::MonitorWidget(QWidget *parent) :
i = 0;
while (true) {
QString id = QString("rx%0").arg(i);
QString bgId = QString("bg_rx%0").arg(i);
QString bgId = QString("rx_bg%0").arg(i);
if (!renderer->elementExists(id) || !renderer->elementExists(bgId)) {
break;
}
@ -240,7 +256,6 @@ void MonitorWidget::telemetryUpdated(double txRate, double rxRate)
node->setVisible(visible);
node->update();
}
//node->setOpacity(0.25);
}
for (int i = 0; i < rxNodes.count(); i++) {

4
ground/openpilotgcs/src/plugins/telemetry/monitorwidget.h
View File

@ -49,8 +49,6 @@ private:
double minValue;
double maxValue;
Qt::AspectRatioMode aspectRatioMode;
QGraphicsSvgItem *graph;
QPointer<QGraphicsTextItem> txSpeed;
@ -58,6 +56,8 @@ private:
QList<QGraphicsSvgItem*> txNodes;
QList<QGraphicsSvgItem*> rxNodes;
Qt::AspectRatioMode aspectRatioMode;
};
#endif // MONITORWIDGET_H