[FFADO-svn] r1680 - trunk/libffado/support/mixer-qt4/ffado/widgets

[<tr...@ff...>]

Author: arnonym
Date: 2009-10-08 13:59:43 -0700 (Thu, 08 Oct 2009)
New Revision: 1680

Added:
   trunk/libffado/support/mixer-qt4/ffado/widgets/ntompanner.py
Modified:
   trunk/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py
Log:
Some older changes to the crossbarrouter. Most prominent: The VU have to be hand-activated...

And start a panning widget that allows to pan an arbitary number of sources to be panned to an arbitary number of sinks. In 2D.


Modified: trunk/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py
===================================================================
--- trunk/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py	2009-10-08 14:28:29 UTC (rev 1679)
+++ trunk/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py	2009-10-08 20:59:43 UTC (rev 1680)
@@ -186,7 +186,7 @@
 
         btn = QtGui.QPushButton("Switch VU", self)
         btn.setCheckable(True)
-        btn.setChecked(True)
+        #btn.setChecked(True)
         self.connect(btn, QtCore.SIGNAL("toggled(bool)"), self.runVu)
         self.toplayout.addWidget(btn)
 
@@ -202,7 +202,7 @@
         self.timer = QtCore.QTimer(self)
         self.timer.setInterval(200)
         self.connect(self.timer, QtCore.SIGNAL("timeout()"), self.updateLevels)
-        self.runVu(True)
+        #self.runVu(True)
 
     def runVu(self, run=True):
         if run:
@@ -213,11 +213,13 @@
                 self.switchers[sw].peakValue(0)
 
     def updateLevels(self):
-        #print "CrossbarRouter.updateLevels()"
+        #log.debug("CrossbarRouter.updateLevels()")
         peakvalues = self.interface.getPeakValues()
-        #print "Got %i peaks" % len(peakvalues)
+        #log.debug("Got %i peaks" % len(peakvalues))
         for peak in peakvalues:
-            self.switchers[peak[0]].peakValue(peak[1])
+            #log.debug("peak = [%s,%s]" % (str(peak[0]),str(peak[1])))
+            if peak[0] >= 0:
+                self.switchers[peak[0]].peakValue(peak[1])
 
 #
 # vim: sw=4 ts=4 et

Added: trunk/libffado/support/mixer-qt4/ffado/widgets/ntompanner.py
===================================================================
--- trunk/libffado/support/mixer-qt4/ffado/widgets/ntompanner.py	                        (rev 0)
+++ trunk/libffado/support/mixer-qt4/ffado/widgets/ntompanner.py	2009-10-08 20:59:43 UTC (rev 1680)
@@ -0,0 +1,146 @@
+#
+# Copyright (C) 2009 by Arnold Krille
+#
+# This file is part of FFADO
+# FFADO = Free Firewire (pro-)audio drivers for linux
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from PyQt4 import QtGui, QtCore, Qt
+import dbus, math
+
+import logging
+log = logging.getLogger("widgets")
+
+percentage = 0.2
+circlerect = QtCore.QRectF(-percentage/2, -percentage/2, percentage, percentage)
+
+class PannerSource(QtGui.QGraphicsEllipseItem):
+    def __init__(self, number, parent):
+        QtGui.QGraphicsEllipseItem.__init__(self)
+        self.setRect(circlerect)
+
+        self.number = number
+        self.parent = parent
+
+        self.setBrush(QtGui.QColor(255, 0, 0))
+        self.setPen(QtGui.QPen(Qt.Qt.NoPen))
+
+        self.setFlags(QtGui.QGraphicsItem.ItemIsMovable | QtGui.QGraphicsItem.ItemIsFocusable)
+
+    def focusInEvent(self, ev):
+        QtGui.QGraphicsEllipseItem.focusInEvent(self, ev)
+
+    def itemChange(self, change, value):
+        if change == QtGui.QGraphicsItem.ItemPositionChange:
+            value = self.parent.nearestSink(value.toPointF())
+        if change == QtGui.QGraphicsItem.ItemPositionHasChanged:
+            self.parent.sourcePositionChanged(self.number, value.toPointF())
+        return QtGui.QGraphicsEllipseItem.itemChange(self, change, value)
+
+class N2MPanner(QtGui.QFrame):
+    def __init__(self, parent):
+        QtGui.QFrame.__init__(self, parent)
+
+        layout = QtGui.QGridLayout(self)
+        self.setLayout(layout)
+
+        self.view = QtGui.QGraphicsView(self)
+        layout.addWidget(self.view, 0, 0)
+
+        self.scene = QtGui.QGraphicsScene(QtCore.QRectF(-1, -1, 2, 2), self)
+        self.view.setScene(self.scene)
+
+        self.scene.addEllipse( QtCore.QRectF(-1,-1,2,2), QtGui.QPen(self.palette().color(QtGui.QPalette.Window).darker() ) )
+
+        self.pen = QtGui.QPen(self.palette().color(QtGui.QPalette.Window).darker())
+        #pen.setWidthF(0.01)
+
+        self.sinks = []
+        self.values = [ [], [] ]
+        print self.values
+
+        self.scene.addItem(PannerSource(0,self))
+        self.scene.addItem(PannerSource(1,self))
+
+        #self.updateGeometry()
+        QtCore.QTimer.singleShot(10, self.resizeEvent)
+
+    def setNumberOfSinks(self, sinknr):
+        print "N2MPanner.setNumberOfSinks() sinknr=%i len(self.sinks)=%i" % (sinknr,len(self.sinks))
+        while len(self.sinks) > 0:
+            self.sinks[-1].setParentItem(None)
+            del self.sinks[-1]
+        print "N2MPanner.setNumberOfSinks() sinknr=%i len(self.sinks)=%i" % (sinknr,len(self.sinks))
+        while len(self.sinks) < sinknr:
+            c = self.scene.addEllipse(circlerect, self.pen)
+            c.setZValue(1)
+            self.sinks.append(c)
+        for i in range(sinknr):
+            degree = 2*math.pi/sinknr * i
+            self.sinks[i].setPos(math.cos(degree), math.sin(degree))
+        self.update()
+        print "N2MPanner.setNumberOfSinks() sinknr=%i len(self.sinks)=%i" % (sinknr,len(self.sinks))
+
+
+    def distance(self, p1, p2):
+        return math.sqrt( math.pow(p1.x()-p2.x(), 2) + math.pow(p1.y()-p2.y(), 2) )
+
+    def sourcePositionChanged(self, number, point):
+        print "N2MPanner.sourcePositionChanged( %i, [%g, %g] )" % (number, point.x(), point.y())
+        for sink in self.sinks:
+            index = self.sinks.index(sink)
+            #self.values[number].extend(index)
+            while len(self.values[number]) < index+1:
+                self.values[number].append(0)
+            self.values[number][index] = self.distance(point, sink.pos())
+            #print " distance to sink(%g, %g) is %g" % (sink.x(), sink.y(), self.distance(point, sink.pos()))
+        print self.values
+
+    def nearestSink(self, point):
+        for sink in self.sinks:
+            if sink.contains(sink.mapFromParent(point)):
+                return sink.pos()
+        return point
+
+    def resizeEvent(self, event=None):
+        self.view.fitInView(QtCore.QRectF(-1.2, -1.2, 2.4, 2.4), Qt.Qt.KeepAspectRatio)
+
+
+if __name__ == "__main__":
+
+    import sys
+
+    app = QtGui.QApplication(sys.argv)
+
+    w = QtGui.QWidget(None)
+    l = QtGui.QVBoxLayout(w)
+
+    s = QtGui.QSpinBox(w)
+    s.setRange(1,10)
+    l.addWidget(s)
+
+    p = N2MPanner(w)
+    p.setNumberOfSinks(1)
+    QtCore.QObject.connect(s, QtCore.SIGNAL("valueChanged(int)"), p.setNumberOfSinks)
+    l.addWidget(p)
+
+    w.show()
+
+    app.exec_()
+
+
+#
+# vim: et ts=4 sw=4