Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix clipping (I hope)

Browse Source
This commit is contained in:
Kovid Goyal 2012-12-14 10:42:36 +05:30
parent 619c06c2b6
commit cff95f4ed0
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/calibre/ebooks/pdf/render/engine.py
View File

@ -30,7 +30,7 @@ Point = namedtuple('Point', 'x y')
def set_transform(transform, func): def set_transform(transform, func):
func(transform.m11(), transform.m12(), transform.m21(), transform.m22(), transform.dx(), transform.dy()) func(transform.m11(), transform.m12(), transform.m21(), transform.m22(), transform.dx(), transform.dy())
class GraphicsState(object): class GraphicsState(object): # {{{
def __init__(self, state=None): def __init__(self, state=None):
self.ops = {} self.ops = {}
@ -98,19 +98,21 @@ class GraphicsState(object):
# Since we have reset the stack we need to re-apply all previous # Since we have reset the stack we need to re-apply all previous
# operations # operations
ops = engine.graphics_state.ops.copy() ops = engine.graphics_state.ops.copy()
if 'clip' in ops and 'clip' not in self.ops: ops.pop('clip', None) # Prev clip is handled separately
# Re-apply previous clip, we do so before applying the
# transform as the transform could also have changed
prev_clip = ops.pop('clip', (None, None))[1]
engine.set_clip(prev_clip)
ops.update(self.ops) ops.update(self.ops)
self.ops = ops self.ops = ops
# We apply clip before transform as the clip may have to be merged with
# the previous clip path so it is easiest to work with clips that are
# pre-transformed
prev_clip_path = engine.graphics_state.ops.get('clip', (None, None))[1]
if 'clip' in ops: if 'clip' in ops:
prev_clip_path = engine.graphics_state.ops.get('clip', (None, None))[1]
op, path = ops['clip'] op, path = ops['clip']
if current_transform is not None and path is not None: if current_transform is not None and path is not None:
# Pre transform the clip path
path = current_transform.map(path) path = current_transform.map(path)
ops['clip'] = (op, path)
if op == Qt.ReplaceClip: if op == Qt.ReplaceClip:
pass pass
elif op == Qt.IntersectClip: elif op == Qt.IntersectClip:
@ -124,8 +126,13 @@ class GraphicsState(object):
path = ops['clip'][1] path = ops['clip'][1]
if path is not None: if path is not None:
engine.set_clip(path) engine.set_clip(path)
elif prev_clip_path is not None:
# Re-apply the previous clip path since no clipping operation was
# specified
engine.set_clip(prev_clip_path)
ops['clip'] = (Qt.ReplaceClip, prev_clip_path)
# Apply operations # Apply transform
if current_transform is not None: if current_transform is not None:
engine.qt_system = current_transform engine.qt_system = current_transform
set_transform(current_transform, canvas.transform) set_transform(current_transform, canvas.transform)
@ -156,7 +163,7 @@ class GraphicsState(object):
self.ops = ops self.ops = ops
return self return self
# }}}
class PdfEngine(QPaintEngine): class PdfEngine(QPaintEngine):
@ -412,9 +419,6 @@ if __name__ == '__main__':
p.begin(dev) p.begin(dev)
xmax, ymax = p.viewport().width(), p.viewport().height() xmax, ymax = p.viewport().width(), p.viewport().height()
try: try:
cp = QPainterPath()
cp.addRect(0, 0, xmax, 1000)
p.setClipPath(cp)
p.drawRect(0, 0, xmax, ymax) p.drawRect(0, 0, xmax, ymax)
p.drawPolyline(QPoint(0, 0), QPoint(xmax, 0), QPoint(xmax, ymax), p.drawPolyline(QPoint(0, 0), QPoint(xmax, 0), QPoint(xmax, ymax),
QPoint(0, ymax), QPoint(0, 0)) QPoint(0, ymax), QPoint(0, 0))