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
2fb34f4c
Unverified
Commit
2fb34f4c
authored
Jun 10, 2020
by
Don Gagne
Committed by
GitHub
Jun 10, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8823 from DonLakeFlyer/FactPanelController
Remove missing support for QGCView fact missing overlays
parents
81c63b35
5c8e19b6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
58 deletions
+1
-58
FactPanelController.cc
src/FactSystem/FactControls/FactPanelController.cc
+1
-45
FactPanelController.h
src/FactSystem/FactControls/FactPanelController.h
+0
-5
MainRootWindow.qml
src/ui/MainRootWindow.qml
+0
-8
No files found.
src/FactSystem/FactControls/FactPanelController.cc
View file @
2fb34f4c
...
...
@@ -35,30 +35,6 @@ FactPanelController::FactPanelController()
connect
(
&
_missingParametersTimer
,
&
QTimer
::
timeout
,
this
,
&
FactPanelController
::
_checkForMissingParameters
);
}
void
FactPanelController
::
_notifyPanelMissingParameter
(
const
QString
&
missingParam
)
{
if
(
qgcApp
()
->
mainRootWindow
())
{
QVariant
returnedValue
;
QMetaObject
::
invokeMethod
(
qgcApp
()
->
mainRootWindow
(),
"showMissingParameterOverlay"
,
Q_RETURN_ARG
(
QVariant
,
returnedValue
),
Q_ARG
(
QVariant
,
missingParam
));
}
}
void
FactPanelController
::
_notifyPanelErrorMsg
(
const
QString
&
errorMsg
)
{
if
(
qgcApp
()
->
mainRootWindow
())
{
QVariant
returnedValue
;
QMetaObject
::
invokeMethod
(
qgcApp
()
->
mainRootWindow
(),
"showFactError"
,
Q_RETURN_ARG
(
QVariant
,
returnedValue
),
Q_ARG
(
QVariant
,
errorMsg
));
}
}
void
FactPanelController
::
_reportMissingParameter
(
int
componentId
,
const
QString
&
name
)
{
if
(
componentId
==
FactSystem
::
defaultComponentId
)
{
...
...
@@ -66,20 +42,7 @@ void FactPanelController::_reportMissingParameter(int componentId, const QString
}
qgcApp
()
->
reportMissingParameter
(
componentId
,
name
);
QString
missingParam
=
QString
(
"%1:%2"
).
arg
(
componentId
).
arg
(
name
);
qCWarning
(
FactPanelControllerLog
)
<<
"Missing parameter:"
<<
missingParam
;
// If missing parameters a reported from the constructor of a derived class we
// will not have access to _factPanel yet. Just record list of missing facts
// in that case instead of notify. Once _factPanel is available they will be
// send out for real.
if
(
qgcApp
()
->
mainRootWindow
())
{
_notifyPanelMissingParameter
(
missingParam
);
}
else
{
_delayedMissingParams
+=
missingParam
;
}
qCWarning
(
FactPanelControllerLog
)
<<
"Missing parameter:"
<<
QString
(
"%1:%2"
).
arg
(
componentId
).
arg
(
name
);
}
bool
FactPanelController
::
_allParametersExists
(
int
componentId
,
QStringList
names
)
...
...
@@ -116,13 +79,6 @@ bool FactPanelController::parameterExists(int componentId, const QString& name)
return
_vehicle
?
_vehicle
->
parameterManager
()
->
parameterExists
(
componentId
,
name
)
:
false
;
}
void
FactPanelController
::
_showInternalError
(
const
QString
&
errorMsg
)
{
_notifyPanelErrorMsg
(
tr
(
"Internal Error: %1"
).
arg
(
errorMsg
));
qCWarning
(
FactPanelControllerLog
)
<<
"Internal Error"
<<
errorMsg
;
qgcApp
()
->
showAppMessage
(
errorMsg
);
}
void
FactPanelController
::
getMissingParameters
(
QStringList
rgNames
)
{
for
(
const
QString
&
name
:
rgNames
)
{
...
...
src/FactSystem/FactControls/FactPanelController.h
View file @
2fb34f4c
...
...
@@ -57,11 +57,6 @@ private slots:
void
_checkForMissingParameters
(
void
);
private:
void
_notifyPanelMissingParameter
(
const
QString
&
missingParam
);
void
_notifyPanelErrorMsg
(
const
QString
&
errorMsg
);
void
_showInternalError
(
const
QString
&
errorMsg
);
QStringList
_delayedMissingParams
;
QStringList
_missingParameterWaitList
;
QTimer
_missingParametersTimer
;
};
src/ui/MainRootWindow.qml
View file @
2fb34f4c
...
...
@@ -532,14 +532,6 @@ ApplicationWindow {
}
}
function
showMissingParameterOverlay
(
missingParamName
)
{
showError
(
qsTr
(
"
Parameters missing: %1
"
).
arg
(
missingParamName
))
}
function
showFactError
(
errorMsg
)
{
showError
(
qsTr
(
"
Fact error: %1
"
).
arg
(
errorMsg
))
}
Popup
{
id
:
systemMessageArea
y
:
ScreenTools
.
defaultFontPixelHeight
...
...
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