Changeset 267 for nodebox/branches/try-qt

Timestamp:

12/06/07 11:49:02 (13 months ago)

Author:

fdb

Message:

* Transformations (sort of) work
* Console Runner now uses QApplication instead of NSApplication.

Location:

nodebox/branches/try-qt

Files:

• nodebox/console.py (modified) (2 diffs)
• nodebox/graphics/qt.py (modified) (20 diffs)
• nodebox/gui/qt/__init__.py (modified) (6 diffs)
• tests/graphics/runtests.py (modified) (1 diff)

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

@@ -1 @@
-from AppKit import NSApplication
+import sys
+from PyQt4.QtGui import QApplication
 
 from nodebox import graphics
@@ -7 +8 @@
     
     def __init__(self):
-        # Force NSApp initialisation.
-        NSApplication.sharedApplication().activateIgnoringOtherApps_(0)
+        # Force QApplication initialisation.
+        self.app = QApplication(sys.argv)
+
         self.namespace = {}
         self.canvas = graphics.Canvas()

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

@@ -3 +3 @@
 from random import choice, shuffle
 
-from PyQt4.QtGui import QPainterPath, QColor, QTransform, QBrush, QPen, QImage, QPrinter, QPainter
+from PyQt4.QtGui import QPainterPath, QColor, QTransform, QBrush, QPen, QImage, QPrinter, QPainter, QFontMetrics, QFont
 from PyQt4.QtCore import Qt, QSize
 from PyQt4.QtSvg import QSvgGenerator
@@ -256 +256 @@
     def _get_bounds(self):
         try:
-            return self._qpath.boundingRect()
+            r = self._qpath.boundingRect()
+            return (r.x(), r.y()), (r.width(), r.height())
+            return 
         except:
             # Path is empty -- no bounds
@@ -344 +346 @@
     def _draw(self, painter):
         painter.save()
-        #self.transform.concat()
+        self.transform.concat(painter)
         if self._fillcolor:
             painter.fillPath(self._qpath, QBrush(self._fillcolor._rgb))
@@ -509 +511 @@
             args = self._normalizeList(args)
             g, a = args
-            clr = QColor.formRgbF(g, g, g, a)
+            clr = QColor.fromRgbF(g, g, g, a)
         elif params == 3 and self._ctx._colormode == RGB: # RGB, no alpha
             args = self._normalizeList(args)
@@ -570 +572 @@
         #self._rgb = self._cmyk.colorUsingColorSpaceName_(NSDeviceRGBColorSpace)
 
+    def _get_hue(self):
+        return self._rgb.hueF()
+    def _set_hue(self, val):
+        val = self._normalize(val)
+        c = self._rgb
+        h, s, b, a = c.hueF(), c.saturationF(), c.valueF(), c.alpha()
+        self._rgb.setHsvF(val, s, b, a)
+        self._updateCmyk()
+    h = hue = property(_get_hue, _set_hue, doc="the hue of the color")
 
     def _normalize(self, v):
@@ -587 +598 @@
             transform = QTransform()
         elif isinstance(transform, Transform):
-            transform = QTransform(transform._qTransform)
+            transform = QTransform(transform._qtransform)
         elif isinstance(transform, (list, tuple)):
             matrix = tuple(transform)
-            transform = QTransform
+            transform = QTransform()
             transform.setMatrix(*matrix)
         elif isinstance(transform, QTransform):
@@ -596 +607 @@
         else:
             raise NodeBoxError, "Don't know how to handle transform %s." % transform
-        self._qTransform = transform
+        self._qtransform = transform
         
     def _get_transform(self):
         warnings.warn("The 'transform' attribute is deprecated. Please use _nsAffineTransform instead.", DeprecationWarning, stacklevel=2)
-        return self._qTransform
+        return self._qtransform
     transform = property(_get_transform)
     
-    def set(self):
-        print "transform set"
-        #self._nsAffineTransform.set()
-
-    def concat(self):
-        print "transform concat"
-        # self._nsAffineTransform.concat()
+    def set(self, painter):
+        painter.setTransform(self._qtransform)
+
+    def concat(self, painter):
+        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):
@@ -623 +641 @@
 
     def _get_matrix(self):
-        q = self._qTransform
+        q = self._qtransform
         return (q.m11(), q.m12(), q.m13(), q.m21(), q.m22(), q.m23(), q.m31(), q.m32(), q.m33())
     def _set_matrix(self, value):
-        self._qTransform.setMatrix(value)
+        self._qtransform.setMatrix(value)
     matrix = property(_get_matrix, _set_matrix)
 
     def rotate(self, degrees=0, radians=0):
         if degrees:
-            self._qTransform.rotate(degrees)
-        else:
-            self._qTransform.rotateRadians(radians)
+            self._qtransform.rotate(degrees)
+        else:
+            self._qtransform.rotateRadians(radians)
 
     def translate(self, x=0, y=0):
-        self._qTransform.translate(x, y)
+        self._qtransform.translate(x, y)
 
     def scale(self, x=1, y=None):
         if y is None:
             y = x
-        self._qTransform.scale(x, y)
+        self._qtransform.scale(x, y)
 
     def skew(self, x=0, y=0):
-        self._qTransform.shear(x, y)
+        self._qtransform.shear(x, y)
 
     def invert(self):
-        self._qTransform = self._qTransform.inverted()
-
-    #def append(self, other):
-    #    if isinstance(other, Transform):
-    #        other = other._nsAffineTransform
-    #    self._nsAffineTransform.appendTransform_(other)
-
-    #def prepend(self, other):
-    #    if isinstance(other, Transform):
-    #        other = other._nsAffineTransform
-    #    self._nsAffineTransform.prependTransform_(other)
+        self._qtransform = self._qtransform.inverted()
+
+    def append(self, other):
+        if isinstance(other, Transform):
+            other = other._qtransform
+        self._qtransform *= other
+
+    def prepend(self, other):
+        if isinstance(other, Transform):
+            other = other._qtransform
+        other = QTransform(other)
+        other *= self._qtransform
+        self._qtransform = other
 
     def transformPoint(self, point):
@@ -664 +684 @@
         elif isinstance(point, Point):
             point = point._qPoint
-        return self._qTransform.map(point)
+        return self._qtransform.map(point)
 
     def transformBezierPath(self, path):
@@ -671 +691 @@
         else:
             raise NodeBoxError, "Can only transform BezierPaths"
-        path._qPath = self._qTransform.map(path._qPath)
+        path._qpath = self._qtransform.map(path._qpath)
         return path
 
@@ -767 +787 @@
                 t = Transform()
                 t.translate(self.x, self.y)
-                #t.concat()
-                painter.setTransform(t._qTransform)
+                t.concat(painter)
 
                 # Set new width and height factors. Note that no scaling is done yet: they're just here
@@ -780 +799 @@
                 t = Transform()
                 t.translate(dX, dY)
-                #t.concat()
+                t.concat(painter)
 
                 # Do current transformation.
-                #self._transform.concat()
+                self._transform.concat(painter)
 
                 # Move back to the previous position.
                 t = Transform()
                 t.translate(-dX, -dY)
-                #t.concat()
+                t.concat(painter)
 
                 # Finally, scale the image according to the factors.
                 t = Transform()
                 t.scale(factor)
-                #t.concat()
+                t.concat(painter)
             else:
                 # Do current transformation
@@ -801 +820 @@
                 t.translate(self.x, self.y) # Here we add the positioning of the image.
                 t.scale(factor)
-                #t.concat()
+                t.concat(painter)
 
             # A debugImage draws a black rectangle instead of an image.
@@ -825 +844 @@
                 t = Transform()
                 t.translate(x+deltaX, y+deltaY)
-                # t.concat()
+                t.concat(painter)
                 x = -deltaX
                 y = -deltaY
             # Do current transformation
-            # self._transform.concat()
+            self._transform.concat(painter)
             # A debugImage draws a black rectangle instead of an image.
             if self.debugImage:
@@ -845 +864 @@
 
     __dummy_color = QColor()
+    __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):
@@ -858 +878 @@
         self._fontsize = kwargs.get('fontsize', 24)
         self._lineheight = max(kwargs.get('lineheight', 1.2), 0.01)
-        self._align = kwargs.get('align', NSLeftTextAlignment)
+        self._align = kwargs.get('align', LEFT)
 
     def copy(self):
@@ -869 +889 @@
     def font_exists(cls, fontname):
         # Check if the font exists.
-        f = QFont.font(fontName)
+        f = QFont(fontname)
         return f.exactMatch()
     font_exists = classmethod(font_exists)
@@ -875 +895 @@
     def _get_font(self):
         return QFont(self._fontname, self._fontsize)
-    font = property(_get_font)
+    _qfont = property(_get_font)
 
     def _draw(self, painter):
+        if self.width is None:
+            w = 100000
+        else:
+            w = self.width
+        if self.height is None:
+            h = 100000
+        else:
+            h = self.height
+        fm = painter.fontMetrics()
+        flags = self.__alignMap[self._align]
+        r = fm.boundingRect(self.x, self.y, w, h, flags, self.text)
+
         if self._fillcolor is None: return
-        x,y = self.x, self.y
+        x,y = r.x(), r.y()
+        preferredWidth, preferredHeight = r.width(), r.height()
         if self.width is not None:
             if self._align == RIGHT:
@@ -892 +925 @@
             deltaY = h / 2
             t = Transform()
-            t.translate(x+deltaX, y-self.font.defaultLineHeightForFont()+deltaY)
-            #t.concat()
-            self._transform.concat()
-            painter.drawText(x, y, w, h, self.text)
+            t.translate(x+deltaX, y-fm.ascent()+deltaY)
+            t.concat(painter)
+            self._transform.concat(painter)
+            painter.drawText(x, y, w, h, flags, self.text)
             #layoutManager.drawGlyphsForGlyphRange_atPoint_(glyphRange, (-deltaX-dx,-deltaY-dy))
         else:
@@ -906 +939 @@
     def _get_metrics(self):
         # TODO: Measure using boundingRect
-        return 100, 100
+        flags = self.__alignMap[self._align]
+        fm = QFontMetrics(self._qfont)
+        
+        if self.width is None:
+            w = 100000
+        else:
+            w = self.width
+        if self.height is None:
+            h = 100000
+        else:
+            h = self.height
+
+        r = fm.boundingRect(self.x, self.y, w, h, flags, self.text)
+        return r.width(), r.height()
     metrics = property(_get_metrics)
 
     def _get_path(self):
-        return None
+        p = QPainterPath()
+        p.addText(0, 0, self._qfont, self.text)
+        path = BezierPath(self._ctx, p)
+        path.inheritFromContext()
+        return path
     path = property(_get_path)
     

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

@@ -74 +74 @@
             outputView.setTextColor(QColor(255, 0, 0)) # TODO: Refactor color
             outputView.insertPlainText(data)
-        p.end()
+        finally:
+            p.end() # TODO: This doesn't fix the QWidget warning if error happens during drawing.
         self._image = img
         
@@ -168 +169 @@
 
     def createGUI(self):
+        # The font should come and be set as a preference.
+        # We prefer Monaco as a startup font.
         
         codeFont = QFont()
         codeFont.setStyleHint(QFont.TypeWriter, QFont.PreferAntialias)
-        print codeFont.defaultFamily()
-        codeFont.setFamily(codeFont.defaultFamily())
+        if sys.platform == "darwin":
+            codeFont.setFamily("Monaco")
+        else:
+            codeFont.setFamily(codeFont.defaultFamily())
+        codeFont.setPointSize(12)
         codeFormat = QTextCharFormat()
         codeFormat.setFont(codeFont)
@@ -203 +209 @@
         self.view_edit.addWidget(self.graphicsScroll)
         self.view_edit.addWidget(self.code_errors)
-        
-        #mainLayout = QGridLayout()
-        #mainLayout.addWidget(self.view_edit)
+        l = QGridLayout()
+        l.setHorizontalSpacing(10)
+        l.setVerticalSpacing(10)
+        self.view_edit.setLayout(l)
+        
+        #self.centralWidget = QWidget()
+        #self.centralWidget.addWidget(self.view_edit)
+        #self.centralWidget.setLayout(QGridLayout())
+        
         self.setCentralWidget(self.view_edit)
+        self.setUnifiedTitleAndToolBarOnMac(True)
+        self.codeView.setFocus()
 
         self.setWindowTitle(self.tr("Untitled"))
@@ -280 +294 @@
     @pyqtSignature("")
     def doRun(self):
-        print "run"
         if self.fullScreen is not None: return
         self.currentView = self.graphicsView
@@ -526 +539 @@
                 lastErr = isErr
             outputView.insertPlainText(data)
+        outputView.ensureCursorVisible()
 
     def _compileScript(self, source=None):
@@ -571 +585 @@
             self.home = 'C:/' # os.getenv('HOME')
             self.lib = os.path.join(self.home, "NodeBox") # os.path.join(self.home, "Library", "Application Support", "NodeBox")
-        elif sys.platform == "mac":
+        elif sys.platform == "darwin":
             self.home = os.getenv('HOME')
             self.lib = os.path.join(self.home, "Library", "Application Support", "NodeBox")

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

@@ -50 +50 @@
     if stats.number_of_differences > 0:
         differences = True
-        print "E",
+        print "F",
     else:
         print ".",