Minor adjustments in interpolation setup

* scenery offset fix default is off
* renamings
This commit is contained in:
Klaus Basan
2019-02-21 18:56:13 +01:00
committed by Mat Sutcliffe
parent ec1dde412d
commit 9745bafd4e
4 changed files with 14 additions and 8 deletions

View File

@@ -35,7 +35,7 @@ namespace BlackGui
connect(ui->pb_RenderingSetup, &QPushButton::clicked, this, &CInterpolationSetupComponent::requestRenderingRestrictionsWidget);
connect(ui->pb_Save, &QPushButton::clicked, this, &CInterpolationSetupComponent::saveSetup);
connect(ui->pb_Delete, &QPushButton::clicked, this, &CInterpolationSetupComponent::removeOrResetSetup);
connect(ui->pb_DeleteOrReset, &QPushButton::clicked, this, &CInterpolationSetupComponent::removeOrResetSetup);
connect(ui->pb_Reload, &QPushButton::clicked, this, &CInterpolationSetupComponent::reloadSetup);
connect(ui->tvp_InterpolationSetup, &CInterpolationSetupView::doubleClicked, this, &CInterpolationSetupComponent::onRowDoubleClicked);
connect(ui->tvp_InterpolationSetup, &CInterpolationSetupView::modelChanged, this, &CInterpolationSetupComponent::onModelChanged, Qt::QueuedConnection);
@@ -98,7 +98,7 @@ namespace BlackGui
}
this->displaySetupsPerCallsign();
ui->comp_CallsignCompleter->setReadOnly(!enableCallsign);
ui->pb_Delete->setText(enableCallsign ? "delete" : "reset");
ui->pb_DeleteOrReset->setText(enableCallsign ? "delete" : "reset");
}
void CInterpolationSetupComponent::onModelChanged()
@@ -179,12 +179,14 @@ namespace BlackGui
if (!this->checkPrerequisites(!global, true)) { }
if (global)
{
// reset
CInterpolationAndRenderingSetupGlobal gs;
sGui->getIContextSimulator()->setInterpolationAndRenderingSetupGlobal(gs);
this->reloadSetup();
}
else
{
// delete/remove
const CCallsign cs = ui->comp_CallsignCompleter->getCallsign(false);
CInterpolationSetupList setups = ui->tvp_InterpolationSetup->container();
const int removed = setups.removeByCallsign(cs);

View File

@@ -172,9 +172,9 @@
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_Delete">
<widget class="QPushButton" name="pb_DeleteOrReset">
<property name="text">
<string>delete</string>
<string>delete/reset</string>
</property>
</widget>
</item>
@@ -216,7 +216,7 @@
<tabstop>pb_Reload</tabstop>
<tabstop>cb_IgnoreGlobal</tabstop>
<tabstop>pb_RenderingSetup</tabstop>
<tabstop>pb_Delete</tabstop>
<tabstop>pb_DeleteOrReset</tabstop>
<tabstop>pb_Save</tabstop>
</tabstops>
<resources/>

View File

@@ -59,11 +59,14 @@
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="cb_FixSceneryOffset">
<property name="toolTip">
<string>experimental feature to fix offset values</string>
</property>
<property name="text">
<string>fix scenery offset</string>
<string>fix scenery offset (exp.)</string>
</property>
<property name="checked">
<bool>true</bool>
<bool>false</bool>
</property>
</widget>
</item>

View File

@@ -24,7 +24,8 @@ namespace BlackMisc
{
CInterpolationAndRenderingSetupBase::CInterpolationAndRenderingSetupBase()
{
m_fixSceneryOffset = CBuildConfig::isLocalDeveloperDebugBuild();
// Experimental
// m_fixSceneryOffset = CBuildConfig::isLocalDeveloperDebugBuild();
}
bool CInterpolationAndRenderingSetupBase::setSendingGndFlagToSimulator(bool sendFLag)