From 5c8e19b625bb0a11f63dd4c7666d1e06f763294c Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Tue, 9 Jun 2020 14:10:15 -0700 Subject: [PATCH] Remove missing support for QGCView fact missing overlays --- .../FactControls/FactPanelController.cc | 46 +------------------ .../FactControls/FactPanelController.h | 5 -- src/ui/MainRootWindow.qml | 8 ---- 3 files changed, 1 insertion(+), 58 deletions(-) diff --git a/src/FactSystem/FactControls/FactPanelController.cc b/src/FactSystem/FactControls/FactPanelController.cc index bb035de9da..e7243a40d2 100644 --- a/src/FactSystem/FactControls/FactPanelController.cc +++ b/src/FactSystem/FactControls/FactPanelController.cc @@ -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) { diff --git a/src/FactSystem/FactControls/FactPanelController.h b/src/FactSystem/FactControls/FactPanelController.h index aa8e3208d4..85c8fb05dd 100644 --- a/src/FactSystem/FactControls/FactPanelController.h +++ b/src/FactSystem/FactControls/FactPanelController.h @@ -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; }; diff --git a/src/ui/MainRootWindow.qml b/src/ui/MainRootWindow.qml index a394cab427..75f723b205 100644 --- a/src/ui/MainRootWindow.qml +++ b/src/ui/MainRootWindow.qml @@ -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 -- GitLab