Commit 4d2596ef authored by Bryant Mairs's avatar Bryant Mairs

Removed unused width/height from Primary Flight Display constructor.

parent b0cb4bce
...@@ -679,8 +679,8 @@ void MainWindow::buildCommonWidgets() ...@@ -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(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(simView,new PrimaryFlightDisplay(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(pilotView,new PrimaryFlightDisplay(this),tr("Primary Flight Display"),"PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET",VIEW_FLIGHT,Qt::LeftDockWidgetArea);
QGCTabbedInfoView *infoview = new QGCTabbedInfoView(this); QGCTabbedInfoView *infoview = new QGCTabbedInfoView(this);
infoview->addSource(mavlinkDecoder); infoview->addSource(mavlinkDecoder);
...@@ -852,7 +852,7 @@ void MainWindow::loadDockWidget(const QString& name) ...@@ -852,7 +852,7 @@ void MainWindow::loadDockWidget(const QString& name)
} }
else if (name == "PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET") 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") else if (name == "HEAD_UP_DISPLAY_DOCKWIDGET")
{ {
......
...@@ -107,7 +107,7 @@ const QString PrimaryFlightDisplay::compassWindNames[] = { ...@@ -107,7 +107,7 @@ const QString PrimaryFlightDisplay::compassWindNames[] = {
QString("NW") QString("NW")
}; };
PrimaryFlightDisplay::PrimaryFlightDisplay(int width, int height, QWidget *parent) : PrimaryFlightDisplay::PrimaryFlightDisplay(QWidget *parent) :
QWidget(parent), QWidget(parent),
_valuesChanged(false), _valuesChanged(false),
...@@ -146,9 +146,6 @@ PrimaryFlightDisplay::PrimaryFlightDisplay(int width, int height, QWidget *paren ...@@ -146,9 +146,6 @@ PrimaryFlightDisplay::PrimaryFlightDisplay(int width, int height, QWidget *paren
font("Bitstream Vera Sans"), font("Bitstream Vera Sans"),
refreshTimer(new QTimer(this)) refreshTimer(new QTimer(this))
{ {
Q_UNUSED(width);
Q_UNUSED(height);
setMinimumSize(120, 80); setMinimumSize(120, 80);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
......
...@@ -9,7 +9,7 @@ class PrimaryFlightDisplay : public QWidget ...@@ -9,7 +9,7 @@ class PrimaryFlightDisplay : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
PrimaryFlightDisplay(int width = 640, int height = 480, QWidget* parent = NULL); PrimaryFlightDisplay(QWidget* parent = NULL);
~PrimaryFlightDisplay(); ~PrimaryFlightDisplay();
public slots: public slots:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment