From 97a2b516bb0a77b04e0a1984fc3644f4f313e135 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Wed, 13 Nov 2013 11:12:02 +0100
Subject: [PATCH] Allow user to choose tolerance in validate sketch tool

---
 .../Sketcher/Gui/TaskSketcherValidation.cpp    | 18 +++++++++++++++++-
 src/Mod/Sketcher/Gui/TaskSketcherValidation.ui | 14 ++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
index 31a2a64d4..bd5dbc58d 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
@@ -25,6 +25,7 @@
 
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <QLocale>
 # include <QMessageBox>
 # include <Inventor/nodes/SoBaseColor.h>
 # include <Inventor/nodes/SoCoordinate3.h>
@@ -59,6 +60,21 @@ SketcherValidation::SketcherValidation(Sketcher::SketchObject* Obj, QWidget* par
 {
     ui->setupUi(this);
     ui->fixButton->setEnabled(false);
+    double tolerances[8] = {
+        Precision::Confusion() / 100,
+        Precision::Confusion() / 10,
+        Precision::Confusion(),
+        Precision::Confusion() * 10,
+        Precision::Confusion() * 100,
+        Precision::Confusion() * 1000,
+        Precision::Confusion() * 10000,
+        Precision::Confusion() * 100000
+    };
+
+    for (int i=0; i<8; i++) {
+        ui->comboBoxTolerance->addItem(QLocale::system().toString(tolerances[i]), QVariant(tolerances[i]));
+    }
+    ui->comboBoxTolerance->setCurrentIndex(5);
 }
 
 SketcherValidation::~SketcherValidation()
@@ -184,7 +200,7 @@ void SketcherValidation::on_findButton_clicked()
     }
 
     std::set<ConstraintIds, Constraint_Less> coincidences;
-    double prec = 0.001/*Precision::Confusion()*/;
+    double prec = ui->comboBoxTolerance->itemData(ui->comboBoxTolerance->currentIndex()).toDouble();
     std::sort(vertexIds.begin(), vertexIds.end(), Vertex_Less(prec));
     std::vector<VertexIds>::iterator vt = vertexIds.begin();
     Vertex_EqualTo pred(prec);
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherValidation.ui b/src/Mod/Sketcher/Gui/TaskSketcherValidation.ui
index aa3cde3f2..4c408ddb0 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.ui
+++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>242</width>
-    <height>75</height>
+    <height>137</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,13 +21,23 @@
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Tolerance:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="comboBoxTolerance"/>
+      </item>
+      <item row="1" column="0">
        <widget class="QPushButton" name="findButton">
         <property name="text">
          <string>Find</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
+      <item row="1" column="1">
        <widget class="QPushButton" name="fixButton">
         <property name="text">
          <string>Fix</string>