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.

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

Remove remaining pieces that depend on Poppler #35

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#autodoc_mock_imports = [
# 'sip',
# 'PyQt6',
# 'popplerqt6',
#]

import os
Expand Down
16 changes: 2 additions & 14 deletions qpageview/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@
from . import util
from .pkginfo import version_string

# loadPdf() uses this to determine if Poppler is available
try:
import popplerqt6
except ImportError:
popplerqt6 = None



class View(
Expand All @@ -92,17 +86,11 @@ def loadPdf(filename, renderer=None):
"""Convenience function to create a Document with the specified PDF file.

The filename can also be a QByteArray or an already loaded
popplerqt6.Poppler.Document (if Poppler is available) or
QPdfDocument instance.

"""
# Use Poppler if it is available, otherwise fall back on QtPdf
if popplerqt6:
from . import poppler
return poppler.PopplerDocument(filename, renderer)
else:
from . import pdf
return pdf.PdfDocument(filename, renderer)
from . import pdf
return pdf.PdfDocument(filename, renderer)


def loadSvgs(filenames, renderer=None):
Expand Down
38 changes: 2 additions & 36 deletions qpageview/export.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
from PyQt6.QtCore import QBuffer, QIODevice, QMimeData, QPoint, QSizeF, Qt, QUrl
from PyQt6.QtGui import QDrag, QGuiApplication, QImage, QPageSize, QPdfWriter

from . import poppler
from . import util


Expand All @@ -46,8 +45,6 @@ class AbstractExporter:
oversample = 1
grayscale = False
paperColor = None
forceVector = True # force the render backend to be Arthur for
# exporting PDF pages to vector-based formats

After setting the attributes, you call one or more of save(), copyData(),
copyFile(), mimeData() or tempFileMimeData(), which will trigger the export
Expand All @@ -65,7 +62,6 @@ class AbstractExporter:
oversample = 1
grayscale = False
paperColor = None
forceVector = True # force the render backend to be Arthur for PDF pages

# properties of exporter:
wantsVector = True
Expand Down Expand Up @@ -103,10 +99,6 @@ def page(self):
p.renderer = self._page.renderer.copy()
p.renderer.paperColor = self.paperColor
p.renderer.antialiasing = self.antialiasing
if self.forceVector and self.wantsVector and \
isinstance(p, poppler.PopplerPage) and poppler.popplerqt6:
p.renderer.printRenderBackend = \
poppler.popplerqt6.Poppler.Document.ArthurBackend
return p

def autoCroppedRect(self):
Expand Down Expand Up @@ -319,34 +311,8 @@ def export(self):
return buf.data()

def createDocument(self):
from . import poppler
return poppler.PopplerDocument(self.data(), self.renderer())


class EpsExporter(AbstractExporter):
"""Export a rectangular area of a Page (or the whole page) to an EPS file."""
mimeType = "application/postscript"
supportsGrayscale = False
supportsOversample = False
defaultExt = ".eps"

def export(self):
rect = self.autoCroppedRect()
buf = QBuffer()
buf.open(QBuffer.OpenModeFlag.WriteOnly)
success = self.page().eps(buf, rect, self.resolution, self.paperColor)
buf.close()
if success:
return buf.data()

def createDocument(self):
from . import poppler
rect = self.autoCroppedRect()
buf = QBuffer()
buf.open(QBuffer.OpenModeFlag.WriteOnly)
success = self.page().pdf(buf, rect, self.resolution, self.paperColor)
buf.close()
return poppler.PopplerDocument(buf.data(), self.renderer())
from . import pdf
return pdf.PdfDocument(self.data(), self.renderer())


def pdf(filename, pageList, resolution=72, paperColor=None):
Expand Down
33 changes: 0 additions & 33 deletions qpageview/page.py
Original file line number Diff line number Diff line change
Expand Up @@ -308,39 +308,6 @@ def pdf(self, filename, rect=None, resolution=72.0, paperColor=None):
pdf.setPageLayout(layout)
return self.output(pdf, source, paperColor)

def eps(self, filename, rect=None, resolution=72.0, paperColor=None):
"""Create a EPS (Encapsulated Postscript) file for the selected rect or the whole page.

This needs the popplerqt6 module.
The filename may be a string or a QIODevice object. The rectangle is
relative to our top-left position. Normally vector graphics are
rendered, but in cases where that is not possible, the resolution will
be used to determine the DPI for the generated rendering.

"""
buf = QBuffer()
buf.open(QBuffer.OpenModeFlag.WriteOnly)
success = self.pdf(buf, rect, resolution, paperColor)
buf.close()
if success:
from . import poppler
for pdf in poppler.PopplerPage.load(buf.data()):
ps = pdf.document.psConverter()
ps.setPageList([pdf.pageNumber+1])
if isinstance(filename, str):
ps.setOutputFileName(filename)
else:
ps.setOutputDevice(filename)
try:
ps.setPSOptions(ps.PSOption(ps.Printing | ps.StrictMargins))
ps.setPSOptions(ps.PSOption(ps.Printing | ps.StrictMargins | ps.PrintToEPS))
except AttributeError:
pass
ps.setVDPI(resolution)
ps.setHDPI(resolution)
return ps.convert()
return False

def svg(self, filename, rect=None, resolution=72.0, paperColor=None):
"""Create a SVG file for the selected rect or the whole page.

Expand Down
Loading