From 3370d0902acd638e8627fc3a1955aad3d392f73e Mon Sep 17 00:00:00 2001
From: wandererfan <wandererfan@gmail.com>
Date: Fri, 22 Mar 2019 11:53:58 -0400
Subject: [PATCH] Add Preference for Dimension Format

---
 src/Mod/TechDraw/App/DrawViewDimension.cpp    | 46 ++++++-----
 src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui     | 77 ++++++++++++++++---
 src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.cpp |  2 +
 3 files changed, 94 insertions(+), 31 deletions(-)

diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp
index 6586fdf2ce..7153801895 100644
--- a/src/Mod/TechDraw/App/DrawViewDimension.cpp
+++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp
@@ -427,9 +427,8 @@ App::DocumentObjectExecReturn *DrawViewDimension::execute(void)
     }
 
     //TODO: if MeasureType = Projected and the Projected shape changes, the Dimension may become invalid (see tilted Cube example)
-    requestPaint();
 
-    return App::DocumentObject::execute();
+    return DrawView::execute();
 }
 
 std::string  DrawViewDimension::getFormatedValue(bool obtuse)
@@ -502,13 +501,15 @@ std::string  DrawViewDimension::getFormatedValue(bool obtuse)
         pos = 0;
         if ((pos = rxFormat.indexIn(specStr, 0)) != -1)  {
             match = rxFormat.cap(0);                                          //entire capture of rx
-
     #if QT_VERSION >= 0x050000
             specVal = QString::asprintf(Base::Tools::toStdString(match).c_str(),userValNum);
     #else
             QString qs2;
             specVal = qs2.sprintf(Base::Tools::toStdString(match).c_str(),userValNum);
     #endif
+        } else {       //printf format not found!
+            Base::Console().Warning("Warning - no numeric format in formatSpec - %s\n",getNameInDocument());
+            return Base::Tools::toStdString(specStr);
         }
 
         QString repl = userVal;
@@ -978,23 +979,30 @@ std::string DrawViewDimension::getDefaultFormatSpec() const
 {
     Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
                                          .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Dimensions");
-    QString format1 = Base::Tools::fromStdString("%.");
-    QString format2 = Base::Tools::fromStdString("f");
-    int precision;
-    if (useDecimals()) {
-        precision = Base::UnitsApi::getDecimals();
-    } else {
-        precision = hGrp->GetInt("AltDecimals", 2);
-    }
-    QString formatPrecision = QString::number(precision);
-    
-    std::string prefix = getPrefix();
-    QString qPrefix;
-    if (!prefix.empty()) {
-        qPrefix = QString::fromUtf8(prefix.data(),prefix.size());
-    }
+    std::string prefFormat = hGrp->GetASCII("formatSpec","");
+    QString formatSpec;
+    if (prefFormat.empty()) {
+        QString format1 = Base::Tools::fromStdString("%.");
+        QString format2 = Base::Tools::fromStdString("f");
+        int precision;
+        if (useDecimals()) {
+            precision = Base::UnitsApi::getDecimals();
+        } else {
+            precision = hGrp->GetInt("AltDecimals", 2);
+        }
+        QString formatPrecision = QString::number(precision);
 
-    QString formatSpec = qPrefix + format1 + formatPrecision + format2;
+        std::string prefix = getPrefix();
+        QString qPrefix;
+        if (!prefix.empty()) {
+            qPrefix = QString::fromUtf8(prefix.data(),prefix.size());
+        }
+
+        formatSpec = qPrefix + format1 + formatPrecision + format2;
+    } else {
+        return prefFormat;
+    }
+    
     return Base::Tools::toStdString(formatSpec);
 }
 
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui
index 19ff21ce83..ce28bd9d58 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>521</width>
-    <height>732</height>
+    <height>771</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -24,6 +24,9 @@
        <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0">
         <item row="0" column="0">
          <widget class="Gui::PrefCheckBox" name="cbShowUnits">
+          <property name="toolTip">
+           <string>Append unit to Dimension text</string>
+          </property>
           <property name="text">
            <string>Show Units</string>
           </property>
@@ -35,15 +38,18 @@
           </property>
          </widget>
         </item>
-        <item row="4" column="0">
+        <item row="5" column="0">
          <widget class="QLabel" name="label_3">
           <property name="text">
            <string>Color</string>
           </property>
          </widget>
         </item>
-        <item row="4" column="2">
+        <item row="5" column="2">
          <widget class="Gui::PrefColorButton" name="colDimColor">
+          <property name="toolTip">
+           <string>Dimension text color</string>
+          </property>
           <property name="color">
            <color>
             <red>0</red>
@@ -59,14 +65,14 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="0">
+        <item row="4" column="0">
          <widget class="QLabel" name="label_2">
           <property name="text">
            <string>Font Size</string>
           </property>
          </widget>
         </item>
-        <item row="3" column="1">
+        <item row="4" column="1">
          <spacer name="horizontalSpacer">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
@@ -86,27 +92,30 @@
           </property>
          </widget>
         </item>
-        <item row="7" column="0">
+        <item row="8" column="0">
          <widget class="QLabel" name="label_12">
           <property name="text">
            <string>Arrow Size</string>
           </property>
          </widget>
         </item>
-        <item row="5" column="0">
+        <item row="6" column="0">
          <widget class="QLabel" name="label_8">
           <property name="text">
            <string>Diameter Symbol</string>
           </property>
          </widget>
         </item>
-        <item row="5" column="2">
+        <item row="6" column="2">
          <widget class="Gui::PrefLineEdit" name="leDiameter">
           <property name="font">
            <font>
             <pointsize>12</pointsize>
            </font>
           </property>
+          <property name="toolTip">
+           <string>Character to use to indicate Diameter dimension</string>
+          </property>
           <property name="text">
            <string>⌀</string>
           </property>
@@ -123,6 +132,9 @@
         </item>
         <item row="1" column="0">
          <widget class="Gui::PrefCheckBox" name="cbGlobalDecimals">
+          <property name="toolTip">
+           <string>Use system setting for decimal places.</string>
+          </property>
           <property name="text">
            <string>Use Global Decimals</string>
           </property>
@@ -137,7 +149,7 @@
           </property>
          </widget>
         </item>
-        <item row="6" column="2">
+        <item row="7" column="2">
          <widget class="Gui::PrefComboBox" name="pcbArrow">
           <property name="toolTip">
            <string>Preferred arrowhead style</string>
@@ -206,7 +218,7 @@
           </item>
          </widget>
         </item>
-        <item row="6" column="0">
+        <item row="7" column="0">
          <widget class="QLabel" name="label_9">
           <property name="text">
            <string>Arrow Style</string>
@@ -215,6 +227,9 @@
         </item>
         <item row="2" column="2">
          <widget class="Gui::PrefSpinBox" name="sbAltDecimals">
+          <property name="toolTip">
+           <string>Number of decimal places if not using Global Decimals</string>
+          </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
@@ -229,7 +244,7 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="2">
+        <item row="4" column="2">
          <widget class="Gui::PrefUnitSpinBox" name="plsb_FontSize">
           <property name="toolTip">
            <string>Dimension font size in units</string>
@@ -245,7 +260,7 @@
           </property>
          </widget>
         </item>
-        <item row="7" column="2">
+        <item row="8" column="2">
          <widget class="Gui::PrefUnitSpinBox" name="plsb_ArrowSize">
           <property name="toolTip">
            <string>Dimension arrowhead size in units</string>
@@ -261,6 +276,26 @@
           </property>
          </widget>
         </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_15">
+          <property name="text">
+           <string>Default Format</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="2">
+         <widget class="Gui::PrefLineEdit" name="leformatSpec">
+          <property name="toolTip">
+           <string>Custom format for Dimension text</string>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>formatSpec</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>/Mod/TechDraw/Dimensions</cstring>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
      </layout>
@@ -276,6 +311,9 @@
        <layout class="QGridLayout" name="gridLayout_2" columnstretch="1,0,0">
         <item row="3" column="2">
          <widget class="Gui::PrefColorButton" name="colCenterLine">
+          <property name="toolTip">
+           <string>Color for centerlines</string>
+          </property>
           <property name="color">
            <color>
             <red>175</red>
@@ -316,6 +354,9 @@
         </item>
         <item row="1" column="2">
          <widget class="Gui::PrefComboBox" name="pcbMatting">
+          <property name="toolTip">
+           <string>Round or Square outline in Detail view</string>
+          </property>
           <property name="prefEntry" stdset="0">
            <cstring>MattingStyle</cstring>
           </property>
@@ -357,6 +398,9 @@
         </item>
         <item row="2" column="2">
          <widget class="Gui::PrefComboBox" name="pcbCenterStyle">
+          <property name="toolTip">
+           <string>Line type for centerlines</string>
+          </property>
           <property name="currentIndex">
            <number>2</number>
           </property>
@@ -457,6 +501,9 @@
         </item>
         <item row="5" column="2">
          <widget class="Gui::PrefColorButton" name="colSectionLine">
+          <property name="toolTip">
+           <string>Line color for sectionlines</string>
+          </property>
           <property name="color">
            <color>
             <red>175</red>
@@ -494,6 +541,9 @@
         </item>
         <item row="0" column="2">
          <widget class="Gui::PrefLineEdit" name="leLineGroup">
+          <property name="toolTip">
+           <string>Name of entry in LineGroup CSV file</string>
+          </property>
           <property name="text">
            <string notr="true">FC 0.70mm</string>
           </property>
@@ -514,6 +564,9 @@
         </item>
         <item row="7" column="2">
          <widget class="Gui::PrefColorButton" name="pcb_VertexColor">
+          <property name="toolTip">
+           <string>Vertex display color</string>
+          </property>
           <property name="color">
            <color>
             <red>150</red>
diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.cpp
index 4985f8272e..751b4436a7 100644
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.cpp
@@ -57,6 +57,7 @@ void DlgPrefsTechDraw2Imp::saveSettings()
     pcbArrow->onSave();
     cbGlobalDecimals->onSave();
     sbAltDecimals->onSave();
+    leformatSpec->onSave();
     plsb_ArrowSize->onSave();
     leLineGroup->onSave();
     pdsb_VertexScale->onSave();
@@ -77,6 +78,7 @@ void DlgPrefsTechDraw2Imp::loadSettings()
     pcbArrow->onRestore();
     cbGlobalDecimals->onRestore();
     sbAltDecimals->onRestore();
+    leformatSpec->onRestore();
     plsb_ArrowSize->onRestore();
     leLineGroup->onRestore();
     pdsb_VertexScale->onRestore();