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

Timestamp:

09/20/07 17:33:32 (16 months ago)

Author:

fdb

Message:

- Colors are now correct in Text also
- PDF rendering using canvas.save
- Added for headless rendering (through console.py)

Files:

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

nodebox/trunk/src/DrawingPrimitives.py

@@ -521 +521 @@
 
     def set(self):
+        self.nsColor.set()
+    
+    def _get_nsColor(self):
         if self._ctx._outputmode == RGB:
-            self._rgb.set()
+            return self._rgb
         else:
-            self._cmyk.set()
+            return self._cmyk
+    nsColor = property(_get_nsColor)
+        
 
     def copy(self):
@@ -927 +932 @@
 
 
+
 class Text(Grob, TransformMixin, ColorMixin):
 
@@ -932 +938 @@
     kwargs = ('fill', 'font', 'fontsize', 'align', 'lineheight')
 
+    __dummy_color = NSColor.blackColor()
+    
     def __init__(self, ctx, text, x=0, y=0, width=None, height=None, **kwargs):
         super(Text, self).__init__(ctx)
@@ -957 +965 @@
     font = property(_get_font)
 
-    def _getLayoutManagerTextContainerTextStorage(self, clr=NSColor.blackColor()):
+    def _getLayoutManagerTextContainerTextStorage(self, clr=__dummy_color):
         paraStyle = NSMutableParagraphStyle.alloc().init()
         paraStyle.setAlignment_(self._align)
@@ -986 +994 @@
     def _draw(self):
         if self._fillcolor is None: return
-        layoutManager, textContainer, textStorage = self._getLayoutManagerTextContainerTextStorage(self._fillcolor._cmyk)
+        layoutManager, textContainer, textStorage = self._getLayoutManagerTextContainerTextStorage(self._fillcolor.nsColor)
         x,y = self.x, self.y
         glyphRange = layoutManager.glyphRangeForTextContainer_(textContainer)
@@ -1114 +1122 @@
         return "Variable(name=%s, type=%s, default=%s, min=%s, max=%s, value=%s)" % (self.name, self.type, self.default, self.min, self.max, self.value)
 
+class _PDFRenderView(NSView):
+    
+    # This view was created to provide PDF data.
+    # Strangely enough, the only way to get PDF data from Cocoa is by asking
+    # dataWithPDFInsideRect_ from a NSView. So, we create one just to get to
+    # the PDF data.
+
+    def initWithCanvas_(self, canvas):
+        super(_PDFRenderView, self).initWithFrame_( ((0, 0), (canvas.width, canvas.height)) )
+        self.canvas = canvas
+        return self
+        
+    def drawRect_(self, rect):
+        self.canvas.draw()
+        
+    def isOpaque(self):
+        return False
+
+    def isFlipped(self):
+        return True
+
 class Canvas(Grob):
     def __init__(self, width=DEFAULT_WIDTH, height=DEFAULT_HEIGHT):
@@ -1160 +1189 @@
         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)
+            
+        if format == 'pdf':
+            view = _PDFRenderView.alloc().initWithCanvas_(self)
+            data = 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.image.TIFFRepresentation()
+            if format != 'tiff':
+                imgType = imgTypes[format]
+                rep = NSBitmapImageRep.imageRepWithData_(data)
+                data = rep.representationUsingType_properties_(imgType, None)
             
         fname = NSString.stringByExpandingTildeInPath(fname)