From 1690e500e95f77fd8816bc599a24040565100439 Mon Sep 17 00:00:00 2001 From: edouard Date: Sun, 5 Sep 2010 20:23:25 +0000 Subject: [PATCH] OP-52 Ground/GPS Gadget : make it resizable, within reasonable limits. Should behave much better now on smaller screens. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1540 ebee16cc-31ac-478f-84a7-5cbb03baadba --- .../gpsdisplay/gpsconstellationwidget.cpp | 5 + .../gpsdisplay/gpsconstellationwidget.h | 1 + .../plugins/gpsdisplay/gpsdisplaygadget.cpp | 1 + .../plugins/gpsdisplay/gpsdisplaywidget.cpp | 2 +- .../plugins/gpsdisplay/gpsdisplaywidget.ui | 1040 ++++++++--------- ground/src/plugins/gpsdisplay/nmeaparser.cpp | 2 +- 6 files changed, 511 insertions(+), 540 deletions(-) diff --git a/ground/src/plugins/gpsdisplay/gpsconstellationwidget.cpp b/ground/src/plugins/gpsdisplay/gpsconstellationwidget.cpp index 64043a2c4..39d8b500f 100644 --- a/ground/src/plugins/gpsdisplay/gpsconstellationwidget.cpp +++ b/ground/src/plugins/gpsdisplay/gpsconstellationwidget.cpp @@ -93,6 +93,11 @@ void GpsConstellationWidget::showEvent(QShowEvent *event) } +void GpsConstellationWidget::resizeEvent(QResizeEvent* event) +{ + Q_UNUSED(event); + fitInView(world, Qt::KeepAspectRatio); +} void GpsConstellationWidget::updateSat(int index, int prn, int elevation, int azimuth, int snr) { diff --git a/ground/src/plugins/gpsdisplay/gpsconstellationwidget.h b/ground/src/plugins/gpsdisplay/gpsconstellationwidget.h index f0f2709b3..cc0aee13d 100644 --- a/ground/src/plugins/gpsdisplay/gpsconstellationwidget.h +++ b/ground/src/plugins/gpsdisplay/gpsconstellationwidget.h @@ -56,6 +56,7 @@ private: protected: void showEvent(QShowEvent *event); + void resizeEvent(QResizeEvent *event); }; diff --git a/ground/src/plugins/gpsdisplay/gpsdisplaygadget.cpp b/ground/src/plugins/gpsdisplay/gpsdisplaygadget.cpp index 6305f03a5..efca7b718 100644 --- a/ground/src/plugins/gpsdisplay/gpsdisplaygadget.cpp +++ b/ground/src/plugins/gpsdisplay/gpsdisplaygadget.cpp @@ -94,6 +94,7 @@ void GpsDisplayGadget::loadConfiguration(IUAVGadgetConfiguration* config) parser = new TelemetryParser(); m_widget->connectButton->setEnabled(false); m_widget->disconnectButton->setEnabled(false); + m_widget->dataStreamGroupBox->hide(); } else if (gpsDisplayConfig->connectionMode() == "Network") { // Not implemented for now... m_widget->connectButton->setEnabled(false); diff --git a/ground/src/plugins/gpsdisplay/gpsdisplaywidget.cpp b/ground/src/plugins/gpsdisplay/gpsdisplaywidget.cpp index 6bee0e2a7..5c07cf011 100644 --- a/ground/src/plugins/gpsdisplay/gpsdisplaywidget.cpp +++ b/ground/src/plugins/gpsdisplay/gpsdisplaywidget.cpp @@ -94,7 +94,7 @@ void GpsDisplayWidget::dumpPacket(char *packet) void GpsDisplayWidget::setSVs(int sv) { - QString temp = "Sats: "; + QString temp; temp.append(QString::number(sv)); status_value->setText(temp); status_value->adjustSize(); diff --git a/ground/src/plugins/gpsdisplay/gpsdisplaywidget.ui b/ground/src/plugins/gpsdisplay/gpsdisplaywidget.ui index c3a84f5cf..d0ca2cdba 100644 --- a/ground/src/plugins/gpsdisplay/gpsdisplaywidget.ui +++ b/ground/src/plugins/gpsdisplay/gpsdisplaywidget.ui @@ -6,550 +6,514 @@ 0 0 - 592 - 417 + 533 + 424 - - - 0 - 0 - - - - - 500 - 300 - - Form - - - - 10 - 270 - 571 - 138 - - - - - 0 - 0 - - - - - 0 - 0 - - - - GPS Data Stream - - - - 0 - - - - - - 0 - 0 - + + + + + + + + 0 + 0 + + + + + 300 + 120 + + + + + 400 + 200 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + + + 0 + 0 + + + + Coord: + + + + + + + + 0 + 0 + + + + + 50 + false + + + + Unknown + + + + + + + + 0 + 0 + + + + + 50 + false + + + + Unknown + + + + + + + + 0 + 0 + + + + + 50 + false + + + + Unknown + + + + + + + + + + + + 0 + 0 + + + + Speed: + + + + + + + + 0 + 0 + + + + + 50 + false + + + + Unknown + + + + + + + + 0 + 0 + + + + Heading: + + + + + + + + 0 + 0 + + + + + 50 + false + + + + Unknown + + + + + + + + + Qt::Horizontal + + + + + + + + + + 0 + 0 + + + + H / V / P DOP: + + + + + + + + 0 + 0 + + + + + 50 + false + + + + 0 / 0 / 0 + + + + + + + + + Qt::Horizontal + + + + + + + + + + 0 + 0 + + + + Sats Used: + + + + + + + + 0 + 0 + + + + + 50 + false + + + + Unknown + + + + + + + + + + + Fix Type: + + + + + + + + 0 + 0 + + + + + 50 + false + + + + Unknown + + + + + + + + + + 50 + false + + + + Unknown + + + + + + + + + + + + + + + 0 + 0 + + + + + 64 + 64 + + + + + 250 + 250 + + + + + 10 + 10 + + + + + 120 + 120 + + + + + + + + + + + + + 0 + 0 + + + + + 60 + 60 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + Connect + + + + + + + Disconnect + + + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 191 + 95 + + + + + 191 + 95 + + + + false + + + + + + Qt::ScrollBarAlwaysOff + + + Qt::ScrollBarAlwaysOff + + + QGraphicsView::DontAdjustForAntialiasing + + + + + + + + 0 + 0 + + + + + 250 + 95 + + + + + + + + + + + 0 + 0 + + + + + 0 + 100 + + + + + 16777215 + 250 + + + + GPS Data Stream + + + + 0 - - - Courier New - 8 - - - - Qt::ScrollBarAlwaysOn - - - QTextEdit::WidgetWidth - - - false - - - - - - - - - 200 - 170 - 191 - 95 - - - - - 0 - 0 - - - - - 191 - 95 - - - - - 191 - 95 - - - - false - - - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - QGraphicsView::DontAdjustForAntialiasing - - - - - - 400 - 200 - 181 - 71 - - - - - - - 10 - 170 - 171 - 91 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - 10 - 10 - 85 - 27 - - - - Connect - - - - - - 10 - 50 - 91 - 27 - - - - Disconnect - - - - - - - 10 - 10 - 381 - 151 - - - - - 0 - 0 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - 10 - 10 - 57 - 16 - - - - Coord: - - - - - - 60 - 10 - 91 - 16 - - - - - 50 - false - - - - Unknown - - - - - - 10 - 30 - 51 - 16 - - - - Speed: - - - - - - 60 - 30 - 71 - 16 - - - - - 50 - false - - - - Unknown - - - - - - 210 - 30 - 71 - 16 - - - - Heading: - - - - - - 280 - 30 - 91 - 16 - - - - - 50 - false - - - - Unknown - - - - - - 10 - 50 - 361 - 20 - - - - Qt::Horizontal - - - - - - 10 - 120 - 57 - 17 - - - - Fix Type: - - - - - - 80 - 120 - 91 - 17 - - - - - 50 - false - - - - Unknown - - - - - - 180 - 100 - 191 - 21 - - - - - 50 - false - - - - Unknown - - - - - - 80 - 100 - 91 - 17 - - - - - 50 - false - - - - Unknown - - - - - - 10 - 70 - 101 - 17 - - - - H / V / P DOP: - - - - - - 130 - 70 - 231 - 17 - - - - - 50 - false - - - - 0 / 0 / 0 - - - - - - 10 - 80 - 361 - 20 - - - - Qt::Horizontal - - - - - - 190 - 30 - 20 - 21 - - - - Qt::Vertical - - - - - - 160 - 100 - 20 - 41 - - - - Qt::Vertical - - - - - - 270 - 10 - 20 - 21 - - - - Qt::Vertical - - - - - - 150 - 10 - 20 - 21 - - - - Qt::Vertical - - - - - - 170 - 10 - 101 - 16 - - - - - 50 - false - - - - Unknown - - - - - - 290 - 10 - 81 - 16 - - - - - 50 - false - - - - Unknown - - - - - - 10 - 100 - 71 - 17 - - - - Sats Used: - - - - - - - 400 - 10 - 181 - 181 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - 3 - 3 - 175 - 175 - - - - + + + + + 0 + 0 + + + + + Courier New + 8 + + + + Qt::ScrollBarAlwaysOn + + + QTextEdit::WidgetWidth + + + false + + + + + + + diff --git a/ground/src/plugins/gpsdisplay/nmeaparser.cpp b/ground/src/plugins/gpsdisplay/nmeaparser.cpp index fc8304688..0cfe169d9 100644 --- a/ground/src/plugins/gpsdisplay/nmeaparser.cpp +++ b/ground/src/plugins/gpsdisplay/nmeaparser.cpp @@ -50,7 +50,7 @@ // Debugging //#define GPSDEBUG -#define NMEA_DEBUG_PKT ///< define to enable debug of all NMEA messages +//#define NMEA_DEBUG_PKT ///< define to enable debug of all NMEA messages #ifdef GPSDEBUG #define NMEA_DEBUG_PKT ///< define to enable debug of all NMEA messages