From 00a11a63665016c8522e202a182143a5bb8c26d9 Mon Sep 17 00:00:00 2001
From: hokieengr <email.customs+git@gmail.com>
Date: Wed, 12 Sep 2018 13:52:06 -0400
Subject: [PATCH] Added option to select minimum fractional inch displayed

Load/save operation complete. Not yet integrated with the display code.
Also would like to disable option when non supported (those not using
fractional inches) are selected.
---
 src/Gui/DlgSettingsUnits.ui     | 121 +++++++++++++++++++++++---------
 src/Gui/DlgSettingsUnitsImp.cpp |  10 +++
 2 files changed, 97 insertions(+), 34 deletions(-)

diff --git a/src/Gui/DlgSettingsUnits.ui b/src/Gui/DlgSettingsUnits.ui
index 4d74ec8bf2..62183c6ae8 100644
--- a/src/Gui/DlgSettingsUnits.ui
+++ b/src/Gui/DlgSettingsUnits.ui
@@ -20,6 +20,40 @@
       <string>Units settings</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
+      <item row="4" column="0">
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>79</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QLabel" name="label_2">
+          <property name="text">
+           <string>Number of decimals:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="spinBoxDecimals">
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>12</number>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
       <item row="0" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
@@ -70,28 +104,7 @@
         </item>
        </layout>
       </item>
-      <item row="1" column="0">
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QLabel" name="label_2">
-          <property name="text">
-           <string>Number of decimals:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="spinBoxDecimals">
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="maximum">
-           <number>12</number>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="2" column="0">
+      <item row="3" column="0">
        <widget class="QTableWidget" name="tableWidget">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
@@ -114,18 +127,58 @@
         </column>
        </widget>
       </item>
-      <item row="3" column="0">
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>79</height>
-         </size>
-        </property>
-       </spacer>
+      <item row="2" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QLabel" name="label_3">
+          <property name="text">
+           <string>Minimum fractional inch:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="comboBox_FracInch">
+          <property name="toolTip">
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Minimum fractional inch to display.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <item>
+           <property name="text">
+            <string>1/2&quot;</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>1/4&quot;</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>1/8&quot;</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>1/16&quot;</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>1/32&quot;</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>1/64&quot;</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>1/128&quot;</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+       </layout>
       </item>
      </layout>
     </widget>
diff --git a/src/Gui/DlgSettingsUnitsImp.cpp b/src/Gui/DlgSettingsUnitsImp.cpp
index 5022bfb5f5..7b735f7886 100644
--- a/src/Gui/DlgSettingsUnitsImp.cpp
+++ b/src/Gui/DlgSettingsUnitsImp.cpp
@@ -80,7 +80,16 @@ void DlgSettingsUnitsImp::saveSettings()
         ("User parameter:BaseApp/Preferences/Units");
     hGrp->SetInt("UserSchema", ui->comboBox_ViewSystem->currentIndex());
     hGrp->SetInt("Decimals", ui->spinBoxDecimals->value());
+    hGrp->SetInt("FracInchIndex", ui->comboBox_FracInch->currentIndex());
+
+    // Set actual value
     Base::UnitsApi::setDecimals(ui->spinBoxDecimals->value());
+    
+    // Convert the combobox index to the its integer denominator. Currently
+    // with 1/2, 1/4, through 1/128, this little equation directly computes the
+    // denominator given the combobox integer.
+    int minFracInch = std::pow(2, ui->comboBox_FracInch->currentIndex() + 1);
+    hGrp->SetInt("minFracInch", minFracInch);
 }
 
 void DlgSettingsUnitsImp::loadSettings()
@@ -89,6 +98,7 @@ void DlgSettingsUnitsImp::loadSettings()
         ("User parameter:BaseApp/Preferences/Units");
     ui->comboBox_ViewSystem->setCurrentIndex(hGrp->GetInt("UserSchema",0));
     ui->spinBoxDecimals->setValue(hGrp->GetInt("Decimals",Base::UnitsApi::getDecimals()));
+    ui->comboBox_FracInch->setCurrentIndex(hGrp->GetInt("FracInchIndex",2)); // 2==1/8"
 }
 
 /**