adamn · Sep 1, 2010 · Sep 2, 2010 · Apr 12, 2011 · Apr 12, 2011 · Apr 12, 2011
Showing with 37 additions and 3 deletions.

+1 −0 setup.py

+1 −0 webkit2png.egg-info/SOURCES.txt

+1 −1 webkit2png.egg-info/top_level.txt

+34 −2 webkit2png.py
diff --git a/setup.py b/setup.py
@@ -16,6 +16,7 @@
     author_email = 'roland at dau-sicher de',
     packages = find_packages(),
     package_dir = {'webkit2png': 'webkit2png'},
+    py_modules = ['webkit2png'],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',

diff --git a/webkit2png.egg-info/SOURCES.txt b/webkit2png.egg-info/SOURCES.txt
@@ -1,4 +1,5 @@
 setup.py
+webkit2png.py
 webkit2png.egg-info/PKG-INFO
 webkit2png.egg-info/SOURCES.txt
 webkit2png.egg-info/dependency_links.txt

diff --git a/webkit2png.egg-info/top_level.txt b/webkit2png.egg-info/top_level.txt
@@ -1 +1 @@
-
+webkit2png
diff --git a/webkit2png.py b/webkit2png.py
@@ -115,11 +115,15 @@ def __init__(self,**kwargs):
         self.scaleToWidth = kwargs.get('scaleToWidth', 0)
         self.scaleToHeight = kwargs.get('scaleToHeight', 0)
         self.scaleRatio = kwargs.get('scaleRatio', 'keep')
+        self.scaleTransform = kwargs.get('scaleTransform', 'fast')
         # Set this to true if you want to capture flash.
         # Not that your desktop must be large enough for
         # fitting the whole window.
         self.grabWholeWindow = kwargs.get('grabWholeWindow', False) 
 
+        self.ignoreAlerts = kwargs.get('ignoreAlerts', False)
+        self.ignoreConfirms = kwargs.get('ignoreConfirms', False)
+        self.ignoreConsoleMessages = kwargs.get('ignoreConsoleMessages', False)
 
         # Set some default options for QWebPage
         self.qWebSettings = {
@@ -164,6 +168,28 @@ def render_to_bytes(self, url):
         image.save(qBuffer, format)
         return qBuffer.buffer().data()
 
+class ConfigurableWebPage(QWebPage):
+    def __init__(self, parent=None, ignoreAlerts=False, ignoreConfirms=False, ignoreConsoleMessages=False):
+        super(ConfigurableWebPage, self).__init__(parent)
+        self.ignoreAlerts = ignoreAlerts
+        self.ignoreConfirms = ignoreConfirms
+        self.ignoreConsoleMessages = ignoreConsoleMessages
+
+    def javaScriptAlert(self, frame, msg):
+        if not self.ignoreAlerts:
+            return super(ConfigurableWebPage, self).javaScriptAlert(frame, msg)
+
+    def javaScriptConfirm(self, frame, msg):
+        if not self.ignoreConfirms:
+            return super(ConfigurableWebPage, self).javaScriptConfirm(frame, msg)
+        else:
+            return False
+
+    def javaScriptConsoleMessage(self, message, lineNumber, sourceID):
+        if not self.ignoreConsoleMessages:
+            return super(ConfigurableWebPage, self).javaScriptConsoleMessage(message, lineNumber, sourceID)
+
+
 class _WebkitRendererHelper(QObject):
     """This helper class is doing the real work. It is required to 
     allow WebkitRenderer.render() to be called "asynchronously"
@@ -182,7 +208,7 @@ def __init__(self, parent):
             setattr(self,key,value)
 
         # Create and connect required PyQt4 objects
-        self._page = QWebPage()
+        self._page = ConfigurableWebPage(None, self.ignoreAlerts, self.ignoreConfirms, self.ignoreConsoleMessages)
         self._view = QWebView()
         self._view.setPage(self._page)
         self._window = QMainWindow()
@@ -301,7 +327,13 @@ def _post_process_image(self, qImage):
                 ratio = Qt.KeepAspectRatioByExpanding
             else: # 'ignore'
                 ratio = Qt.IgnoreAspectRatio
-            qImage = qImage.scaled(self.scaleToWidth, self.scaleToHeight, ratio)
+
+            if self.scaleTransform == 'smooth':
+                transform = Qt.SmoothTransformation
+            else:
+                transform = Qt.FastTransformation
+
+            qImage = qImage.scaled(self.scaleToWidth, self.scaleToHeight, ratio, transform)
             if self.scaleRatio == 'crop':
                 qImage = qImage.copy(0, 0, self.scaleToWidth, self.scaleToHeight)
         return qImage