Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rect drawing with celiagg #317

Merged
merged 2 commits into from
Jun 15, 2019
Merged

Fix rect drawing with celiagg #317

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cef3561
Fix rect drawing with celiagg
jwiggins Sep 1, 2018
346fff7
Fix incorrect axis for transform.
corranwebster Jun 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion kiva/celiagg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from __future__ import absolute_import, print_function, division

from collections import namedtuple
from math import fabs
import os
import warnings

Expand Down Expand Up @@ -353,11 +354,33 @@ def rects(self, rects):
def draw_rect(self, rect, mode=constants.FILL_STROKE):
""" Draw a rect.
"""

# XXX: kiva::graphics_context<>::_draw_rect_simple() does a VERY
# specific optimization for drawing rectangles in certain circumstances
# which results in chaco plot borders which are sharp.
# This implements that same special case. - JW 2018/09/01
transform = self.transform
if (not self.canvas_state.anti_aliased and
self.canvas_state.line_width in (0.0, 1.0) and
fabs(self.transform.shx) < 1e-3 and
fabs(self.transform.shx) < 1e-3):
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo: One of these should be self.transform.shy

scale_x = self.transform.sx
scale_y = self.transform.sy
tx = self.transform.tx
ty = self.transform.ty
x1 = int(rect[0] * scale_x + tx)
y1 = int(rect[1] * scale_y + ty)
x2 = int((rect[0] + rect[2]) * scale_x + tx)
y2 = int((rect[1] + rect[3]) * scale_y + ty)
rect = (x1, y1, abs(x2-x1), abs(y2-y1))
# XXX: The base transform is a half-pixel translate
transform = agg.Transform(tx=0.5, ty=0.5)

path = agg.Path()
path.rect(*rect)

self.canvas_state.drawing_mode = draw_modes[mode]
self.gc.draw_shape(path, self.transform, self.canvas_state,
self.gc.draw_shape(path, transform, self.canvas_state,
stroke=self.stroke_paint, fill=self.fill_paint)

def add_path(self, path):
Expand Down