Changeset 259 for nodebox/branches/try-qt/nodebox

Timestamp:

12/04/07 17:02:30 (13 months ago)

Author:

fdb

Message:

Graphics saving moved to canvas.save

Location:

nodebox/branches/try-qt/nodebox

Files:

• graphics/qt.py (modified) (3 diffs)
• gui/qt/__init__.py (modified) (1 diff)

nodebox/branches/try-qt/nodebox/graphics/qt.py

@@ -3 +3 @@
 from random import choice, shuffle
 
-from PyQt4.QtGui import QPainterPath, QColor, QTransform, QBrush, QPen
-from PyQt4.QtCore import Qt
+from PyQt4.QtGui import QPainterPath, QColor, QTransform, QBrush, QPen, QImage, QPrinter, QPainter
+from PyQt4.QtCore import Qt, QSize
+from PyQt4.QtSvg import QSvgGenerator
 
 from nodebox.util import _copy_attr, _copy_attrs
@@ -1015 +1016 @@
     def draw(self, painter):
         if self.background is not None:
-            #self.background._set(painter)
             painter.fillRect(0,0, self.width, self.height, self.background._rgb)
-            #NSRectFill(((0,0), (self.width, self.height)))
         for grob in self._grobs:
             grob._draw(painter)
-            
-    def _getImageData(self, format):
-        if format == 'pdf':
-            view = _PDFRenderView.alloc().initWithCanvas_(self)
-            return view.dataWithPDFInsideRect_(view.bounds())
-        else:
-            imgTypes = {"gif":  NSGIFFileType,
-                        "jpg":  NSJPEGFileType,
-                        "jpeg":  NSJPEGFileType,
-                        "png":  NSPNGFileType,
-                        "tiff": NSTIFFFileType}
-            if format not in imgTypes:
-                raise NodeBoxError, "Filename should end in .pdf, .tiff, .gif, .jpg or .png"
-            data = self._nsImage.TIFFRepresentation()
-            if format != 'tiff':
-                imgType = imgTypes[format]
-                rep = NSBitmapImageRep.imageRepWithData_(data)
-                return rep.representationUsingType_properties_(imgType, None)
-            else:
-                return data
 
     def save(self, fname, format=None):
@@ -1045 +1024 @@
             basename, ext = os.path.splitext(fname)
             format = ext[1:].lower() # Skip the dot
-        data = self._getImageData(format)
-        fname = NSString.stringByExpandingTildeInPath(fname)
-        data.writeToFile_atomically_(fname, False)
+        if format == "svg":
+            svgGen = QSvgGenerator()
+            svgGen.setFileName(fname)
+            svgGen.setSize(QSize(self.width, self.height))
+            painter = QPainter(svgGen)
+            self.draw(painter)
+            painter.end()
+        elif format == "pdf":
+            printer = QPrinter(QPrinter.HighResolution)
+            printer.setOutputFormat(QPrinter.PdfFormat)
+            printer.setOutputFileName(fname)
+            printer.setFullPage(True)
+            #printer.setPageSize(QPrinter.Custom)
+            painter = QPainter(printer)
+            self.draw(painter)
+            painter.end()
+        elif format in ("png", "tiff", "jpg", "jpeg", "gif"):
+            img = QImage(self.width, self.height, QImage.Format_ARGB32)
+            painter = QPainter(img)
+            painter.setRenderHints(QPainter.Antialiasing | QPainter.TextAntialiasing)
+            self.draw(painter)
+            painter.end()
+            img.save(fname, None, 100)
+        else:
+            raise NodeBoxError("Unkown format", format)
 
 def _test():

nodebox/branches/try-qt/nodebox/gui/qt/__init__.py

@@ -262 +262 @@
         print "save image as ", fileName
         if fileName is not None and len(fileName) > 0:
-            fileName = str(fileName)
-            ext = os.path.splitext(fileName)[1].lower()
-            if ext == ".svg":
-                gen = QSvgGenerator()
-                gen.setFileName(fileName)
-                gen.setSize(QSize(self.canvas.width, self.canvas.height))
-                painter = QPainter()
-                painter.begin(gen)
-                self.canvas.draw(painter)
-                painter.end()
-            elif ext == ".pdf":
-                printer = QPrinter(QPrinter.HighResolution)
-                printer.setOutputFormat(QPrinter.PdfFormat)
-                printer.setOutputFileName(fileName)
-                printer.setFullPage(True)
-                #printer.setPageSize(QPrinter.Custom)
-                painter = QPainter(printer)
-                self.canvas.draw(painter)
-                painter.end()
-            elif ext in (".png", ".tiff", ".jpg", ".jpeg", ".gif"):
-                img = QImage(self.canvas.width, self.canvas.height, QImage.Format_ARGB32)
-                painter = QPainter(img)
-                painter.setRenderHints(QPainter.Antialiasing | QPainter.TextAntialiasing)
-                self.canvas.draw(painter)
-                painter.end()
-                img.save(fileName, None, 100)
-        
+            self.canvas.save(str(fileName))
+
     @pyqtSignature("")
     def doRun(self):