Changeset 148 for nodebox/trunk/src/DrawingPrimitives.py

Timestamp:

09/18/07 18:23:18 (16 months ago)

Author:

fdb

Message:

- QuickTime? export
- Image formats

Files:

• nodebox/trunk/src/DrawingPrimitives.py (modified) (2 diffs)

nodebox/trunk/src/DrawingPrimitives.py

@@ -782 +782 @@
         TransformMixin.__init__(self)
         if data is not None:
-            d = NSData.dataWithBytes_length_(data, len(data))
-            self.image = NSImage.alloc().initWithData_(d)
+            if not isinstance(data, NSData):
+                data = NSData.dataWithBytes_length_(data, len(data))
+            self.image = NSImage.alloc().initWithData_(data)
             if self.image is None:
                 raise NodeBoxError, "can't read image %r" % path
@@ -1150 +1151 @@
         for grob in self._grobs:
             grob._draw()
-
-    def save(self, fname):
-        basename, ext = os.path.splitext(fname)
-        if ext != '.tiff':
-            raise NodeBoxError, "Filename should end in .tiff"
-        image = NSImage.alloc().initWithSize_((WIDTH, HEIGHT))
+            
+    def _get_image(self):
+        image = NSImage.alloc().initWithSize_((self.width, self.height))
         image.setFlipped_(True)
         image.lockFocus()
         self.draw()
         image.unlockFocus()
-        fp=open(fname, 'wb')
-        fp.write(image.TIFFRepresentation())
-        fp.close()
+        return image
+    image = property(_get_image)
+
+    def save(self, fname, format=None):
+        if format is None:
+            basename, ext = os.path.splitext(fname)
+            format = ext[1:].lower() # Skip the dot
+
+        imgTypes = {"gif":  NSGIFFileType,
+                    "jpg":  NSJPEGFileType,
+                    "jpeg":  NSJPEGFileType,
+                    "png":  NSPNGFileType,
+                    "tiff": NSTIFFFileType}
+        if format not in imgTypes:
+            raise NodeBoxError, "Filename should end in .tiff, .gif, .jpg or .png"
+
+        data = self.image.TIFFRepresentation()
+        if format != 'tiff':
+            imgType = imgTypes[format]
+            rep = NSBitmapImageRep.imageRepWithData_(data)
+            data = rep.representationUsingType_properties_(imgType, None)
+            
+        fname = NSString.stringByExpandingTildeInPath(fname)
+        data.writeToFile_atomically_(fname, False)
 
 class Context(TransformMixin):