From 0cefe1d1e41bc2afe20f525fa07f3da40c938810 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 6 May 2019 15:05:41 +0200 Subject: [PATCH] Ref T650, simulator setting UI of SimulatedObject can be used --- .../fsxcommon/fsxsettingscomponent.cpp | 19 ++- .../fsxcommon/fsxsettingscomponent.h | 5 +- .../fsxcommon/fsxsettingscomponent.ui | 116 ++++++++++-------- 3 files changed, 85 insertions(+), 55 deletions(-) diff --git a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp index e78d63459..88f532ed0 100644 --- a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp +++ b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp @@ -35,12 +35,13 @@ namespace BlackSimPlugin ui->setupUi(this); ui->cb_TraceSimConnectCalls->setChecked(false); + connect(ui->cb_AddingAsSimulatedObject, &QCheckBox::released, this, &CFsxSettingsComponent::onSimulatedObjectChanged); connect(ui->cb_TraceSimConnectCalls, &QCheckBox::released, this, &CFsxSettingsComponent::onSimConnectTraceChanged); - connect(ui->cb_EnableTerrainProbe, &QCheckBox::released, this, &CFsxSettingsComponent::onEnableTerrainProbeChanged); - connect(ui->cb_UseFsuipc, &QCheckBox::released, this, &CFsxSettingsComponent::onFsuipcChanged); - connect(ui->cb_SBOffsets, &QCheckBox::released, this, &CFsxSettingsComponent::onSBOffsetsChanged); - connect(ui->pb_CopyTerrainProbe, &QPushButton::released, this, &CFsxSettingsComponent::copyTerrainProbe); - connect(ui->pb_Refresh, &QPushButton::released, this, &CFsxSettingsComponent::refresh); + connect(ui->cb_EnableTerrainProbe, &QCheckBox::released, this, &CFsxSettingsComponent::onEnableTerrainProbeChanged); + connect(ui->cb_UseFsuipc, &QCheckBox::released, this, &CFsxSettingsComponent::onFsuipcChanged); + connect(ui->cb_SBOffsets, &QCheckBox::released, this, &CFsxSettingsComponent::onSBOffsetsChanged); + connect(ui->pb_CopyTerrainProbe, &QPushButton::released, this, &CFsxSettingsComponent::copyTerrainProbe); + connect(ui->pb_Refresh, &QPushButton::released, this, &CFsxSettingsComponent::refresh); if (sGui && sGui->getIContextSimulator()) { @@ -75,6 +76,7 @@ namespace BlackSimPlugin ui->cb_EnableTerrainProbe->setChecked(fsxOrP3D->isUsingFsxTerrainProbe()); ui->cb_SBOffsets->setChecked(fsxOrP3D->isUsingSbOffsetValues()); ui->cb_UseFsuipc->setChecked(fsxOrP3D->isFsuipcOpened()); + ui->cb_AddingAsSimulatedObject->setChecked(fsxOrP3D->isAddingAsSimulatedObjectEnabled()); } ui->lbl_NoLocalSimulator->setVisible(!localSim); @@ -95,6 +97,13 @@ namespace BlackSimPlugin fsxOrP3D->setTractingSendId(ui->cb_TraceSimConnectCalls->isChecked()); } + void CFsxSettingsComponent::onSimulatedObjectChanged() + { + CSimulatorFsxCommon *fsxOrP3D = this->getFsxOrP3DSimulator(); + if (!fsxOrP3D) { return; } + fsxOrP3D->setAddingAsSimulatedObjectEnabled(ui->cb_AddingAsSimulatedObject->isChecked()); + } + void CFsxSettingsComponent::onEnableTerrainProbeChanged() { CSimulatorFsxCommon *fsxOrP3D = this->getFsxOrP3DSimulator(); diff --git a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.h b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.h index c98c289bc..8ae3e8eca 100644 --- a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.h +++ b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.h @@ -35,7 +35,7 @@ namespace BlackSimPlugin explicit CFsxSettingsComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CFsxSettingsComponent(); + virtual ~CFsxSettingsComponent() override; //! Simulator, P3D/FSX void setSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator) { m_simulator = simulator; } @@ -53,6 +53,9 @@ namespace BlackSimPlugin //! Terrain probe checkbox changed void onEnableTerrainProbeChanged(); + //! Using simulated objects + void onSimulatedObjectChanged(); + //! FSUIPC setting changed void onFsuipcChanged(); diff --git a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.ui b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.ui index e2d4f87d4..46690f02e 100644 --- a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.ui +++ b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.ui @@ -7,14 +7,65 @@ 0 0 254 - 174 + 212 FSX/P3D settings - - + + + + + Enable SB SimConnect offsets. Those are needed to detect "Ident" and "Standby" from your transponder (supported by some vendors as PMDG). + + + true + + + + + + + Trace simConnect calls (this will trace sendId calls and provide further information) + + + true + + + + + + + + + + + + + + Looks like you are running a remote GUI, these settings only work locally. Use core settings. + + + true + + + + + + + + + + + + + + + + + + @@ -47,54 +98,27 @@ - - - - Trace simConnect calls (this will trace sendId calls and provide further information) - - - true - - - - - - - Enable SB SimConnect offsets. Those are needed to detect "Ident" and "Standby" from your transponder (supported by some vendors as PMDG). - - - true - - - - - - - - - - - - - - - - - - + Use the terrain probe (32bit only) - + Enable FSUIPC support + + + + + + + @@ -102,17 +126,10 @@ - - + + - - - - - - - - Looks like you are running a remote GUI, these settings only work locally. Use core settings. + If SimConnect NonATC AI aircraft adding fails, use simulated objects. You cannot see those in the aircraft menu, but might work for some helicopters etc. true @@ -125,6 +142,7 @@ cb_TraceSimConnectCalls cb_UseFsuipc cb_SBOffsets + cb_AddingAsSimulatedObject cb_EnableTerrainProbe pb_CopyTerrainProbe pb_Refresh