From 1ec3f4566d3b6e8aa473b8f39411e6e706258fa1 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Tue, 8 Aug 2017 02:51:19 +0200
Subject: [PATCH] Ref T111, aligned cockpit UI elements

* naming
* allow to set cockpit values by simulated aircraft
---
 src/blackgui/components/cockpitcomcomponent.cpp |  4 ++--
 src/blackgui/editors/cockpitcomform.cpp         | 13 ++++++++++---
 src/blackgui/editors/cockpitcomform.h           | 11 +++++++----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/blackgui/components/cockpitcomcomponent.cpp b/src/blackgui/components/cockpitcomcomponent.cpp
index 6c69780e6..c8319c700 100644
--- a/src/blackgui/components/cockpitcomcomponent.cpp
+++ b/src/blackgui/components/cockpitcomcomponent.cpp
@@ -64,7 +64,7 @@ namespace BlackGui
             // COM form
             connect(ui->editor_Com, &CCockpitComForm::testSelcal, this, &CCockpitComComponent::testSelcal);
             connect(ui->editor_Com, &CCockpitComForm::changedCockpitValues, this, &CCockpitComComponent::updateOwnCockpitInContext);
-            connect(ui->editor_Com, &CCockpitComForm::selcalChanged, this, &CCockpitComComponent::updateSelcalInContext);
+            connect(ui->editor_Com, &CCockpitComForm::changedSelcal, this, &CCockpitComComponent::updateSelcalInContext);
 
             // Relay COM form signals
             connect(ui->editor_Com, &CCockpitComForm::transponderModeChanged, this, &CCockpitComComponent::transponderModeChanged);
@@ -103,7 +103,7 @@ namespace BlackGui
             const CTransponder transponder = ownAircraft.getTransponder();
 
             // update the frequencies
-            ui->editor_Com->setFrequencyDisplays(com1, com2);
+            ui->editor_Com->setFrequencies(com1, com2);
 
             // update transponder
             ui->editor_Com->setTransponder(transponder);
diff --git a/src/blackgui/editors/cockpitcomform.cpp b/src/blackgui/editors/cockpitcomform.cpp
index 12127f878..1e2d156b4 100644
--- a/src/blackgui/editors/cockpitcomform.cpp
+++ b/src/blackgui/editors/cockpitcomform.cpp
@@ -117,6 +117,13 @@ namespace BlackGui
             ui->cbp_ComPanelTransponderMode->setSelectedTransponderModeStateIdent();
         }
 
+        void CCockpitComForm::setValue(const CSimulatedAircraft &aircraft)
+        {
+            this->setFrequencies(aircraft.getCom1System(), aircraft.getCom2System());
+            this->setSelcal(aircraft.getSelcal());
+            this->setTransponder(aircraft.getTransponder());
+        }
+
         CSelcal CCockpitComForm::getSelcal() const
         {
             return ui->frp_ComPanelSelcalSelector->getSelcal();
@@ -163,7 +170,7 @@ namespace BlackGui
             com1.setFrequencyStandbyMHz(ui->ds_ComPanelCom1Standby->value());
             com2.setFrequencyActiveMHz(ui->ds_ComPanelCom2Active->value());
             com2.setFrequencyStandbyMHz(ui->ds_ComPanelCom2Standby->value());
-            this->setFrequencyDisplays(com1, com2); // back annotation after rounding
+            this->setFrequencies(com1, com2); // back annotation after rounding
 
             comAircraft.setCom1System(com1);
             comAircraft.setCom2System(com2);
@@ -171,7 +178,7 @@ namespace BlackGui
             return comAircraft;
         }
 
-        void CCockpitComForm::setFrequencyDisplays(const CComSystem &com1, const CComSystem &com2)
+        void CCockpitComForm::setFrequencies(const CComSystem &com1, const CComSystem &com2)
         {
             double freq = com1.getFrequencyActive().valueRounded(CFrequencyUnit::MHz(), 3);
             if (freq != ui->ds_ComPanelCom1Active->value())
@@ -237,7 +244,7 @@ namespace BlackGui
         void CCockpitComForm::onSelcalChanged()
         {
             const CSelcal selcal = ui->frp_ComPanelSelcalSelector->getSelcal();
-            emit this->selcalChanged(selcal);
+            emit this->changedSelcal(selcal);
         }
     } // ns
 } // ns
diff --git a/src/blackgui/editors/cockpitcomform.h b/src/blackgui/editors/cockpitcomform.h
index d5395874c..6beba3d69 100644
--- a/src/blackgui/editors/cockpitcomform.h
+++ b/src/blackgui/editors/cockpitcomform.h
@@ -40,7 +40,7 @@ namespace BlackGui
             virtual ~CCockpitComForm();
 
             //! COM frequencies displayed
-            void setFrequencyDisplays(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2);
+            void setFrequencies(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2);
 
             //! Set the XPDR values
             void setTransponder(const BlackMisc::Aviation::CTransponder &transponder);
@@ -54,6 +54,9 @@ namespace BlackGui
             //! Set to BlackMisc::Aviation::CTransponder::StateIdent
             void setTransponderModeStateIdent();
 
+            //! Set all values
+            void setValue(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);
+
             //! Get SELCAL
             BlackMisc::Aviation::CSelcal getSelcal() const;
 
@@ -74,12 +77,12 @@ namespace BlackGui
             //! \copydoc BlackGui::Components::CTransponderModeSelector::transponderStateIdentEnded
             void transponderStateIdentEnded();
 
-            //! SELCAL value changed
-            void selcalChanged(const BlackMisc::Aviation::CSelcal &selcal);
-
             //! Request to test SELCAL
             void testSelcal();
 
+            //! SELCAL value changed
+            void changedSelcal(const BlackMisc::Aviation::CSelcal &selcal);
+
             //! GUI values changed
             void changedCockpitValues(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);