Changeset 284 for nodebox/branches/try-qt

Timestamp:

12/21/07 13:32:44 (13 months ago)

Author:

fdb

Message:

- Editor code
- No longer export gif files

Location:

nodebox/branches/try-qt

Files:

• nodebox/console.py (modified) (4 diffs)
• nodebox/graphics/qt.py (modified) (15 diffs)
• nodebox/gui/mac/__init__.py (modified) (1 diff)
• nodebox/gui/qt/__init__.py (modified) (9 diffs)
• nodebox/gui/qt/editor.py (added)
• nodebox/util/__init__.py (modified) (1 diff)
• tests/graphics/006-text.png (copied) (copied from nodebox/trunk/src/tests/graphics/006-text.png)
• tests/graphics/006-text.py (copied) (copied from nodebox/trunk/src/tests/graphics/006-text.py)

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

@@ -77 +77 @@
     
     """Given a source string or code object, executes the scripts and saves the result as an image.
-    Supported image extensions: pdf, tiff, png, jpg, gif"""
+    Supported image extensions: pdf, tiff, png, jpg"""
     
     runner = NodeBoxRunner()
@@ -102 +102 @@
 Usage: console.py sourcefile imagefile
    or: console.py sourcefile moviefile number_of_frames [fps]
-Supported image extensions: pdf, tiff, png, jpg, gif
+Supported image extensions: pdf, tiff, png, jpg
 Supported movie extension:  mov""" + err
 
@@ -111 +111 @@
     elif len(sys.argv) == 3: # Should be an image
         basename, ext = os.path.splitext(sys.argv[2])
-        if ext not in ('.pdf', '.gif', '.jpg', '.jpeg', '.png', '.tiff'):
+        if ext not in ('.pdf', '.jpg', '.jpeg', '.png', '.tiff'):
             return usage('This is not a supported image format.')
         make_image(open(sys.argv[1]).read(), sys.argv[2])
@@ -140 +140 @@
 
     # Using the shortcut functions:
-    make_image('size(200,200)\ntext(FRAME, 100, 100)', 'console-test.gif')
+    make_image('size(200,200)\ntext(FRAME, 100, 100)', 'console-test.png')
     make_movie('size(200,200)\ntext(FRAME, 100, 100)', 'console-test.mov', 10)
 

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

@@ -4 +4 @@
 
 from PyQt4.QtGui import QPainterPath, QColor, QTransform, QBrush, QPen, QImage, QPrinter, QPainter, QFontMetrics, QFont
-from PyQt4.QtCore import Qt, QSize
+from PyQt4.QtCore import Qt, QSize, QPointF, QRectF
 from PyQt4.QtSvg import QSvgGenerator
 
@@ -548 +548 @@
 
     def _set(self, painter):
-        painter.setBrush(self.qColor)
+        painter.setBrush(self._rgb)
     
     def _get_qColor(self):
@@ -620 +620 @@
         trans = painter.transform()
         painter.setTransform(trans * self._qtransform)
-        #m1 = trans.m11(), trans.m12(), trans.m13(), trans.m21(), trans.m22(), trans.dx(), trans.dy()
-        #trans = self._qtransform
-        #m2 = trans.m11(), trans.m12(), trans.m13(), trans.m21(), trans.m22(), trans.dx(), trans.dy()
-        #m3 = transform.mmult(m1, m2)
-        #trans = QTransform(*m3)
-        # TODO: returns a NotImplemented
-        #trans += QTransform(self._qtransform)
-        #painter.setTransform(trans)
 
     def copy(self):
@@ -717 +709 @@
         if data is not None:
             self._nsImage = QImage(data)
-            if self._qImage is None:
+            if self._qimage is None:
                 raise NodeBoxError, "can't read image %r" % path
         elif image is not None:
             if isinstance(image, QImage):
-                self._qImage = image
+                self._qimage = image
             else:
                 raise NodeBoxError, "Don't know what to do with %s." % image
@@ -739 +731 @@
                     raise NodeBoxError, "Can't read image %r" % path
                 self._ctx._imagecache[path] = (image, curtime)
-            self._qImage = image
+            self._qimage = image
         self.x = x
         self.y = y
@@ -748 +740 @@
 
     def _get_image(self):
-        warnings.warn("The 'image' attribute is deprecated. Please use _qImage instead.", DeprecationWarning, stacklevel=2)
-        return self._qImage
+        warnings.warn("The 'image' attribute is deprecated. Please use _qimage instead.", DeprecationWarning, stacklevel=2)
+        return self._qimage
     image = property(_get_image)
 
@@ -765 +757 @@
         """Draw an image on the given coordinates."""
 
-        srcW, srcH = self._qImage.width(), self._qImage.height()
+        srcW, srcH = self._qimage.width(), self._qimage.height()
         srcRect = ((0, 0), (srcW, srcH))
 
@@ -824 +816 @@
             # A debugImage draws a black rectangle instead of an image.
             if self.debugImage:
-                #Color(self._ctx).set()
-                #pt = BezierPath()
-                #pt.rect(0, 0, )
-                #pt.fill()
                 painter.setBrush(QBrush(Qt.SolidPattern))
                 painter.fillRect(QRectF(0, 0, srcW / factor, srcH / factor))
             else:
-                # TODO: Stuff with composition modes
-                painter.drawImage(QPointF(0, 0), self._qImage, srcRect)
+                # TODO: Stuff with composition modes to allow for alpha transparency
+                painter.drawImage(QPointF(0, 0), self._qimage, QRectF(0, 0, srcW, srcH))
             painter.restore()
         # No width or height given
         else:
-            _save()
+            painter.save()
             x,y = self.x, self.y
             # Center-mode transforms: translate to image center
@@ -854 +842 @@
                 painter.fillRect(QRectF(0, 0, srcW, srcH))
             else:
-                # TODO: Stuff with composition modes
-                painter.drawImage(QPointF(0, 0), self._qImage, srcRect)
+                # TODO: Stuff with composition modes to allow for alpha transparency
+                painter.drawImage(QPointF(0, 0), self._qimage, QRectF(0, 0, srcW, srcH))
             painter.restore()
 
@@ -864 +852 @@
 
     __dummy_color = QColor()
-    __alignMap = { LEFT: Qt.AlignLeft, RIGHT:Qt.AlignRight, CENTER:Qt.AlignCenter, JUSTIFY:Qt.AlignJustify }
+    __alignMap = { LEFT: Qt.AlignLeft, RIGHT: Qt.AlignRight, CENTER: Qt.AlignCenter, JUSTIFY: Qt.AlignJustify }
     
     def __init__(self, ctx, text, x=0, y=0, width=None, height=None, **kwargs):
@@ -912 +900 @@
         if self._fillcolor is None: return
         x,y = r.x(), r.y()
+        w, h = r.width(), r.height()
         preferredWidth, preferredHeight = r.width(), r.height()
         if self.width is not None:
@@ -920 +909 @@
 
         painter.save()
+        painter.setFont(self._qfont)
+        self._fillcolor._set(painter)
+        #painter.setBrush(QBrush(self._fillcolor))
         # Center-mode transforms: translate to image center
         if self._transformmode == CENTER:
@@ -925 +917 @@
             deltaY = h / 2
             t = Transform()
-            t.translate(x+deltaX, y-fm.ascent()+deltaY)
+            #t.translate(x+deltaX, y+fm.ascent()+deltaY)
             t.concat(painter)
             self._transform.concat(painter)
@@ -931 +923 @@
             #layoutManager.drawGlyphsForGlyphRange_atPoint_(glyphRange, (-deltaX-dx,-deltaY-dy))
         else:
-            #self._transform.concat()
-            painter.drawText(x, y, w, h, self.text)
+            self._transform.concat()
+            painter.drawText(x, y, w, h, flags, self.text)
             #layoutManager.drawGlyphsForGlyphRange_atPoint_(glyphRange, (x-dx,y-dy-self.font.defaultLineHeightForFont()))
         painter.restore()
@@ -1090 +1082 @@
             self.draw(painter)
             painter.end()
-        elif format in ("png", "tiff", "jpg", "jpeg", "gif"):
+        elif format in ("png", "tiff", "jpg", "jpeg"):
             img = QImage(self.width, self.height, QImage.Format_ARGB32)
             painter = QPainter(img)

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

@@ -486 +486 @@
             
     def exportImageFormatChanged_(self, sender):
-        image_formats = ('pdf', 'png', 'tiff', 'jpg', 'gif')
+        image_formats = ('pdf', 'png', 'tiff', 'jpg')
         panel = sender.window()
         panel.setRequiredFileType_(image_formats[sender.indexOfSelectedItem()])

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

@@ -10 +10 @@
 from PyQt4.QtCore import Qt, SIGNAL, SLOT, pyqtSignature, QTimer, QRectF, QSize
 from PyQt4.QtSvg import QSvgGenerator
+
+from nodebox.gui.qt.editor import PythonHighlighter, CodeEdit, loadConfig
 
 MAGICVAR = "__magic_var__"
@@ -87 +89 @@
             p.drawPixmap(0, 0, self._image)
         
-class CodeView(QTextEdit):
-
-    def __init__(self, parent=None):
-        QTextEdit.__init__(self, parent)
-        self.setLineWrapMode(QTextEdit.NoWrap)
-        
-    def mousePressEvent(self, event):
-        if int(QApplication.keyboardModifiers()) & Qt.ControlModifier > 0:
-            event.x()
-            event.y()
-            cursor = self.cursorForPosition(event.pos())
-            print "CURS", cursor.position()
-            code = unicode(self.toPlainText())
-            print code[cursor.position()]
-            cursor.select(QTextCursor.BlockUnderCursor)
-            print unicode(cursor.selectedText())
-        QTextEdit.mousePressEvent(self, event)
-        #QTextCursor
-
 class NodeBoxDocument(QMainWindow):
     def __init__(self):
@@ -187 +170 @@
         self.graphicsScroll.setWidget(self.graphicsView)
         self.graphicsScroll.setMinimumSize(300, 300)
-        self.codeView = CodeView()
+        self.codeView = CodeEdit()
         self.codeView.setFontFamily(codeFont.defaultFamily())
         self.codeView.setCurrentFont(codeFont)
@@ -193 +176 @@
         self.codeView.setMinimumSize(300, 300)
         self.codeView.setAcceptRichText(False)
+        PythonHighlighter(self.codeView.document())
         self.outputView = QTextEdit()
         self.outputView.setMinimumSize(300, 300)
@@ -286 +270 @@
         global app
         if self.canvas is None: return
-        fileName = QFileDialog.getSaveFileName(self, self.tr("Save SVG File"), app.home, "*.svg,*.pdf,*.png,*.tiff,*.jpg,*.jpeg,*.gif")
+        fileName = QFileDialog.getSaveFileName(self, self.tr("Save SVG File"), app.home, "*.svg,*.pdf,*.png,*.tiff,*.jpg,*.jpeg")
         print "save image as ", fileName
         if fileName is not None and len(fileName) > 0:
@@ -419 +403 @@
 
         # Set the mouse position
+        # TODO: Get correct mouse position
         #window = self.currentView.window()
         pt = 0, 0 # window.mouseLocationOutsideOfEventStream()
@@ -427 +412 @@
             my = self.currentView.bounds()[1][1] - my
         self.namespace["MOUSEX"], self.namespace["MOUSEY"] = mx, my
-        #self.namespace["mousedown"] = QtGui.QApplication.mouseButtons() & QtCore.Qt.LeftButton > 0
+        #self.namespace["mousedown"] = QApplication.mouseButtons() & Qt.LeftButton
         #self.namespace["keydown"] = self.currentView.keydown
         #self.namespace["key"] = self.currentView.key
@@ -522 +507 @@
                 pass
             sys.argv = saveArgv
-            self._flushOutput(output)
         return True, output
 
@@ -580 +564 @@
     def __init__(self, args):
         QApplication.__init__(self, args)
+        loadConfig()
         self.documents = []
         if sys.platform == "win32":

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

@@ -55 +55 @@
     
     You can use wildcards to specify which files to pick, e.g.
-        f = files('*.gif')
+        f = files('*.png')
     """
     from glob import glob