From 021de43e7157997f996f2570fa554b04f792b8ea Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Tue, 26 Mar 2024 16:33:10 +0100 Subject: [PATCH] refactor: Remove "connected" LED from COM panel The LED is a leftover from the pre-AFV voicerooms. The LED does not light up when connected to UNICOM or CTAF frequencies which still can be used to transmit & receive voice. This also removes the functionality that the currently tuned station was displayed when hovering over the "COMx" label. This feature was not documented and not known by many users. By removing these features, one context method is no longer required, which further decouples the network context from the OwnAircraft context. --- src/blackcore/context/contextnetwork.h | 3 -- src/blackcore/context/contextnetworkempty.h | 8 ------ src/blackcore/context/contextnetworkimpl.cpp | 12 -------- src/blackcore/context/contextnetworkimpl.h | 3 -- src/blackcore/context/contextnetworkproxy.cpp | 5 ---- src/blackcore/context/contextnetworkproxy.h | 3 -- .../components/cockpitcomcomponent.cpp | 10 ------- src/blackgui/editors/cockpitcomform.cpp | 28 ------------------- src/blackgui/editors/cockpitcomform.h | 3 -- src/blackgui/editors/cockpitcomform.ui | 6 ---- 10 files changed, 81 deletions(-) diff --git a/src/blackcore/context/contextnetwork.h b/src/blackcore/context/contextnetwork.h index 80b3baeea..f21ff61dd 100644 --- a/src/blackcore/context/contextnetwork.h +++ b/src/blackcore/context/contextnetwork.h @@ -263,9 +263,6 @@ namespace BlackCore::Context //! Load flight plan (from network) virtual BlackMisc::Aviation::CFlightPlan loadFlightPlanFromNetwork(const BlackMisc::Aviation::CCallsign &callsign) const = 0; - //! Use the selected COM1/2 frequencies, and get the corresponding ATC stations for it - virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const = 0; - //! Request data updates (pilot's frequencies, ATIS, ..) virtual void requestAircraftDataUpdates() = 0; diff --git a/src/blackcore/context/contextnetworkempty.h b/src/blackcore/context/contextnetworkempty.h index 29fb58bc1..95c096fde 100644 --- a/src/blackcore/context/contextnetworkempty.h +++ b/src/blackcore/context/contextnetworkempty.h @@ -187,14 +187,6 @@ namespace BlackCore::Context return {}; } - //! \copydoc IContextNetwork::getSelectedAtcStations - virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const override - { - logEmptyContextWarning(Q_FUNC_INFO); - // normally 2 entries - return BlackMisc::Aviation::CAtcStationList({ BlackMisc::Aviation::CAtcStation(), BlackMisc::Aviation::CAtcStation() }); - } - //! \copydoc IContextNetwork::getUsers() virtual BlackMisc::Network::CUserList getUsers() const override { diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index 910b7b020..938f4c5fa 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -1331,18 +1331,6 @@ namespace BlackCore::Context return sApp->getWebDataServices()->getMetarForAirport(airportIcaoCode); } - CAtcStationList CContextNetwork::getSelectedAtcStations() const - { - if (this->isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } - CAtcStation com1Station = m_airspace->getAtcStationForComUnit(this->ownAircraft().getCom1System()); - CAtcStation com2Station = m_airspace->getAtcStationForComUnit(this->ownAircraft().getCom2System()); - - CAtcStationList selectedStations; - selectedStations.push_back(com1Station); - selectedStations.push_back(com2Station); - return selectedStations; - } - QMetaObject::Connection CContextNetwork::connectRawFsdMessageSignal(QObject *receiver, RawFsdMessageReceivedSlot rawFsdMessageReceivedSlot) { Q_ASSERT_X(receiver, Q_FUNC_INFO, "Missing receiver"); diff --git a/src/blackcore/context/contextnetworkimpl.h b/src/blackcore/context/contextnetworkimpl.h index 0fec0d1cd..71cc295fa 100644 --- a/src/blackcore/context/contextnetworkimpl.h +++ b/src/blackcore/context/contextnetworkimpl.h @@ -350,9 +350,6 @@ namespace BlackCore //! \copydoc BlackCore::Context::IContextNetwork::getMetarForAirport BlackMisc::Weather::CMetar getMetarForAirport(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getSelectedAtcStations - virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getUsers virtual BlackMisc::Network::CUserList getUsers() const override; diff --git a/src/blackcore/context/contextnetworkproxy.cpp b/src/blackcore/context/contextnetworkproxy.cpp index 8f6126d57..4e3b44075 100644 --- a/src/blackcore/context/contextnetworkproxy.cpp +++ b/src/blackcore/context/contextnetworkproxy.cpp @@ -173,11 +173,6 @@ namespace BlackCore::Context return m_dBusInterface->callDBusRet(QLatin1String("setOtherClient"), client); } - CAtcStationList CContextNetworkProxy::getSelectedAtcStations() const - { - return m_dBusInterface->callDBusRet(QLatin1String("getSelectedAtcStations")); - } - void CContextNetworkProxy::requestAircraftDataUpdates() { m_dBusInterface->callDBus(QLatin1String("requestAircraftDataUpdates")); diff --git a/src/blackcore/context/contextnetworkproxy.h b/src/blackcore/context/contextnetworkproxy.h index abac375e3..6daa860d3 100644 --- a/src/blackcore/context/contextnetworkproxy.h +++ b/src/blackcore/context/contextnetworkproxy.h @@ -133,9 +133,6 @@ namespace BlackCore //! \copydoc BlackCore::Context::IContextNetwork::getMetarForAirport BlackMisc::Weather::CMetar getMetarForAirport(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getSelectedAtcStations - virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getUsers virtual BlackMisc::Network::CUserList getUsers() const override; diff --git a/src/blackgui/components/cockpitcomcomponent.cpp b/src/blackgui/components/cockpitcomcomponent.cpp index 9665beb46..1175935d5 100644 --- a/src/blackgui/components/cockpitcomcomponent.cpp +++ b/src/blackgui/components/cockpitcomcomponent.cpp @@ -112,16 +112,6 @@ namespace BlackGui::Components // update transponder ui->editor_Com->setTransponder(transponder); - - // selected stations - if (sGui) - { - if (sGui->getIContextNetwork()) - { - const CAtcStationList selectedStations = sGui->getIContextNetwork()->getSelectedAtcStations(); - ui->editor_Com->setSelectedAtcStations(selectedStations); - } - } } void CCockpitComComponent::testSelcal() diff --git a/src/blackgui/editors/cockpitcomform.cpp b/src/blackgui/editors/cockpitcomform.cpp index 57232d292..08a04d439 100644 --- a/src/blackgui/editors/cockpitcomform.cpp +++ b/src/blackgui/editors/cockpitcomform.cpp @@ -83,32 +83,6 @@ namespace BlackGui::Editors return msgs; } - void CCockpitComForm::setSelectedAtcStations(const CAtcStationList &selectedStations) - { - const CAtcStation com1Ttation = selectedStations.size() > 0 ? selectedStations[0] : CAtcStation(); - const CAtcStation com2Station = selectedStations.size() > 1 ? selectedStations[1] : CAtcStation(); - if (com1Ttation.getCallsign().isEmpty()) - { - ui->lbl_ComPanelCom1Active->setToolTip(""); - ui->led_ComPanelCom1->setOn(false); - } - else - { - ui->lbl_ComPanelCom1Active->setToolTip(com1Ttation.getCallsign().getStringAsSet()); - ui->led_ComPanelCom1->setOn(true); - } - if (com2Station.getCallsign().isEmpty()) - { - ui->lbl_ComPanelCom2Active->setToolTip(""); - ui->led_ComPanelCom2->setOn(false); - } - else - { - ui->lbl_ComPanelCom2Active->setToolTip(com2Station.getCallsign().getStringAsSet()); - ui->led_ComPanelCom2->setOn(true); - } - } - void CCockpitComForm::setTransponderModeStateIdent() { ui->cbp_ComPanelTransponderMode->setSelectedTransponderModeStateIdent(); @@ -136,8 +110,6 @@ namespace BlackGui::Editors void CCockpitComForm::initLeds() { const CLedWidget::LedShape shape = CLedWidget::Rounded; - ui->led_ComPanelCom1->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM1 connected to station", "COM1 disconnected", 14); - ui->led_ComPanelCom2->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM2 connected to station", "COM2 disconnected", 14); ui->led_ComPanelCom1R->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM1 receive (sim)", "COM1 not receiving", 14); ui->led_ComPanelCom1T->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM1 transmit (sim)", "COM1 not transmitting", 14); diff --git a/src/blackgui/editors/cockpitcomform.h b/src/blackgui/editors/cockpitcomform.h index 17497e23c..6d1584206 100644 --- a/src/blackgui/editors/cockpitcomform.h +++ b/src/blackgui/editors/cockpitcomform.h @@ -39,9 +39,6 @@ namespace BlackGui::Editors //! Set the XPDR values void setTransponder(const BlackMisc::Aviation::CTransponder &transponder); - //! Set selected stations - void setSelectedAtcStations(const BlackMisc::Aviation::CAtcStationList &selectedStations); - //! Set to BlackMisc::Aviation::CTransponder::StateIdent void setTransponderModeStateIdent(); diff --git a/src/blackgui/editors/cockpitcomform.ui b/src/blackgui/editors/cockpitcomform.ui index 7b692b407..0de4dc7b9 100644 --- a/src/blackgui/editors/cockpitcomform.ui +++ b/src/blackgui/editors/cockpitcomform.ui @@ -132,9 +132,6 @@ - - - @@ -259,9 +256,6 @@ - - -