diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index 9e37f9b9f509e52c7dacd60f1b87e0e3c5e97764..364c9d92632a32f5d2933483fa47a8aea2bc4686 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -679,8 +679,8 @@ void MainWindow::buildCommonWidgets() createDockWidget(engineeringView,new HUD(320,240,this),tr("Video Downlink"),"HEAD_UP_DISPLAY_DOCKWIDGET",VIEW_ENGINEER,Qt::RightDockWidgetArea); - createDockWidget(simView,new PrimaryFlightDisplay(320,240,this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",VIEW_SIMULATION,Qt::RightDockWidgetArea); - createDockWidget(pilotView,new PrimaryFlightDisplay(320,240,this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",VIEW_FLIGHT,Qt::LeftDockWidgetArea); + createDockWidget(simView,new PrimaryFlightDisplay(this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",VIEW_SIMULATION,Qt::RightDockWidgetArea); + createDockWidget(pilotView,new PrimaryFlightDisplay(this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",VIEW_FLIGHT,Qt::LeftDockWidgetArea); QGCTabbedInfoView *infoview = new QGCTabbedInfoView(this); infoview->addSource(mavlinkDecoder); @@ -852,7 +852,7 @@ void MainWindow::loadDockWidget(const QString& name) } else if (name == "PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET") { - createDockWidget(centerStack->currentWidget(),new PrimaryFlightDisplay(320,240,this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",currentView,Qt::RightDockWidgetArea); + createDockWidget(centerStack->currentWidget(),new PrimaryFlightDisplay(this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",currentView,Qt::RightDockWidgetArea); } else if (name == "HEAD_UP_DISPLAY_DOCKWIDGET") { diff --git a/src/ui/PrimaryFlightDisplay.cc b/src/ui/PrimaryFlightDisplay.cc index 9f6c43ac93b48e972be857d387109af1cb74a607..f5fd0d87b8139738e19ac4477c761d24008c4d9e 100644 --- a/src/ui/PrimaryFlightDisplay.cc +++ b/src/ui/PrimaryFlightDisplay.cc @@ -107,7 +107,7 @@ const QString PrimaryFlightDisplay::compassWindNames[] = { QString("NW") }; -PrimaryFlightDisplay::PrimaryFlightDisplay(int width, int height, QWidget *parent) : +PrimaryFlightDisplay::PrimaryFlightDisplay(QWidget *parent) : QWidget(parent), _valuesChanged(false), @@ -146,9 +146,6 @@ PrimaryFlightDisplay::PrimaryFlightDisplay(int width, int height, QWidget *paren font("Bitstream Vera Sans"), refreshTimer(new QTimer(this)) { - Q_UNUSED(width); - Q_UNUSED(height); - setMinimumSize(120, 80); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); diff --git a/src/ui/PrimaryFlightDisplay.h b/src/ui/PrimaryFlightDisplay.h index b4236e339a400cc994d7de0613d2025a3be7f16e..0be9bb2e5c3c7380db400bac6e84b43b7cb55834 100644 --- a/src/ui/PrimaryFlightDisplay.h +++ b/src/ui/PrimaryFlightDisplay.h @@ -9,7 +9,7 @@ class PrimaryFlightDisplay : public QWidget { Q_OBJECT public: - PrimaryFlightDisplay(int width = 640, int height = 480, QWidget* parent = NULL); + PrimaryFlightDisplay(QWidget* parent = NULL); ~PrimaryFlightDisplay(); public slots: