diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index d483fd84f5..6c5145049a 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -61,8 +61,7 @@ from draftutils.utils import (type_check, set_param, setParam, precision, - tolerance, - epsilon) + tolerance) from draftutils.utils import (get_real_name, getRealName, diff --git a/src/Mod/Draft/Resources/ui/preferences-draft.ui b/src/Mod/Draft/Resources/ui/preferences-draft.ui index af02328880..c7f5dd2051 100644 --- a/src/Mod/Draft/Resources/ui/preferences-draft.ui +++ b/src/Mod/Draft/Resources/ui/preferences-draft.ui @@ -135,59 +135,6 @@ - - - - - - Tolerance - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 60 - 16777215 - - - - This is the value used by functions that use a tolerance. -Values with differences below this value will be treated as same. This value will be obsoleted soon so the precision level above controls both. - - - - - - 0.010000000000000 - - - 0.050000000000000 - - - tolerance - - - Mod/Draft - - - - - diff --git a/src/Mod/Draft/draftutils/utils.py b/src/Mod/Draft/draftutils/utils.py index 7b8deeaa5b..37c3b7fb0d 100644 --- a/src/Mod/Draft/draftutils/utils.py +++ b/src/Mod/Draft/draftutils/utils.py @@ -177,8 +177,7 @@ def get_param_type(param): "FontFile", "ClonePrefix", "overrideUnit", "labeltype", "gridSpacing") or "inCommandShortcut" in param: return "string" - elif param in ("textheight", "tolerance", - "arrowsize", "extlines", "dimspacing", + elif param in ("textheight", "arrowsize", "extlines", "dimspacing", "dimovershoot", "extovershoot", "HatchPatternSize"): return "float" elif param in ("selectBaseObjects", "alwaysSnap", "grid", @@ -345,38 +344,14 @@ def precision(): def tolerance(): - """Return the tolerance value from the parameter database. - - This specifies a tolerance around a quantity. - :: - value + tolerance - value - tolerance - - By default the tolerance is 0.05. + """Return a tolerance based on the precision() value Returns ------- float - get_param("tolerance", 0.05) + 10 ** -precision() """ - return getParam("tolerance", 0.05) - - -def epsilon(): - """Return a small number based on the tolerance for use in comparisons. - - The epsilon value is used in floating point comparisons. Use with caution. - :: - denom = 10**tolerance - num = 1 - epsilon = num/denom - - Returns - ------- - float - 1/(10**tolerance) - """ - return 1.0/(10.0**tolerance()) + return 10 ** -precision() def get_real_name(name):