diff --git a/src/blackgui/components/interpolationsetupcomponent.cpp b/src/blackgui/components/interpolationsetupcomponent.cpp
index d197341e7..95633592f 100644
--- a/src/blackgui/components/interpolationsetupcomponent.cpp
+++ b/src/blackgui/components/interpolationsetupcomponent.cpp
@@ -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);
diff --git a/src/blackgui/components/interpolationsetupcomponent.ui b/src/blackgui/components/interpolationsetupcomponent.ui
index 93c44835b..d1a7d4be5 100644
--- a/src/blackgui/components/interpolationsetupcomponent.ui
+++ b/src/blackgui/components/interpolationsetupcomponent.ui
@@ -172,9 +172,9 @@
-
-
+
- delete
+ delete/reset
@@ -216,7 +216,7 @@
pb_Reload
cb_IgnoreGlobal
pb_RenderingSetup
- pb_Delete
+ pb_DeleteOrReset
pb_Save
diff --git a/src/blackgui/editors/interpolationsetupform.ui b/src/blackgui/editors/interpolationsetupform.ui
index 7cdc371d7..58da8428b 100644
--- a/src/blackgui/editors/interpolationsetupform.ui
+++ b/src/blackgui/editors/interpolationsetupform.ui
@@ -59,11 +59,14 @@
-
+
+ experimental feature to fix offset values
+
- fix scenery offset
+ fix scenery offset (exp.)
- true
+ false
diff --git a/src/blackmisc/simulation/interpolationrenderingsetup.cpp b/src/blackmisc/simulation/interpolationrenderingsetup.cpp
index 13c85ed6c..82fa2bca3 100644
--- a/src/blackmisc/simulation/interpolationrenderingsetup.cpp
+++ b/src/blackmisc/simulation/interpolationrenderingsetup.cpp
@@ -24,7 +24,8 @@ namespace BlackMisc
{
CInterpolationAndRenderingSetupBase::CInterpolationAndRenderingSetupBase()
{
- m_fixSceneryOffset = CBuildConfig::isLocalDeveloperDebugBuild();
+ // Experimental
+ // m_fixSceneryOffset = CBuildConfig::isLocalDeveloperDebugBuild();
}
bool CInterpolationAndRenderingSetupBase::setSendingGndFlagToSimulator(bool sendFLag)