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

Ref T111, changed internals page to use aircraft parts form

Browse Source
This commit is contained in:
Klaus Basan
2017-08-05 00:47:22 +02:00
committed by Mathew Sutcliffe
parent eea6039d58
commit 90b757473c
3 changed files with 17 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
src/blackgui/components/internalscomponent.cpp
View File

@@ -27,8 +27,6 @@
#include "ui_internalscomponent.h" #include "ui_internalscomponent.h"
#include <QCheckBox> #include <QCheckBox>
#include <QJsonDocument>
#include <QJsonParseError>
#include <QPushButton> #include <QPushButton>
#include <QSpinBox> #include <QSpinBox>
#include <QString> #include <QString>
@@ -55,17 +53,13 @@ namespace BlackGui
ui->setupUi(this); ui->setupUi(this);
ui->tw_Internals->setCurrentIndex(0); ui->tw_Internals->setCurrentIndex(0);
ui->comp_RemoteAircraftSelector->indicatePartsEnabled(true); ui->comp_RemoteAircraftSelector->indicatePartsEnabled(true);
ui->editor_AircraftParts->showSetButton(false);
ui->le_TxtMsgFrom->setValidator(new CUpperCaseValidator(ui->le_TxtMsgFrom)); ui->le_TxtMsgFrom->setValidator(new CUpperCaseValidator(ui->le_TxtMsgFrom));
ui->le_TxtMsgTo->setValidator(new CUpperCaseValidator(ui->le_TxtMsgFrom)); ui->le_TxtMsgTo->setValidator(new CUpperCaseValidator(ui->le_TxtMsgFrom));
connect(ui->pb_SendAircraftPartsGui, &QPushButton::pressed, this, &CInternalsComponent::ps_sendAircraftParts); connect(ui->pb_SendAircraftPartsGui, &QPushButton::pressed, this, &CInternalsComponent::ps_sendAircraftParts);
connect(ui->pb_SendAircraftPartsJson, &QPushButton::pressed, this, &CInternalsComponent::ps_sendAircraftParts); connect(ui->pb_SendAircraftPartsJson, &QPushButton::pressed, this, &CInternalsComponent::ps_sendAircraftParts);
connect(ui->pb_AircraftPartsLightsOn, &QPushButton::pressed, this, &CInternalsComponent::ps_setAllLights);
connect(ui->pb_AircraftPartsLightsOff, &QPushButton::pressed, this, &CInternalsComponent::ps_setAllLights);
connect(ui->pb_AircraftPartsEnginesOn, &QPushButton::pressed, this, &CInternalsComponent::ps_setAllEngines);
connect(ui->pb_AircraftPartsEnginesOff, &QPushButton::pressed, this, &CInternalsComponent::ps_setAllEngines);
connect(ui->pb_AircraftPartsUiToJson, &QPushButton::pressed, this, &CInternalsComponent::ps_guiToJson);
connect(ui->pb_CurrentParts, &QPushButton::pressed, this, &CInternalsComponent::ps_setCurrentParts); connect(ui->pb_CurrentParts, &QPushButton::pressed, this, &CInternalsComponent::ps_setCurrentParts);
connect(ui->cb_DebugContextAudio, &QCheckBox::stateChanged, this, &CInternalsComponent::ps_enableDebug); connect(ui->cb_DebugContextAudio, &QCheckBox::stateChanged, this, &CInternalsComponent::ps_enableDebug);
@@ -115,76 +109,15 @@ namespace BlackGui
return; return;
} }
CAircraftParts parts;
const bool json = (QObject::sender() == ui->pb_SendAircraftPartsJson); const bool json = (QObject::sender() == ui->pb_SendAircraftPartsJson);
const CAircraftParts parts = json ? ui->editor_AircraftParts->getAircraftPartsFromJson() : ui->editor_AircraftParts->getAircraftPartsFromGui();
if (json) ui->editor_AircraftParts->setAircraftParts(parts); // display in UI as GUI and JSON
{
QString jsonParts = ui->te_AircraftPartsJson->toPlainText().trimmed();
if (jsonParts.isEmpty())
{
CLogMessage(this).validationError("No JSON content");
return;
}
QJsonParseError jsonError;
QJsonDocument jsonDoc(QJsonDocument::fromJson(jsonParts.toUtf8(), &jsonError));
if (jsonError.error != QJsonParseError::NoError)
{
CLogMessage(this).validationError("Parse error: %1") << jsonError.errorString();
return;
}
try
{
parts.convertFromJson(jsonDoc.object());
}
catch (const CJsonException &ex)
{
ex.toLogMessage(this, "Parse error");
return;
}
partsToGui(parts);
}
else
{
parts = CAircraftParts(guiToAircraftParts());
this->ps_guiToJson();
}
ui->tb_History->setToolTip(""); ui->tb_History->setToolTip("");
sGui->getIContextNetwork()->testAddAircraftParts(callsign, parts, ui->cb_AircraftPartsIncremental->isChecked()); sGui->getIContextNetwork()->testAddAircraftParts(callsign, parts, ui->cb_AircraftPartsIncremental->isChecked());
CLogMessage(this).info("Added parts for %1") << callsign.toQString(); CLogMessage(this).info("Added parts for %1") << callsign.toQString();
} }
void CInternalsComponent::ps_setAllLights()
{
bool on = QObject::sender() == ui->pb_AircraftPartsLightsOn ? true : false;
ui->cb_AircraftPartsLightsStrobe->setChecked(on);
ui->cb_AircraftPartsLightsLanding->setChecked(on);
ui->cb_AircraftPartsLightsTaxi->setChecked(on);
ui->cb_AircraftPartsLightsBeacon->setChecked(on);
ui->cb_AircraftPartsLightsNav->setChecked(on);
ui->cb_AircraftPartsLightsLogo->setChecked(on);
}
void CInternalsComponent::ps_setAllEngines()
{
bool on = QObject::sender() == ui->pb_AircraftPartsEnginesOn ? true : false;
ui->cb_AircraftPartsEngine1->setChecked(on);
ui->cb_AircraftPartsEngine2->setChecked(on);
ui->cb_AircraftPartsEngine3->setChecked(on);
ui->cb_AircraftPartsEngine4->setChecked(on);
ui->cb_AircraftPartsEngine5->setChecked(on);
ui->cb_AircraftPartsEngine6->setChecked(on);
}
void CInternalsComponent::ps_guiToJson()
{
const QJsonDocument json(guiToAircraftParts().toJson());
QString j(json.toJson(QJsonDocument::Indented));
ui->te_AircraftPartsJson->setText(j);
}
void CInternalsComponent::ps_setCurrentParts() void CInternalsComponent::ps_setCurrentParts()
{ {
if (!sGui->getIContextNetwork()->isConnected()) { return; } if (!sGui->getIContextNetwork()->isConnected()) { return; }
@@ -199,8 +132,7 @@ namespace BlackGui
} }
const CAircraftParts parts = partsList.latestObject(); const CAircraftParts parts = partsList.latestObject();
const CStatusMessageList history = sGui->getIContextNetwork()->getAircraftPartsHistory(callsign); const CStatusMessageList history = sGui->getIContextNetwork()->getAircraftPartsHistory(callsign);
partsToGui(parts); ui->editor_AircraftParts->setAircraftParts(parts);
ui->te_AircraftPartsJson->setText(parts.toJsonString());
ui->tb_History->setToolTip(history.toHtml()); ui->tb_History->setToolTip(history.toHtml());
} }
@@ -319,60 +251,6 @@ namespace BlackGui
this->ps_setCurrentParts(); this->ps_setCurrentParts();
} }
CAircraftParts CInternalsComponent::guiToAircraftParts() const
{
const CAircraftLights lights(
ui->cb_AircraftPartsLightsStrobe->isChecked(),
ui->cb_AircraftPartsLightsLanding->isChecked(),
ui->cb_AircraftPartsLightsTaxi->isChecked(),
ui->cb_AircraftPartsLightsBeacon->isChecked(),
ui->cb_AircraftPartsLightsNav->isChecked(),
ui->cb_AircraftPartsLightsLogo->isChecked()
);
const CAircraftEngineList engines(
{
ui->cb_AircraftPartsEngine1->isChecked(),
ui->cb_AircraftPartsEngine2->isChecked(),
ui->cb_AircraftPartsEngine3->isChecked(),
ui->cb_AircraftPartsEngine4->isChecked(),
ui->cb_AircraftPartsEngine5->isChecked(),
ui->cb_AircraftPartsEngine6->isChecked()
}
);
CAircraftParts parts(lights,
ui->cb_AircraftPartsGearDown->isChecked(),
ui->sb_AircraftPartsFlapsPercentage->value(),
ui->cb_AircraftPartsSpoilers->isChecked(),
engines,
ui->cb_AircraftPartsIsOnGround->isChecked()
);
return parts;
}
void CInternalsComponent::partsToGui(const CAircraftParts &parts)
{
ui->cb_AircraftPartsGearDown->setChecked(parts.isGearDown());
ui->cb_AircraftPartsIsOnGround->setChecked(parts.isOnGround());
ui->cb_AircraftPartsSpoilers->setChecked(parts.isSpoilersOut());
ui->sb_AircraftPartsFlapsPercentage->setValue(parts.getFlapsPercent());
CAircraftLights lights = parts.getLights();
ui->cb_AircraftPartsLightsBeacon->setChecked(lights.isBeaconOn());
ui->cb_AircraftPartsLightsLanding->setChecked(lights.isLandingOn());
ui->cb_AircraftPartsLightsLogo->setChecked(lights.isLogoOn());
ui->cb_AircraftPartsLightsNav->setChecked(lights.isNavOn());
ui->cb_AircraftPartsLightsStrobe->setChecked(lights.isStrobeOn());
ui->cb_AircraftPartsLightsTaxi->setChecked(lights.isTaxiOn());
CAircraftEngineList engines = parts.getEngines();
ui->cb_AircraftPartsEngine1->setChecked(engines.isEngineOn(1));
ui->cb_AircraftPartsEngine2->setChecked(engines.isEngineOn(2));
ui->cb_AircraftPartsEngine3->setChecked(engines.isEngineOn(3));
ui->cb_AircraftPartsEngine4->setChecked(engines.isEngineOn(4));
ui->cb_AircraftPartsEngine5->setChecked(engines.isEngineOn(5));
ui->cb_AircraftPartsEngine6->setChecked(engines.isEngineOn(6));
}
void CInternalsComponent::contextFlagsToGui() void CInternalsComponent::contextFlagsToGui()
{ {
ui->cb_DebugContextApplication->setChecked(sGui->getIContextApplication()->isDebugEnabled()); ui->cb_DebugContextApplication->setChecked(sGui->getIContextApplication()->isDebugEnabled());

15
src/blackgui/components/internalscomponent.h
View File

@@ -48,15 +48,6 @@ namespace BlackGui
//! Send aircraft parts //! Send aircraft parts
void ps_sendAircraftParts(); void ps_sendAircraftParts();
//! Set all lights
void ps_setAllLights();
//! Set all engines
void ps_setAllEngines();
//! GUI to JSON
void ps_guiToJson();
//! Current parts in UI //! Current parts in UI
void ps_setCurrentParts(); void ps_setCurrentParts();
@@ -81,12 +72,6 @@ namespace BlackGui
private: private:
QScopedPointer<Ui::CInternalsComponent> ui; QScopedPointer<Ui::CInternalsComponent> ui;
//! Get parts object
BlackMisc::Aviation::CAircraftParts guiToAircraftParts() const;
//! GUI set by parts
void partsToGui(const BlackMisc::Aviation::CAircraftParts &parts);
//! Set the context flags //! Set the context flags
void contextFlagsToGui(); void contextFlagsToGui();
}; };

219
src/blackgui/components/internalscomponent.ui
View File

@@ -500,216 +500,17 @@
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
<layout class="QGridLayout" name="gl_AircraftParts"> <widget class="BlackGui::Editors::CAircraftPartsForm" name="editor_AircraftParts">
<property name="spacing"> <property name="frameShape">
<number>4</number> <enum>QFrame::StyledPanel</enum>
</property> </property>
<item row="4" column="1"> <property name="frameShadow">
<widget class="QCheckBox" name="cb_AircraftPartsLightsStrobe"> <enum>QFrame::Raised</enum>
<property name="text"> </property>
<string>Strobe</string> </widget>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="cb_AircraftPartsLightsBeacon">
<property name="text">
<string>Beacon</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QCheckBox" name="cb_AircraftPartsLightsLanding">
<property name="text">
<string>Landing</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="cb_AircraftPartsGearDown">
<property name="text">
<string>Gear down</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="lbl_AircraftPartsEngines">
<property name="text">
<string>Engines:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lbl_AircraftPartsFlapsPercentage">
<property name="text">
<string>Flaps %:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="cb_AircraftPartsLightsTaxi">
<property name="text">
<string>Taxi</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="cb_AircraftPartsSpoilers">
<property name="text">
<string>Spoilers</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_AircraftPartsLights">
<property name="text">
<string>Lights:</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QCheckBox" name="cb_AircraftPartsLightsLogo">
<property name="text">
<string>Logo</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="pb_AircraftPartsLightsOn">
<property name="text">
<string>all on</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="pb_AircraftPartsLightsOff">
<property name="text">
<string>all off</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="cb_AircraftPartsLightsNav">
<property name="text">
<string>Nav</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="sb_AircraftPartsFlapsPercentage">
<property name="maximum">
<number>100</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QPushButton" name="pb_AircraftPartsEnginesOff">
<property name="text">
<string>all off</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QPushButton" name="pb_AircraftPartsEnginesOn">
<property name="text">
<string>all on</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pb_AircraftPartsUiToJson">
<property name="text">
<string>to JSON</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="cb_AircraftPartsIsOnGround">
<property name="text">
<string>on ground</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="3">
<widget class="QFrame" name="fr_Engines">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="hl_Engines">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="cb_AircraftPartsEngine1">
<property name="text">
<string>1</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cb_AircraftPartsEngine2">
<property name="text">
<string>2</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cb_AircraftPartsEngine3">
<property name="text">
<string>3</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cb_AircraftPartsEngine4">
<property name="text">
<string>4</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cb_AircraftPartsEngine5">
<property name="text">
<string>5</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cb_AircraftPartsEngine6">
<property name="text">
<string>6</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QTextEdit" name="te_AircraftPartsJson"/>
</widget> </widget>
</item> </item>
</layout> </layout>
@@ -783,6 +584,12 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>BlackGui::Editors::CAircraftPartsForm</class>
<extends>QFrame</extends>
<header>blackgui/editors/aircraftpartsform.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>BlackGui::Components::CRemoteAircraftSelector</class> <class>BlackGui::Components::CRemoteAircraftSelector</class>
<extends>QFrame</extends> <extends>QFrame</extends>