Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
4d2596ef
Commit
4d2596ef
authored
Jun 11, 2014
by
Bryant Mairs
Browse files
Removed unused width/height from Primary Flight Display constructor.
parent
b0cb4bce
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/ui/MainWindow.cc
View file @
4d2596ef
...
...
@@ -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"
)
{
...
...
src/ui/PrimaryFlightDisplay.cc
View file @
4d2596ef
...
...
@@ -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
);
...
...
src/ui/PrimaryFlightDisplay.h
View file @
4d2596ef
...
...
@@ -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
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment