Renamed to FullInterpolation (formerly VtolInterpolation)

This commit is contained in:
Klaus Basan
2018-08-08 13:58:36 +02:00
parent f9abfe9973
commit fe4fd31688
9 changed files with 42 additions and 28 deletions

View File

@@ -72,7 +72,7 @@ namespace BlackGui
CInterpolationSetupComponent::Mode CInterpolationSetupComponent::getSetupMode() const
{
return ui->rb_Callsign->isChecked() ? CInterpolationSetupComponent::PerCallsign : CInterpolationSetupComponent::Global;
return ui->rb_Callsign->isChecked() ? CInterpolationSetupComponent::SetupPerCallsign : CInterpolationSetupComponent::SetupGlobal;
}
void CInterpolationSetupComponent::onRowDoubleClicked(const QModelIndex &index)
@@ -89,7 +89,7 @@ namespace BlackGui
{
if (!sGui || sGui->isShuttingDown()) { return; }
bool enableCallsign = false;
if (this->getSetupMode() == CInterpolationSetupComponent::Global)
if (this->getSetupMode() == CInterpolationSetupComponent::SetupGlobal)
{
this->setUiValuesFromGlobal();
}
@@ -111,7 +111,7 @@ namespace BlackGui
{
const bool overlay = QObject::sender() == ui->pb_Reload;
if (!this->checkPrerequisites(overlay)) { return; }
if (this->getSetupMode() == CInterpolationSetupComponent::Global)
if (this->getSetupMode() == CInterpolationSetupComponent::SetupGlobal)
{
CInterpolationAndRenderingSetupGlobal gs = sGui->getIContextSimulator()->getInterpolationAndRenderingSetupGlobal();
ui->form_InterpolationSetup->setValue(gs);
@@ -130,7 +130,7 @@ namespace BlackGui
if (!this->checkPrerequisites(true)) { return; }
CInterpolationAndRenderingSetupPerCallsign setup = ui->form_InterpolationSetup->getValue();
CInterpolationAndRenderingSetupGlobal gs = sGui->getIContextSimulator()->getInterpolationAndRenderingSetupGlobal();
if (this->getSetupMode() == CInterpolationSetupComponent::Global)
if (this->getSetupMode() == CInterpolationSetupComponent::SetupGlobal)
{
gs.setBaseValues(setup);
gs.setLogInterpolation(false); // that would globally log all values
@@ -175,7 +175,7 @@ namespace BlackGui
void CInterpolationSetupComponent::removeSetup()
{
if (!this->checkPrerequisites(true)) { return; }
if (this->getSetupMode() == CInterpolationSetupComponent::Global) { return; }
if (this->getSetupMode() == CInterpolationSetupComponent::SetupGlobal) { return; }
const CCallsign cs = ui->comp_CallsignCompleter->getCallsign(false);
CInterpolationSetupList setups = ui->tvp_InterpolationSetup->container();
const int removed = setups.removeByCallsign(cs);

View File

@@ -32,8 +32,8 @@ namespace BlackGui
//! Mode of setup
enum Mode
{
Global,
PerCallsign
SetupGlobal,
SetupPerCallsign
};
//! Constructor

View File

@@ -100,16 +100,29 @@
</layout>
</widget>
</item>
<item>
<item alignment="Qt::AlignTop">
<widget class="BlackGui::Editors::CInterpolationSetupForm" name="form_InterpolationSetup">
<property name="minimumSize">
<size>
<width>0</width>
<height>100</height>
<height>110</height>
</size>
</property>
</widget>
</item>
<item>
<spacer name="vs_InterpolationSetupComponent">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QFrame" name="fr_Buttons">
<layout class="QHBoxLayout" name="hl_Buttons">

View File

@@ -45,7 +45,7 @@ namespace BlackGui
ui->cb_DebugDriver->setChecked(setup.showSimulatorDebugMessages());
ui->cb_LogInterpolation->setChecked(setup.logInterpolation());
ui->cb_EnableParts->setChecked(setup.isAircraftPartsEnabled());
ui->cb_ForceVtolInterpolation->setChecked(setup.isForcingVtolInterpolation());
ui->cb_ForceFullInterpolation->setChecked(setup.isForcingFullInterpolation());
ui->cb_SendGndFlagToSim->setChecked(setup.isSendingGndFlagToSimulator());
ui->cb_FixSceneryOffset->setChecked(setup.isFixingSceneryOffset());
ui->le_PitchOnGround->setText(setup.getPitchOnGround().valueRoundedWithUnit(CAngleUnit::deg()));
@@ -56,7 +56,7 @@ namespace BlackGui
{
CInterpolationAndRenderingSetupPerCallsign setup;
setup.setEnabledAircraftParts(ui->cb_EnableParts->isChecked());
setup.setForceVtolInterpolation(ui->cb_ForceVtolInterpolation->isChecked());
setup.setForceFullInterpolation(ui->cb_ForceFullInterpolation->isChecked());
setup.setLogInterpolation(ui->cb_LogInterpolation->isChecked());
setup.setSendingGndFlagToSimulator(ui->cb_SendGndFlagToSim->isChecked());
setup.setSimulatorDebuggingMessages(ui->cb_DebugDriver->isChecked());
@@ -70,7 +70,7 @@ namespace BlackGui
CGuiUtility::checkBoxReadOnly(ui->cb_DebugDriver, readonly);
CGuiUtility::checkBoxReadOnly(ui->cb_LogInterpolation, readonly);
CGuiUtility::checkBoxReadOnly(ui->cb_EnableParts, readonly);
CGuiUtility::checkBoxReadOnly(ui->cb_ForceVtolInterpolation, readonly);
CGuiUtility::checkBoxReadOnly(ui->cb_ForceFullInterpolation, readonly);
CGuiUtility::checkBoxReadOnly(ui->cb_SendGndFlagToSim, readonly);
CGuiUtility::checkBoxReadOnly(ui->cb_FixSceneryOffset, readonly);
ui->rb_Linear->setEnabled(!readonly);

View File

@@ -51,9 +51,9 @@
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="cb_ForceVtolInterpolation">
<widget class="QCheckBox" name="cb_ForceFullInterpolation">
<property name="text">
<string>force VTOL interpolation</string>
<string>force full interpolation</string>
</property>
</widget>
</item>
@@ -168,10 +168,11 @@
<tabstops>
<tabstop>rb_Spline</tabstop>
<tabstop>rb_Linear</tabstop>
<tabstop>le_PitchOnGround</tabstop>
<tabstop>cb_EnableParts</tabstop>
<tabstop>cb_SendGndFlagToSim</tabstop>
<tabstop>cb_FixSceneryOffset</tabstop>
<tabstop>cb_ForceVtolInterpolation</tabstop>
<tabstop>cb_ForceFullInterpolation</tabstop>
<tabstop>cb_LogInterpolation</tabstop>
<tabstop>cb_DebugDriver</tabstop>
</tabstops>

View File

@@ -29,7 +29,7 @@ namespace BlackGui
m_columns.addColumn(CColumn("parts", "aircraft parts", CInterpolationAndRenderingSetupPerCallsign::IndexEnabledAircraftParts, new CBoolIconFormatter("parts", "aircraft parts")));
m_columns.addColumn(CColumn("send gnd.", "send gnd.", CInterpolationAndRenderingSetupPerCallsign::IndexSendGndFlagToSimulator, new CBoolIconFormatter("send gnd.", "send gnd.")));
m_columns.addColumn(CColumn("sc.os.", "fix scenery offset", CInterpolationAndRenderingSetupPerCallsign::IndexFixSceneryOffset, new CBoolIconFormatter("sc.os.", "fix scenery offset")));
m_columns.addColumn(CColumn("VTOL", "VTOL interpolstion", CInterpolationAndRenderingSetupPerCallsign::IndexForceVtolInterpolation, new CBoolIconFormatter("VTOL", "VTOL interpolation")));
m_columns.addColumn(CColumn("full int.", "full interpolation", CInterpolationAndRenderingSetupPerCallsign::IndexForceFullInterpolation, new CBoolIconFormatter("full int.", "full interpolation")));
m_columns.addColumn(CColumn("sim.dbg.", "simulator debug", CInterpolationAndRenderingSetupPerCallsign::IndexSimulatorDebugMessages, new CBoolIconFormatter("sim.dbg.", "simulator debug")));
m_columns.addColumn(CColumn("log.int.", "log.interpolation", CInterpolationAndRenderingSetupPerCallsign::IndexLogInterpolation, new CBoolIconFormatter("log.int.", "log.interpolation")));
// default sort order