From 152ecf2df9eec8f119bd5dff0834f45d093ffc2a Mon Sep 17 00:00:00 2001
From: jriegel <FreeCAD@juergen-riegel.net>
Date: Sat, 21 Dec 2013 19:15:28 +0100
Subject: [PATCH] More choices in Sketcher grid and later switching to um

---
 src/Base/UnitsSchemaInternal.cpp             |  2 +-
 src/Base/UnitsSchemaMKS.cpp                  |  2 +-
 src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Base/UnitsSchemaInternal.cpp b/src/Base/UnitsSchemaInternal.cpp
index d4c9e7d3a325..dff0a03288e0 100644
--- a/src/Base/UnitsSchemaInternal.cpp
+++ b/src/Base/UnitsSchemaInternal.cpp
@@ -49,7 +49,7 @@ QString UnitsSchemaInternal::schemaTranslate(Base::Quantity quant,double &factor
         }else if(UnitValue < 0.001){
             unitString = QString::fromLatin1("nm");
             factor = 0.000001;
-        }else if(UnitValue < 1.0){
+        }else if(UnitValue < 0.1){
             unitString = QString::fromUtf8("\xC2\xB5m");
             factor = 0.001;
         }else if(UnitValue < 10000.0){
diff --git a/src/Base/UnitsSchemaMKS.cpp b/src/Base/UnitsSchemaMKS.cpp
index 573f58765171..461dc912465e 100644
--- a/src/Base/UnitsSchemaMKS.cpp
+++ b/src/Base/UnitsSchemaMKS.cpp
@@ -48,7 +48,7 @@ QString UnitsSchemaMKS::schemaTranslate(Base::Quantity quant,double &factor,QStr
         }else if(UnitValue < 0.001){
             unitString = QString::fromLatin1("nm");
             factor = 0.000001;
-        }else if(UnitValue < 1.0){
+        }else if(UnitValue < 0.1){
             unitString = QString::fromUtf8("\xC2\xB5m");
             factor = 0.001;
         }else if(UnitValue < 100.0){
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
index 45d21675455b..e15aaa319041 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
@@ -135,6 +135,12 @@ void TaskSketcherGeneral::fillGridCombo(void)
 
         ui->comboBoxGridSize->setCurrentIndex(ui->comboBoxGridSize->findText(QString::fromUtf8("1/4 \"")));
     }else{
+        ui->comboBoxGridSize->addItem(QString::fromUtf8("1 \xC2\xB5m"));
+        ui->comboBoxGridSize->addItem(QString::fromUtf8("2 \xC2\xB5m"));
+        ui->comboBoxGridSize->addItem(QString::fromUtf8("5 \xC2\xB5m"));
+        ui->comboBoxGridSize->addItem(QString::fromUtf8("10 \xC2\xB5m"));
+        ui->comboBoxGridSize->addItem(QString::fromUtf8("20 \xC2\xB5m"));
+        ui->comboBoxGridSize->addItem(QString::fromUtf8("50 \xC2\xB5m"));
         ui->comboBoxGridSize->addItem(QString::fromUtf8("0.1 mm"));
         ui->comboBoxGridSize->addItem(QString::fromUtf8("0.2 mm"));
         ui->comboBoxGridSize->addItem(QString::fromUtf8("0.5 mm"));
@@ -149,6 +155,14 @@ void TaskSketcherGeneral::fillGridCombo(void)
         ui->comboBoxGridSize->addItem(QString::fromUtf8("500 mm"));
         ui->comboBoxGridSize->addItem(QString::fromUtf8("1 m"));
         ui->comboBoxGridSize->addItem(QString::fromUtf8("2 m"));
+        ui->comboBoxGridSize->addItem(QString::fromUtf8("5 m"));
+        ui->comboBoxGridSize->addItem(QString::fromUtf8("10 m"));
+        ui->comboBoxGridSize->addItem(QString::fromUtf8("20 m"));
+        ui->comboBoxGridSize->addItem(QString::fromUtf8("50 m"));
+        ui->comboBoxGridSize->addItem(QString::fromUtf8("100 m"));
+        ui->comboBoxGridSize->addItem(QString::fromUtf8("200 m"));
+        ui->comboBoxGridSize->addItem(QString::fromUtf8("500 m"));
+
 
         ui->comboBoxGridSize->setCurrentIndex(ui->comboBoxGridSize->findText(QString::fromUtf8("10 mm")));
     }