Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
92a4eef8
Commit
92a4eef8
authored
Oct 19, 2016
by
Don Gagne
Committed by
GitHub
Oct 19, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4144 from DonLakeFlyer/OnboardFilesRemove
Temp removal of Onboard Files
parents
1f20c604
ac73682a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
UnitTestList.cc
src/qgcunittest/UnitTestList.cc
+3
-1
MainWindow.cc
src/ui/MainWindow.cc
+11
-1
No files found.
src/qgcunittest/UnitTestList.cc
View file @
92a4eef8
...
...
@@ -47,7 +47,6 @@ UT_REGISTER_TEST(MissionControllerTest)
UT_REGISTER_TEST
(
MissionManagerTest
)
UT_REGISTER_TEST
(
RadioConfigTest
)
UT_REGISTER_TEST
(
TCPLinkTest
)
UT_REGISTER_TEST
(
FileManagerTest
)
UT_REGISTER_TEST
(
ParameterManagerTest
)
UT_REGISTER_TEST
(
MissionCommandTreeTest
)
UT_REGISTER_TEST
(
LogDownloadTest
)
...
...
@@ -58,3 +57,6 @@ UT_REGISTER_TEST(LogDownloadTest)
// FIXME: Temporarily disabled until this can be stabilized
//UT_REGISTER_TEST(MainWindowTest)
// Onboard file support has been removed until it can be make to work correctly
//UT_REGISTER_TEST(FileManagerTest)
src/ui/MainWindow.cc
View file @
92a4eef8
...
...
@@ -301,12 +301,17 @@ void MainWindow::_buildCommonWidgets(void)
logPlayer
=
new
QGCMAVLinkLogPlayer
(
statusBar
());
statusBar
()
->
addPermanentWidget
(
logPlayer
);
// Populate widget menu
for
(
int
i
=
0
,
end
=
ARRAY_SIZE
(
rgDockWidgetNames
);
i
<
end
;
i
++
)
{
if
(
i
==
ONBOARD_FILES
)
{
// Temporarily removed until twe can fix all the problems with it
continue
;
}
const
char
*
pDockWidgetName
=
rgDockWidgetNames
[
i
];
// Add to menu
QAction
*
action
=
new
QAction
(
tr
(
pDockWidgetName
)
,
this
);
QAction
*
action
=
new
QAction
(
pDockWidgetName
,
this
);
action
->
setCheckable
(
true
);
action
->
setData
(
i
);
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
_showDockWidgetAction
);
...
...
@@ -318,6 +323,11 @@ void MainWindow::_buildCommonWidgets(void)
/// Shows or hides the specified dock widget, creating if necessary
void
MainWindow
::
_showDockWidget
(
const
QString
&
name
,
bool
show
)
{
if
(
name
==
rgDockWidgetNames
[
ONBOARD_FILES
])
{
// Temporarily disabled due to bugs
return
;
}
// Create the inner widget if we need to
if
(
!
_mapName2DockWidget
.
contains
(
name
))
{
if
(
!
_createInnerDockWidget
(
name
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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