diff --git a/src/blackgui/editors/cockpitcomform.cpp b/src/blackgui/editors/cockpitcomform.cpp index 57955884c..75601ef4e 100644 --- a/src/blackgui/editors/cockpitcomform.cpp +++ b/src/blackgui/editors/cockpitcomform.cpp @@ -231,7 +231,7 @@ namespace BlackGui } this->updateIntegratedFlagFromSimulatorContext(); - this->updateActiveCOMUnitLEDs(m_integratedWithSim, com1.isSendEnabled(), com1.isReceiveEnabled(), com2.isSendEnabled(), com2.isReceiveEnabled()); + this->updateActiveCOMUnitLEDs(m_integratedWithSim, com1.isTransmitEnabled(), com1.isReceiveEnabled(), com2.isTransmitEnabled(), com2.isReceiveEnabled()); } void CCockpitComForm::setTransponder(const CTransponder &transponder) @@ -296,7 +296,7 @@ namespace BlackGui } } - void CCockpitComForm::updateActiveCOMUnitLEDs(bool integratedWithSim, bool com1S, bool com1R, bool com2S, bool com2R) + void CCockpitComForm::updateActiveCOMUnitLEDs(bool integratedWithSim, bool com1T, bool com1R, bool com2T, bool com2R) { if (!integratedWithSim) { @@ -310,7 +310,7 @@ namespace BlackGui ui->led_ComPanelCom1R->setOn(com1R); ui->led_ComPanelCom1S->setOn(com1S); ui->led_ComPanelCom2R->setOn(com2R); - ui->led_ComPanelCom2S->setOn(com2S); + ui->led_ComPanelCom2T->setOn(com2T); } } diff --git a/src/blackgui/editors/cockpitcomform.h b/src/blackgui/editors/cockpitcomform.h index ebbe1be74..cf9dfdfe6 100644 --- a/src/blackgui/editors/cockpitcomform.h +++ b/src/blackgui/editors/cockpitcomform.h @@ -109,7 +109,7 @@ namespace BlackGui void alignUiElementsHeight(); //! Update UI for COM unit - void updateActiveCOMUnitLEDs(bool integratedWithSim, bool com1S, bool com1R, bool com2S, bool com2R); + void updateActiveCOMUnitLEDs(bool integratedWithSim, bool com1T, bool com1R, bool com2T, bool com2R); //! Update from simulator context void updateIntegratedFlagFromSimulatorContext(); diff --git a/src/blackmisc/aviation/modulator.cpp b/src/blackmisc/aviation/modulator.cpp index 05da59e50..71b07f5c6 100644 --- a/src/blackmisc/aviation/modulator.cpp +++ b/src/blackmisc/aviation/modulator.cpp @@ -58,33 +58,33 @@ namespace BlackMisc } template - int CModulator::getVolumeOutput() const + int CModulator::getVolumeReceive() const { - return m_volumeOutput; + return m_volumeReceive; } template - int CModulator::getVolumeInput() const + int CModulator::getVolumeTransmit() const { - return m_volumeInput; + return m_volumeTransmit; } template - void CModulator::setVolumeOutput(int volume) + void CModulator::setVolumeReceive(int volume) { - m_volumeOutput = volume; + m_volumeReceive = volume; } template - void CModulator::setVolumeInput(int volume) + void CModulator::setVolumeTransmit(int volume) { - m_volumeInput = volume; + m_volumeTransmit = volume; } template - bool CModulator::isSendEnabled() const + bool CModulator::isTransmitEnabled() const { - return m_sendEnabled; + return m_transmitEnabled; } template @@ -94,9 +94,9 @@ namespace BlackMisc } template - void CModulator::setSendEnabled(bool enable) + void CModulator::setTransmitEnabled(bool enable) { - m_sendEnabled = enable; + m_transmitEnabled = enable; } template @@ -120,10 +120,10 @@ namespace BlackMisc { case IndexActiveFrequency: return this->getFrequencyActive().propertyByIndex(index.copyFrontRemoved()); case IndexStandbyFrequency: return this->getFrequencyStandby().propertyByIndex(index.copyFrontRemoved()); - case IndexEnabledSend: return CVariant::from(this->isSendEnabled()); + case IndexEnabledTransmit: return CVariant::from(this->isTransmitEnabled()); case IndexEnabledReceive: return CVariant::from(this->isReceiveEnabled()); - case IndexInputVolume: return CVariant::from(this->getVolumeInput()); - case IndexOutputVolume: return CVariant::from(this->getVolumeOutput()); + case IndexTransmitVolume: return CVariant::from(this->getVolumeTransmit()); + case IndexReceiveVolume: return CVariant::from(this->getVolumeReceive()); default: return CValueObject>::propertyByIndex(index); } @@ -138,10 +138,10 @@ namespace BlackMisc { case IndexActiveFrequency: m_frequencyActive.setPropertyByIndex(index.copyFrontRemoved(), variant); break; case IndexStandbyFrequency: m_frequencyStandby.setPropertyByIndex(index.copyFrontRemoved(), variant); break; - case IndexEnabledSend: this->setSendEnabled(variant.toBool()); break; + case IndexEnabledTransmit: this->setTransmitEnabled(variant.toBool()); break; case IndexEnabledReceive: this->setReceiveEnabled(variant.toBool()); break; - case IndexInputVolume: this->setVolumeInput(variant.toInt()); break; - case IndexOutputVolume: this->setVolumeOutput(variant.toInt()); break; + case IndexTransmitVolume: this->setVolumeTransmit(variant.toInt()); break; + case IndexReceiveVolume: this->setVolumeReceive(variant.toInt()); break; default: CValueObject>::setPropertyByIndex(index, variant); break; @@ -157,10 +157,10 @@ namespace BlackMisc { case IndexActiveFrequency: return m_frequencyActive.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.m_frequencyActive); case IndexStandbyFrequency: return m_frequencyStandby.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.m_frequencyStandby); - case IndexEnabledSend: return Compare::compare(this->isSendEnabled(), compareValue.isSendEnabled()); + case IndexEnabledTransmit: return Compare::compare(this->isTransmitEnabled(), compareValue.isTransmitEnabled()); case IndexEnabledReceive: return Compare::compare(this->isReceiveEnabled(), compareValue.isReceiveEnabled()); - case IndexInputVolume: return Compare::compare(this->getVolumeInput(), compareValue.getVolumeInput()); - case IndexOutputVolume: return Compare::compare(this->getVolumeOutput(), compareValue.getVolumeOutput()); + case IndexTransmitVolume: return Compare::compare(this->getVolumeTransmit(), compareValue.getVolumeTransmit()); + case IndexReceiveVolume: return Compare::compare(this->getVolumeReceive(), compareValue.getVolumeReceive()); default: break; } Q_ASSERT_X(false, Q_FUNC_INFO, "Compare failed"); diff --git a/src/blackmisc/aviation/modulator.h b/src/blackmisc/aviation/modulator.h index 7ea816168..2cf9453a5 100644 --- a/src/blackmisc/aviation/modulator.h +++ b/src/blackmisc/aviation/modulator.h @@ -25,11 +25,11 @@ namespace BlackMisc //! Column indexes enum ColumnIndex { - IndexActiveFrequency = BlackMisc::CPropertyIndex::GlobalIndexCModulator, + IndexActiveFrequency = CPropertyIndex::GlobalIndexCModulator, IndexStandbyFrequency, - IndexOutputVolume, - IndexInputVolume, - IndexEnabledSend, + IndexReceiveVolume, + IndexTransmitVolume, + IndexEnabledTransmit, IndexEnabledReceive }; @@ -43,28 +43,28 @@ namespace BlackMisc BlackMisc::PhysicalQuantities::CFrequency getFrequencyStandby() const; //! Output volume 0..100 - int getVolumeOutput() const; + int getVolumeReceive() const; //! Input volume 0..100 - int getVolumeInput() const; + int getVolumeTransmit() const; //! Output volume 0.100 - void setVolumeOutput(int volume); + void setVolumeReceive(int volume); //! Input volume 0..100 - void setVolumeInput(int volume); + void setVolumeTransmit(int volume); //! Name QString getName() const; //! Enabled? - bool isSendEnabled() const; + bool isTransmitEnabled() const; //! Enabled? bool isReceiveEnabled() const; //! Enabled? - void setSendEnabled(bool enable); + void setTransmitEnabled(bool enable); //! Enabled? void setReceiveEnabled(bool enable); @@ -126,12 +126,12 @@ namespace BlackMisc private: QString m_name; //!< name of the unit - BlackMisc::PhysicalQuantities::CFrequency m_frequencyActive; //!< active frequency - BlackMisc::PhysicalQuantities::CFrequency m_frequencyStandby; //!< standby frequency - int m_volumeInput = 0; //!< volume input - int m_volumeOutput = 0; //!< volume output - bool m_sendEnabled = true; //!< is enabled, used e.g. for mute etc. - bool m_receiveEnabled = true; //!< is enabled, used e.g. for mute etc. + PhysicalQuantities::CFrequency m_frequencyActive; //!< active frequency + PhysicalQuantities::CFrequency m_frequencyStandby; //!< standby frequency + int m_volumeTransmit = 100; //!< volume transmit/input 0..100 + int m_volumeReceive = 100; //!< volume receive/output 0..100 + bool m_transmitEnabled = true; //!< is enabled, used e.g. for mute etc. + bool m_receiveEnabled = true; //!< is enabled, used e.g. for mute etc. //! Easy access to derived class (CRTP template parameter) AVIO const *derived() const @@ -150,9 +150,9 @@ namespace BlackMisc BLACK_METAMEMBER(name), BLACK_METAMEMBER(frequencyActive), BLACK_METAMEMBER(frequencyStandby), - BLACK_METAMEMBER(volumeInput), - BLACK_METAMEMBER(volumeOutput), - BLACK_METAMEMBER(sendEnabled), + BLACK_METAMEMBER(volumeTransmit), + BLACK_METAMEMBER(volumeReceive), + BLACK_METAMEMBER(transmitEnabled), BLACK_METAMEMBER(receiveEnabled) ); }; diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp index e7869d029..7c56d3a8a 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp @@ -700,7 +700,7 @@ namespace BlackSimPlugin const bool com1Test = dtb(simulatorOwnAircraft.comTest1); const bool com1Transmit = dtb(simulatorOwnAircraft.comTransmit1); const int com1Status = qRound(simulatorOwnAircraft.comStatus1); // Radio status flag : -1 =Invalid 0 = OK 1 = Does not exist 2 = No electricity 3 = Failed - com1.setSendEnabled(com1Status == 0 && com1Transmit); + com1.setTransmitEnabled(com1Status == 0 && com1Transmit); com1.setReceiveEnabled(com1Status == 0 && (comReceiveAll || com1Transmit)); const bool changedCom1 = myAircraft.getCom1System() != com1; m_simCom1 = com1; @@ -711,7 +711,7 @@ namespace BlackSimPlugin const bool com2Test = dtb(simulatorOwnAircraft.comTest2); const bool com2Transmit = dtb(simulatorOwnAircraft.comTransmit2); const int com2Status = qRound(simulatorOwnAircraft.comStatus2); // Radio status flag : -1 =Invalid 0 = OK 1 = Does not exist 2 = No electricity 3 = Failed - com2.setSendEnabled(com2Status == 0 && com2Transmit); + com2.setTransmitEnabled(com2Status == 0 && com2Transmit); com2.setReceiveEnabled(com2Status == 0 && (comReceiveAll || com2Transmit)); const bool changedCom2 = myAircraft.getCom2System() != com2; m_simCom2 = com2;