inline default values when possible
This commit is contained in:
Ryan Oldenburg
parent
5281ad71f3
commit
a526c255f0
1 changed files with 30 additions and 170 deletions
|
|
@ -246,15 +246,9 @@ class SeqSpan(Structure):
|
|||
def clear(self):
|
||||
dll.pixie_seq_span_clear(self)
|
||||
|
||||
def typeset(self, bounds = None, h_align = None, v_align = None, wrap = None):
|
||||
def typeset(self, bounds = None, h_align = HA_LEFT, v_align = VA_TOP, wrap = True):
|
||||
if bounds is None:
|
||||
bounds = Vector2(0, 0)
|
||||
if h_align is None:
|
||||
h_align = HA_LEFT
|
||||
if v_align is None:
|
||||
v_align = VA_TOP
|
||||
if wrap is None:
|
||||
wrap = True
|
||||
result = dll.pixie_seq_span_typeset(self, bounds, h_align, v_align, wrap)
|
||||
return result
|
||||
|
||||
|
|
@ -333,17 +327,13 @@ class Image(Structure):
|
|||
raise PixieError(take_error())
|
||||
return result
|
||||
|
||||
def minify_by_2(self, power = None):
|
||||
if power is None:
|
||||
power = 1
|
||||
def minify_by_2(self, power = 1):
|
||||
result = dll.pixie_image_minify_by_2(self, power)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
return result
|
||||
|
||||
def magnify_by_2(self, power = None):
|
||||
if power is None:
|
||||
power = 1
|
||||
def magnify_by_2(self, power = 1):
|
||||
result = dll.pixie_image_magnify_by_2(self, power)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
|
@ -386,20 +376,16 @@ class Image(Structure):
|
|||
raise PixieError(take_error())
|
||||
return result
|
||||
|
||||
def mask_draw(self, mask, transform = None, blend_mode = None):
|
||||
def mask_draw(self, mask, transform = None, blend_mode = BM_MASK):
|
||||
if transform is None:
|
||||
transform = Matrix3()
|
||||
if blend_mode is None:
|
||||
blend_mode = BM_MASK
|
||||
dll.pixie_image_mask_draw(self, mask, transform, blend_mode)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def image_draw(self, b, transform = None, blend_mode = None):
|
||||
def image_draw(self, b, transform = None, blend_mode = BM_NORMAL):
|
||||
if transform is None:
|
||||
transform = Matrix3()
|
||||
if blend_mode is None:
|
||||
blend_mode = BM_NORMAL
|
||||
dll.pixie_image_image_draw(self, b, transform, blend_mode)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
|
@ -416,81 +402,41 @@ class Image(Structure):
|
|||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def font_fill_text(self, font, text, transform = None, bounds = None, h_align = None, v_align = None):
|
||||
def font_fill_text(self, font, text, transform = None, bounds = None, h_align = HA_LEFT, v_align = VA_TOP):
|
||||
if transform is None:
|
||||
transform = Matrix3()
|
||||
if bounds is None:
|
||||
bounds = Vector2(0, 0)
|
||||
if h_align is None:
|
||||
h_align = HA_LEFT
|
||||
if v_align is None:
|
||||
v_align = VA_TOP
|
||||
dll.pixie_image_font_fill_text(self, font, text.encode("utf8"), transform, bounds, h_align, v_align)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def arrangement_stroke_text(self, arrangement, transform = None, stroke_width = None, line_cap = None, line_join = None, miter_limit = None, dashes = None):
|
||||
def arrangement_stroke_text(self, arrangement, transform = None, stroke_width = 1.0, line_cap = LC_BUTT, line_join = LJ_MITER, miter_limit = DEFAULT_MITER_LIMIT, dashes = None):
|
||||
if transform is None:
|
||||
transform = Matrix3()
|
||||
if stroke_width is None:
|
||||
stroke_width = 1.0
|
||||
if line_cap is None:
|
||||
line_cap = LC_BUTT
|
||||
if line_join is None:
|
||||
line_join = LJ_MITER
|
||||
if miter_limit is None:
|
||||
miter_limit = DEFAULT_MITER_LIMIT
|
||||
if dashes is None:
|
||||
dashes = SeqFloat32()
|
||||
dll.pixie_image_arrangement_stroke_text(self, arrangement, transform, stroke_width, line_cap, line_join, miter_limit, dashes)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def font_stroke_text(self, font, text, transform = None, stroke_width = None, bounds = None, h_align = None, v_align = None, line_cap = None, line_join = None, miter_limit = None, dashes = None):
|
||||
def font_stroke_text(self, font, text, transform = None, stroke_width = 1.0, bounds = None, h_align = HA_LEFT, v_align = VA_TOP, line_cap = LC_BUTT, line_join = LJ_MITER, miter_limit = DEFAULT_MITER_LIMIT, dashes = None):
|
||||
if transform is None:
|
||||
transform = Matrix3()
|
||||
if stroke_width is None:
|
||||
stroke_width = 1.0
|
||||
if bounds is None:
|
||||
bounds = Vector2(0, 0)
|
||||
if h_align is None:
|
||||
h_align = HA_LEFT
|
||||
if v_align is None:
|
||||
v_align = VA_TOP
|
||||
if line_cap is None:
|
||||
line_cap = LC_BUTT
|
||||
if line_join is None:
|
||||
line_join = LJ_MITER
|
||||
if miter_limit is None:
|
||||
miter_limit = DEFAULT_MITER_LIMIT
|
||||
if dashes is None:
|
||||
dashes = SeqFloat32()
|
||||
dll.pixie_image_font_stroke_text(self, font, text.encode("utf8"), transform, stroke_width, bounds, h_align, v_align, line_cap, line_join, miter_limit, dashes)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def fill_path(self, path, paint, transform = None, winding_rule = None):
|
||||
def fill_path(self, path, paint, transform = None, winding_rule = WR_NON_ZERO):
|
||||
if transform is None:
|
||||
transform = Matrix3()
|
||||
if winding_rule is None:
|
||||
winding_rule = WR_NON_ZERO
|
||||
dll.pixie_image_fill_path(self, path, paint, transform, winding_rule)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def stroke_path(self, path, paint, transform = None, stroke_width = None, line_cap = None, line_join = None, miter_limit = None, dashes = None):
|
||||
def stroke_path(self, path, paint, transform = None, stroke_width = 1.0, line_cap = LC_BUTT, line_join = LJ_MITER, miter_limit = DEFAULT_MITER_LIMIT, dashes = None):
|
||||
if transform is None:
|
||||
transform = Matrix3()
|
||||
if stroke_width is None:
|
||||
stroke_width = 1.0
|
||||
if line_cap is None:
|
||||
line_cap = LC_BUTT
|
||||
if line_join is None:
|
||||
line_join = LJ_MITER
|
||||
if miter_limit is None:
|
||||
miter_limit = DEFAULT_MITER_LIMIT
|
||||
if dashes is None:
|
||||
dashes = SeqFloat32()
|
||||
dll.pixie_image_stroke_path(self, path, paint, transform, stroke_width, line_cap, line_join, miter_limit, dashes)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
|
@ -558,9 +504,7 @@ class Mask(Structure):
|
|||
def fill(self, value):
|
||||
dll.pixie_mask_fill(self, value)
|
||||
|
||||
def minify_by_2(self, power = None):
|
||||
if power is None:
|
||||
power = 1
|
||||
def minify_by_2(self, power = 1):
|
||||
result = dll.pixie_mask_minify_by_2(self, power)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
|
@ -586,27 +530,21 @@ class Mask(Structure):
|
|||
def invert(self):
|
||||
dll.pixie_mask_invert(self)
|
||||
|
||||
def blur(self, radius, out_of_bounds = None):
|
||||
if out_of_bounds is None:
|
||||
out_of_bounds = 0
|
||||
def blur(self, radius, out_of_bounds = 0):
|
||||
dll.pixie_mask_blur(self, radius, out_of_bounds)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def mask_draw(self, b, transform = None, blend_mode = None):
|
||||
def mask_draw(self, b, transform = None, blend_mode = BM_MASK):
|
||||
if transform is None:
|
||||
transform = Matrix3()
|
||||
if blend_mode is None:
|
||||
blend_mode = BM_MASK
|
||||
dll.pixie_mask_mask_draw(self, b, transform, blend_mode)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def image_draw(self, image, transform = None, blend_mode = None):
|
||||
def image_draw(self, image, transform = None, blend_mode = BM_MASK):
|
||||
if transform is None:
|
||||
transform = Matrix3()
|
||||
if blend_mode is None:
|
||||
blend_mode = BM_MASK
|
||||
dll.pixie_mask_image_draw(self, image, transform, blend_mode)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
|
@ -618,85 +556,41 @@ class Mask(Structure):
|
|||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def font_fill_text(self, font, text, transform = None, bounds = None, h_align = None, v_align = None):
|
||||
def font_fill_text(self, font, text, transform = None, bounds = None, h_align = HA_LEFT, v_align = VA_TOP):
|
||||
if transform is None:
|
||||
transform = Matrix3()
|
||||
if bounds is None:
|
||||
bounds = Vector2(0, 0)
|
||||
if h_align is None:
|
||||
h_align = HA_LEFT
|
||||
if v_align is None:
|
||||
v_align = VA_TOP
|
||||
dll.pixie_mask_font_fill_text(self, font, text.encode("utf8"), transform, bounds, h_align, v_align)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def arrangement_stroke_text(self, arrangement, transform = None, stroke_width = None, line_cap = None, line_join = None, miter_limit = None, dashes = None):
|
||||
def arrangement_stroke_text(self, arrangement, transform = None, stroke_width = 1.0, line_cap = LC_BUTT, line_join = LJ_MITER, miter_limit = DEFAULT_MITER_LIMIT, dashes = None):
|
||||
if transform is None:
|
||||
transform = Matrix3()
|
||||
if stroke_width is None:
|
||||
stroke_width = 1.0
|
||||
if line_cap is None:
|
||||
line_cap = LC_BUTT
|
||||
if line_join is None:
|
||||
line_join = LJ_MITER
|
||||
if miter_limit is None:
|
||||
miter_limit = DEFAULT_MITER_LIMIT
|
||||
if dashes is None:
|
||||
dashes = SeqFloat32()
|
||||
dll.pixie_mask_arrangement_stroke_text(self, arrangement, transform, stroke_width, line_cap, line_join, miter_limit, dashes)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def font_stroke_text(self, font, text, transform = None, stroke_width = None, bounds = None, h_align = None, v_align = None, line_cap = None, line_join = None, miter_limit = None, dashes = None):
|
||||
def font_stroke_text(self, font, text, transform = None, stroke_width = 1.0, bounds = None, h_align = HA_LEFT, v_align = VA_TOP, line_cap = LC_BUTT, line_join = LJ_MITER, miter_limit = DEFAULT_MITER_LIMIT, dashes = None):
|
||||
if transform is None:
|
||||
transform = Matrix3()
|
||||
if stroke_width is None:
|
||||
stroke_width = 1.0
|
||||
if bounds is None:
|
||||
bounds = Vector2(0, 0)
|
||||
if h_align is None:
|
||||
h_align = HA_LEFT
|
||||
if v_align is None:
|
||||
v_align = VA_TOP
|
||||
if line_cap is None:
|
||||
line_cap = LC_BUTT
|
||||
if line_join is None:
|
||||
line_join = LJ_MITER
|
||||
if miter_limit is None:
|
||||
miter_limit = DEFAULT_MITER_LIMIT
|
||||
if dashes is None:
|
||||
dashes = SeqFloat32()
|
||||
dll.pixie_mask_font_stroke_text(self, font, text.encode("utf8"), transform, stroke_width, bounds, h_align, v_align, line_cap, line_join, miter_limit, dashes)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def fill_path(self, path, transform = None, winding_rule = None, blend_mode = None):
|
||||
def fill_path(self, path, transform = None, winding_rule = WR_NON_ZERO, blend_mode = BM_NORMAL):
|
||||
if transform is None:
|
||||
transform = Matrix3()
|
||||
if winding_rule is None:
|
||||
winding_rule = WR_NON_ZERO
|
||||
if blend_mode is None:
|
||||
blend_mode = BM_NORMAL
|
||||
dll.pixie_mask_fill_path(self, path, transform, winding_rule, blend_mode)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def stroke_path(self, path, transform = None, stroke_width = None, line_cap = None, line_join = None, miter_limit = None, dashes = None, blend_mode = None):
|
||||
def stroke_path(self, path, transform = None, stroke_width = 1.0, line_cap = LC_BUTT, line_join = LJ_MITER, miter_limit = DEFAULT_MITER_LIMIT, dashes = None, blend_mode = BM_NORMAL):
|
||||
if transform is None:
|
||||
transform = Matrix3()
|
||||
if stroke_width is None:
|
||||
stroke_width = 1.0
|
||||
if line_cap is None:
|
||||
line_cap = LC_BUTT
|
||||
if line_join is None:
|
||||
line_join = LJ_MITER
|
||||
if miter_limit is None:
|
||||
miter_limit = DEFAULT_MITER_LIMIT
|
||||
if dashes is None:
|
||||
dashes = SeqFloat32()
|
||||
if blend_mode is None:
|
||||
blend_mode = BM_NORMAL
|
||||
dll.pixie_mask_stroke_path(self, path, transform, stroke_width, line_cap, line_join, miter_limit, dashes, blend_mode)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
|
@ -856,29 +750,17 @@ class Path(Structure):
|
|||
raise PixieError(take_error())
|
||||
return result
|
||||
|
||||
def fill_overlaps(self, test, transform = None, winding_rule = None):
|
||||
def fill_overlaps(self, test, transform = None, winding_rule = WR_NON_ZERO):
|
||||
if transform is None:
|
||||
transform = Matrix3()
|
||||
if winding_rule is None:
|
||||
winding_rule = WR_NON_ZERO
|
||||
result = dll.pixie_path_fill_overlaps(self, test, transform, winding_rule)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
return result
|
||||
|
||||
def stroke_overlaps(self, test, transform = None, stroke_width = None, line_cap = None, line_join = None, miter_limit = None, dashes = None):
|
||||
def stroke_overlaps(self, test, transform = None, stroke_width = 1.0, line_cap = LC_BUTT, line_join = LJ_MITER, miter_limit = DEFAULT_MITER_LIMIT, dashes = None):
|
||||
if transform is None:
|
||||
transform = Matrix3()
|
||||
if stroke_width is None:
|
||||
stroke_width = 1.0
|
||||
if line_cap is None:
|
||||
line_cap = LC_BUTT
|
||||
if line_join is None:
|
||||
line_join = LJ_MITER
|
||||
if miter_limit is None:
|
||||
miter_limit = DEFAULT_MITER_LIMIT
|
||||
if dashes is None:
|
||||
dashes = SeqFloat32()
|
||||
result = dll.pixie_path_stroke_overlaps(self, test, transform, stroke_width, line_cap, line_join, miter_limit, dashes)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
|
@ -909,14 +791,10 @@ class Path(Structure):
|
|||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def rect(self, x, y, w, h, clockwise = None):
|
||||
if clockwise is None:
|
||||
clockwise = True
|
||||
def rect(self, x, y, w, h, clockwise = True):
|
||||
dll.pixie_path_rect(self, x, y, w, h, clockwise)
|
||||
|
||||
def rounded_rect(self, x, y, w, h, nw, ne, se, sw, clockwise = None):
|
||||
if clockwise is None:
|
||||
clockwise = True
|
||||
def rounded_rect(self, x, y, w, h, nw, ne, se, sw, clockwise = True):
|
||||
dll.pixie_path_rounded_rect(self, x, y, w, h, nw, ne, se, sw, clockwise)
|
||||
|
||||
def ellipse(self, cx, cy, rx, ry):
|
||||
|
|
@ -1085,15 +963,9 @@ class Font(Structure):
|
|||
result = dll.pixie_font_default_line_height(self)
|
||||
return result
|
||||
|
||||
def typeset(self, text, bounds = None, h_align = None, v_align = None, wrap = None):
|
||||
def typeset(self, text, bounds = None, h_align = HA_LEFT, v_align = VA_TOP, wrap = True):
|
||||
if bounds is None:
|
||||
bounds = Vector2(0, 0)
|
||||
if h_align is None:
|
||||
h_align = HA_LEFT
|
||||
if v_align is None:
|
||||
v_align = VA_TOP
|
||||
if wrap is None:
|
||||
wrap = True
|
||||
result = dll.pixie_font_typeset(self, text.encode("utf8"), bounds, h_align, v_align, wrap)
|
||||
return result
|
||||
|
||||
|
|
@ -1276,30 +1148,22 @@ class Context(Structure):
|
|||
def close_path(self):
|
||||
dll.pixie_context_close_path(self)
|
||||
|
||||
def path_fill(self, path, winding_rule = None):
|
||||
if winding_rule is None:
|
||||
winding_rule = WR_NON_ZERO
|
||||
def path_fill(self, path, winding_rule = WR_NON_ZERO):
|
||||
dll.pixie_context_path_fill(self, path, winding_rule)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def fill(self, winding_rule = None):
|
||||
if winding_rule is None:
|
||||
winding_rule = WR_NON_ZERO
|
||||
def fill(self, winding_rule = WR_NON_ZERO):
|
||||
dll.pixie_context_winding_rule_fill(self, winding_rule)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def path_clip(self, path, winding_rule = None):
|
||||
if winding_rule is None:
|
||||
winding_rule = WR_NON_ZERO
|
||||
def path_clip(self, path, winding_rule = WR_NON_ZERO):
|
||||
dll.pixie_context_path_clip(self, path, winding_rule)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
||||
def clip(self, winding_rule = None):
|
||||
if winding_rule is None:
|
||||
winding_rule = WR_NON_ZERO
|
||||
def clip(self, winding_rule = WR_NON_ZERO):
|
||||
dll.pixie_context_winding_rule_clip(self, winding_rule)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
|
@ -1360,9 +1224,7 @@ class Context(Structure):
|
|||
def quadratic_curve_to(self, cpx, cpy, x, y):
|
||||
dll.pixie_context_quadratic_curve_to(self, cpx, cpy, x, y)
|
||||
|
||||
def arc(self, x, y, r, a_0, a_1, ccw = None):
|
||||
if ccw is None:
|
||||
ccw = False
|
||||
def arc(self, x, y, r, a_0, a_1, ccw = False):
|
||||
dll.pixie_context_arc(self, x, y, r, a_0, a_1, ccw)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
|
@ -1421,9 +1283,7 @@ class Context(Structure):
|
|||
def rotate(self, angle):
|
||||
dll.pixie_context_rotate(self, angle)
|
||||
|
||||
def is_point_in_path(self, x, y, winding_rule = None):
|
||||
if winding_rule is None:
|
||||
winding_rule = WR_NON_ZERO
|
||||
def is_point_in_path(self, x, y, winding_rule = WR_NON_ZERO):
|
||||
result = dll.pixie_context_is_point_in_path(self, x, y, winding_rule)
|
||||
if check_error():
|
||||
raise PixieError(take_error())
|
||||
|
|
|
|||
Loading…
Reference in a new issue