Merge 40c7c4290c into 0609c59676
This commit is contained in:
commit
04c888723d
1 changed files with 7 additions and 2 deletions
|
|
@ -2817,8 +2817,8 @@ def parseListOfPoints(s):
|
||||||
i = 0
|
i = 0
|
||||||
while i < len(nums):
|
while i < len(nums):
|
||||||
try:
|
try:
|
||||||
nums[i] = getcontext().create_decimal(nums[i])
|
nums[i] = getcontext().create_decimal(nums[i]).quantize(roundingQuantum)
|
||||||
nums[i + 1] = getcontext().create_decimal(nums[i + 1])
|
nums[i + 1] = getcontext().create_decimal(nums[i + 1]).quantize(roundingQuantum)
|
||||||
except InvalidOperation: # one of the lengths had a unit or is an invalid number
|
except InvalidOperation: # one of the lengths had a unit or is an invalid number
|
||||||
return []
|
return []
|
||||||
|
|
||||||
|
|
@ -3637,8 +3637,10 @@ def scourString(in_string, options=None, stats=None):
|
||||||
# to minimize errors
|
# to minimize errors
|
||||||
global scouringContext
|
global scouringContext
|
||||||
global scouringContextC # even more reduced precision for control points
|
global scouringContextC # even more reduced precision for control points
|
||||||
|
global roundingQuantum
|
||||||
scouringContext = Context(prec=options.digits)
|
scouringContext = Context(prec=options.digits)
|
||||||
scouringContextC = Context(prec=options.cdigits)
|
scouringContextC = Context(prec=options.cdigits)
|
||||||
|
roundingQuantum = Decimal(10) ** (-options.rounding)
|
||||||
|
|
||||||
doc = xml.dom.minidom.parseString(in_string)
|
doc = xml.dom.minidom.parseString(in_string)
|
||||||
|
|
||||||
|
|
@ -3942,6 +3944,9 @@ _option_group_optimization.add_option("--set-c-precision",
|
||||||
action="store", type=int, dest="cdigits", default=-1, metavar="NUM",
|
action="store", type=int, dest="cdigits", default=-1, metavar="NUM",
|
||||||
help="set number of significant digits for control points "
|
help="set number of significant digits for control points "
|
||||||
"(default: same as '--set-precision')")
|
"(default: same as '--set-precision')")
|
||||||
|
_option_group_optimization.add_option("--set-rounding",
|
||||||
|
action="store", type=int, dest="rounding", default=9, metavar="NUM",
|
||||||
|
help="set number of digits after decimal point (default: %default)")
|
||||||
_option_group_optimization.add_option("--disable-simplify-colors",
|
_option_group_optimization.add_option("--disable-simplify-colors",
|
||||||
action="store_false", dest="simple_colors", default=True,
|
action="store_false", dest="simple_colors", default=True,
|
||||||
help="won't convert colors to #RRGGBB format")
|
help="won't convert colors to #RRGGBB format")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue