From 94dde1b9fb0d80f885220f450c5d7c7026ab30f5 Mon Sep 17 00:00:00 2001
From: Wanderer Fan <wandererfan@gmail.com>
Date: Fri, 15 Jul 2022 22:38:08 -0400
Subject: [PATCH] [TD]fix ext line gap preference

---
 src/Mod/TechDraw/App/Preferences.cpp                   | 8 ++++----
 src/Mod/TechDraw/App/Preferences.h                     | 4 ++--
 src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui     | 4 ++--
 src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp | 8 ++++----
 src/Mod/TechDraw/Gui/ViewProviderDimension.cpp         | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Mod/TechDraw/App/Preferences.cpp b/src/Mod/TechDraw/App/Preferences.cpp
index 9f0050d581..0ac0fef953 100644
--- a/src/Mod/TechDraw/App/Preferences.cpp
+++ b/src/Mod/TechDraw/App/Preferences.cpp
@@ -320,20 +320,20 @@ std::string Preferences::bitmapFill(void)
     return result;
 }
 
-double Preferences::ISOGap()
+double Preferences::GapISO()
 {
     Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
                                          .GetGroup("BaseApp")->GetGroup("Preferences")->
                                          GetGroup("Mod/TechDraw/Dimensions");
-    double factor = hGrp->GetFloat("ISOGap", 8.0);
+    double factor = hGrp->GetFloat("GapISO", 8.0);
     return factor;
 }
 
-double Preferences::ASMEGap()
+double Preferences::GapASME()
 {
     Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
                                          .GetGroup("BaseApp")->GetGroup("Preferences")->
                                          GetGroup("Mod/TechDraw/Dimensions");
-    double factor = hGrp->GetFloat("ASMEGap", 6.0);
+    double factor = hGrp->GetFloat("GapASME", 6.0);
     return factor;
 }
diff --git a/src/Mod/TechDraw/App/Preferences.h b/src/Mod/TechDraw/App/Preferences.h
index 96a4d9f1ae..0e02796455 100644
--- a/src/Mod/TechDraw/App/Preferences.h
+++ b/src/Mod/TechDraw/App/Preferences.h
@@ -76,8 +76,8 @@ static std::string patFile();
 
 static std::string bitmapFill(void);
 
-static double      ISOGap();
-static double      ASMEGap();
+static double      GapISO();
+static double      GapASME();
 
 };
 
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui
index 3f639dd3ed..399e2ae43e 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui
@@ -517,7 +517,7 @@ Multiplier of 'Font Size'</string>
          </widget>
         </item>
         <item row="9" column="2">
-         <widget class="Gui::PrefDoubleSpinBox" name="pdsbISOGap">
+         <widget class="Gui::PrefDoubleSpinBox" name="pdsbGapISO">
           <property name="toolTip">
            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls the size of gap between dimension point and start of extension line for ISO dimensions. Value * linewidth is the gap.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
@@ -536,7 +536,7 @@ Multiplier of 'Font Size'</string>
          </widget>
         </item>
         <item row="10" column="2">
-         <widget class="Gui::PrefDoubleSpinBox" name="pdsbASMEGap">
+         <widget class="Gui::PrefDoubleSpinBox" name="pdsbGapASME">
           <property name="toolTip">
            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Controls the size of gap between dimension point and start of extension line for ASME dimensions. Value * linewidth is the gap.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp
index edbf181bdc..6c2ea69ca2 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp
@@ -69,8 +69,8 @@ void DlgPrefsTechDrawDimensionsImp::saveSettings()
     ui->pcbArrow->onSave();
     ui->plsb_ArrowSize->onSave();
     ui->leFormatSpec->onSave();
-    ui->pdsbISOGap->onSave();
-    ui->pdsbASMEGap->onSave();
+    ui->pdsbGapISO->onSave();
+    ui->pdsbGapASME->onSave();
 }
 
 void DlgPrefsTechDrawDimensionsImp::loadSettings()
@@ -100,8 +100,8 @@ void DlgPrefsTechDrawDimensionsImp::loadSettings()
     ui->leFormatSpec->setText(Base::Tools::fromStdString(Preferences::formatSpec()));
     ui->leFormatSpec->onRestore();
 
-    ui->pdsbISOGap->onRestore();
-    ui->pdsbASMEGap->onRestore();
+    ui->pdsbGapISO->onRestore();
+    ui->pdsbGapASME->onRestore();
 }
 
 /**
diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp
index a4adad8ee7..eeefcb7fb7 100644
--- a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp
@@ -81,9 +81,9 @@ ViewProviderDimension::ViewProviderDimension()
     RenderingExtent.setEnums(RenderingExtentEnums);
     ADD_PROPERTY_TYPE(FlipArrowheads, (false), group, App::Prop_None,
                                           "Reverses usual direction of dimension line terminators");
-    ADD_PROPERTY_TYPE(GapFactorISO, (Preferences::ISOGap()), group, App::Prop_None,
+    ADD_PROPERTY_TYPE(GapFactorISO, (Preferences::GapISO()), group, App::Prop_None,
                       "Adjusts the gap between dimension point and extension line");
-    ADD_PROPERTY_TYPE(GapFactorASME, (Preferences::ASMEGap()), group, App::Prop_None,
+    ADD_PROPERTY_TYPE(GapFactorASME, (Preferences::GapASME()), group, App::Prop_None,
                       "Adjusts the gap between dimension point and extension line");
 }