flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T609, adjusted/fixed cockpit form

Browse Source 
* Naming to receive/transmit
* Fixed wrong LED order
This commit is contained in:
Klaus Basan
2019-08-02 23:49:35 +02:00
committed by Mat Sutcliffe
parent 3275d97653
commit 5470a55e15
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/blackgui/editors/cockpitcomform.cpp
View File

@@ -102,16 +102,16 @@ namespace BlackGui
void CCockpitComForm::setSelectedAtcStations(const CAtcStationList &selectedStations) void CCockpitComForm::setSelectedAtcStations(const CAtcStationList &selectedStations)
{ {
const CAtcStation com1Station = selectedStations.size() > 0 ? selectedStations[0] : CAtcStation(); const CAtcStation com1Ttation = selectedStations.size() > 0 ? selectedStations[0] : CAtcStation();
const CAtcStation com2Station = selectedStations.size() > 1 ? selectedStations[1] : CAtcStation(); const CAtcStation com2Station = selectedStations.size() > 1 ? selectedStations[1] : CAtcStation();
if (com1Station.getCallsign().isEmpty()) if (com1Ttation.getCallsign().isEmpty())
{ {
ui->lbl_ComPanelCom1Active->setToolTip(""); ui->lbl_ComPanelCom1Active->setToolTip("");
ui->led_ComPanelCom1->setOn(false); ui->led_ComPanelCom1->setOn(false);
} }
else else
{ {
ui->lbl_ComPanelCom1Active->setToolTip(com1Station.getCallsign().getStringAsSet()); ui->lbl_ComPanelCom1Active->setToolTip(com1Ttation.getCallsign().getStringAsSet());
ui->led_ComPanelCom1->setOn(true); ui->led_ComPanelCom1->setOn(true);
} }
@@ -138,6 +138,7 @@ namespace BlackGui
this->setSelcal(aircraft.getSelcal()); this->setSelcal(aircraft.getSelcal());
this->setTransponder(aircraft.getTransponder()); this->setTransponder(aircraft.getTransponder());
this->alignUiElementsHeight(); this->alignUiElementsHeight();
this->updateIntegratedFlagFromSimulatorContext();
} }
CSelcal CCockpitComForm::getSelcal() const CSelcal CCockpitComForm::getSelcal() const
@@ -157,14 +158,14 @@ namespace BlackGui
ui->led_ComPanelCom2->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM2 connected to station", "COM2 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_ComPanelCom1R->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM1 receive (sim)", "COM1 not receiving", 14);
ui->led_ComPanelCom1S->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM1 trasmit (sim)", "COM1 not transmitting", 14); ui->led_ComPanelCom1T->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM1 transmit (sim)", "COM1 not transmitting", 14);
ui->led_ComPanelCom1R->setTriStateValues(CLedWidget::Blue, "receive not synced"); ui->led_ComPanelCom1R->setTriStateValues(CLedWidget::Blue, "receive not synced");
ui->led_ComPanelCom1S->setTriStateValues(CLedWidget::Blue, "transmit not synced"); ui->led_ComPanelCom1T->setTriStateValues(CLedWidget::Blue, "transmit not synced");
ui->led_ComPanelCom2R->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM2 receive (sim)", "COM2 not receiving", 14); ui->led_ComPanelCom2R->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM2 receive (sim)", "COM2 not receiving", 14);
ui->led_ComPanelCom2S->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM2 trasmit (sim)", "COM2 not transmitting", 14); ui->led_ComPanelCom2T->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "COM2 transmit (sim)", "COM2 not transmitting", 14);
ui->led_ComPanelCom2R->setTriStateValues(CLedWidget::Blue, "receive not synced"); ui->led_ComPanelCom2R->setTriStateValues(CLedWidget::Blue, "receive not synced");
ui->led_ComPanelCom2S->setTriStateValues(CLedWidget::Blue, "transmit not synced"); ui->led_ComPanelCom2T->setTriStateValues(CLedWidget::Blue, "transmit not synced");
} }
CSimulatedAircraft CCockpitComForm::cockpitValuesToAircraftObject() CSimulatedAircraft CCockpitComForm::cockpitValuesToAircraftObject()
@@ -301,14 +302,14 @@ namespace BlackGui
if (!integratedWithSim) if (!integratedWithSim)
{ {
ui->led_ComPanelCom1R->setTriState(); ui->led_ComPanelCom1R->setTriState();
ui->led_ComPanelCom1S->setTriState(); ui->led_ComPanelCom1T->setTriState();
ui->led_ComPanelCom2R->setTriState(); ui->led_ComPanelCom2R->setTriState();
ui->led_ComPanelCom2S->setTriState(); ui->led_ComPanelCom2T->setTriState();
} }
else else
{ {
ui->led_ComPanelCom1R->setOn(com1R); ui->led_ComPanelCom1R->setOn(com1R);
ui->led_ComPanelCom1S->setOn(com1S); ui->led_ComPanelCom1T->setOn(com1T);
ui->led_ComPanelCom2R->setOn(com2R); ui->led_ComPanelCom2R->setOn(com2R);
ui->led_ComPanelCom2T->setOn(com2T); ui->led_ComPanelCom2T->setOn(com2T);
} }

6
src/blackgui/editors/cockpitcomform.ui
View File

@@ -136,10 +136,10 @@
<widget class="BlackGui::CLedWidget" name="led_ComPanelCom2" native="true"/> <widget class="BlackGui::CLedWidget" name="led_ComPanelCom2" native="true"/>
</item> </item>
<item> <item>
<widget class="BlackGui::CLedWidget" name="led_ComPanelCom2R" native="true"/> <widget class="BlackGui::CLedWidget" name="led_ComPanelCom2T" native="true"/>
</item> </item>
<item> <item>
<widget class="BlackGui::CLedWidget" name="led_ComPanelCom2S" native="true"/> <widget class="BlackGui::CLedWidget" name="led_ComPanelCom2R" native="true"/>
</item> </item>
</layout> </layout>
</widget> </widget>
@@ -263,7 +263,7 @@
<widget class="BlackGui::CLedWidget" name="led_ComPanelCom1" native="true"/> <widget class="BlackGui::CLedWidget" name="led_ComPanelCom1" native="true"/>
</item> </item>
<item> <item>
<widget class="BlackGui::CLedWidget" name="led_ComPanelCom1S" native="true"/> <widget class="BlackGui::CLedWidget" name="led_ComPanelCom1T" native="true"/>
</item> </item>
<item> <item>
<widget class="BlackGui::CLedWidget" name="led_ComPanelCom1R" native="true"/> <widget class="BlackGui::CLedWidget" name="led_ComPanelCom1R" native="true"/>