From 9745bafd4e91bc1f10f93e4a9db7c32f3210a1aa Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Thu, 21 Feb 2019 18:56:13 +0100
Subject: [PATCH] Minor adjustments in interpolation setup

* scenery offset fix default is off
* renamings
---
 src/blackgui/components/interpolationsetupcomponent.cpp  | 6 ++++--
 src/blackgui/components/interpolationsetupcomponent.ui   | 6 +++---
 src/blackgui/editors/interpolationsetupform.ui           | 7 +++++--
 src/blackmisc/simulation/interpolationrenderingsetup.cpp | 3 ++-
 4 files changed, 14 insertions(+), 8 deletions(-)

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 @@
        </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/>
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 @@
    </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>
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)