marcus/scour
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed side effect --set-precision 6

Browse source 
fixed side effect of --set-precision 6, if --set-c-precision is not set
or is invalid use --set-precision value for control points. Fixed
--set-precision 2 --keep-int-precision "9.9" instead of 10
This commit is contained in:
pborunda 2017-02-10 13:56:19 -07:00
parent 262b37a0f9
commit 312936523f
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scour/scour.py
View file

@ -2640,12 +2640,11 @@ def scourUnitlessLength(length, needsRendererWorkaround=False, isControlPoint=Fa
if(scouringKeepIntPrecision): if(scouringKeepIntPrecision):
length_as_int = int(round(length)) length_as_int = int(round(length))
len_length_as_int = len(str(abs(length_as_int))) len_length_as_int = len(str(abs(length_as_int)))
saved_prec = sContext.prec
if(sContext.prec < len_length_as_int): if(sContext.prec < len_length_as_int):
length = getcontext().create_decimal(str(int(round(length))))
else:
# preserve all digits left of the decimal point # preserve all digits left of the decimal point
sContext.prec = len_length_as_int length = sContext.plus(length)
length = sContext.plus(length)
sContext.prec = saved_prec
else: else:
length = sContext.plus(length) length = sContext.plus(length)
@ -3290,6 +3289,10 @@ def scourString(in_string, options=None):
scouringRoundNearZeroC = False scouringRoundNearZeroC = False
# must have at least 1 significant digit # must have at least 1 significant digit
# interrept digits == 0 as rounding to nearest int for values between -1 and 1 # interrept digits == 0 as rounding to nearest int for values between -1 and 1
if(options.cdigits < 0):
# cdigits is negative value so use digits instead
options.cdigits = options.digits
if(options.digits == 0): if(options.digits == 0):
options.digits = 1 options.digits = 1
scouringRoundNearZero = True scouringRoundNearZero = True
@ -3297,6 +3300,8 @@ def scourString(in_string, options=None):
options.cdigits = 1 options.cdigits = 1
scouringRoundNearZeroC = True scouringRoundNearZeroC = True
scouringContext = Context(prec=options.digits) scouringContext = Context(prec=options.digits)
# cdigits cannot have higher precision, limit to digits
if(options.cdigits < options.digits): if(options.cdigits < options.digits):
scouringContextC = Context(prec=options.cdigits) scouringContextC = Context(prec=options.cdigits)
else: else:
@ -3632,7 +3637,7 @@ _option_group_optimization.add_option("-p", "--set-precision",
action="store", type=int, dest="digits", default=5, metavar="NUM", action="store", type=int, dest="digits", default=5, metavar="NUM",
help="set number of significant digits (default: %default)") help="set number of significant digits (default: %default)")
_option_group_optimization.add_option("-c", "--set-c-precision", _option_group_optimization.add_option("-c", "--set-c-precision",
action="store", type=int, dest="cdigits", default=5, metavar="NUM", action="store", type=int, dest="cdigits", default=-1, metavar="NUM",
help="set no. of sig. digits (path [c/s] control points) (default: %default)") help="set no. of sig. digits (path [c/s] control points) (default: %default)")
_option_group_optimization.add_option("-k", "--keep-int-precision", _option_group_optimization.add_option("-k", "--keep-int-precision",
action="store_true", dest="keep_int_precision", default=False, action="store_true", dest="keep_int_precision", default=False,
@ -3749,8 +3754,6 @@ def parse_args(args=None, ignore_additional_args=False):
_options_parser.error("Additional arguments not handled: %r, see --help" % rargs) _options_parser.error("Additional arguments not handled: %r, see --help" % rargs)
if options.digits < 0: if options.digits < 0:
_options_parser.error("Can't have negative significant digits, see --help") _options_parser.error("Can't have negative significant digits, see --help")
if options.cdigits < 0:
_options_parser.error("Can't have negative significant digits for curve control points , see --help")
if options.indent_type not in ['tab', 'space', 'none']: if options.indent_type not in ['tab', 'space', 'none']:
_options_parser.error("Invalid value for --indent, see --help") _options_parser.error("Invalid value for --indent, see --help")
if options.indent_depth < 0: if options.indent_depth < 0: