Changeset 1639 for trunk

Timestamp:

08/29/09 07:00:15 (14 years ago)

Author:

arnonym

Message:

More on the mixingmatrix. channels can be hidden now.

Files:

• trunk/libffado/support/mixer-qt4/mixer_saffire_dice.py (modified) (4 diffs)

trunk/libffado/support/mixer-qt4/mixer_saffire_dice.py

@@ -23 +23 @@
-
-class MatrixNode(QtGui.QFrame):
-row,col,
+ row, col, 
-        QtGui.QFrame.__init__(self,parent)
-        self.row = row
+        self.connect(self.row, QtCore.SIGNAL("hide"), self.setHidden)
-        self.column = col
+        self.connect(self.column, QtCore.SIGNAL("hide"), self.setHidden)
-
-        self.setLineWidth(1)
@@ -33 +35 @@
-        self.setLayout(self.layout)
-
-
-
+#
+#
-
-        self.dial = QtGui.QDial(self)
-        self.dial.setRange(0,pow(2,16-1))
-        self.connect(self.dial, QtCore.SIGNAL("valueChanged(int)"), self.valueChanged)
-1
+0
-
-    def valueChanged(self, n):
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-class MatrixMixer(QtGui.QWidget):
-servername,basepath,
+ servername, basepath, 
-        QtGui.QWidget.__init__(self, parent)
-        self.bus = dbus.SessionBus()
@@ -51 +76 @@
-        self.interface = dbus.Interface(self.dev, dbus_interface="org.ffado.Control.Element.MatrixMixer")
-
-
-
+
+
+
+
+
+
+
-
-        layout = QtGui.QGridLayout(self)
-        self.setLayout(layout)
-
+        self.columns = []
+        self.rows = []
+
+        # Add row/column headers
+        for i in range(cols):
+            ch = MatrixChannel(i, self)
+            layout.addWidget(ch, 0, i+1)
+            self.columns.append( ch )
+        for i in range(rows):
+            ch = MatrixChannel(i, self)
+            layout.addWidget(ch, i+1, 0)
+            self.rows.append( ch )
+
+        # Add node-widgets
-        for i in range(rows):
-            for j in range(cols):
-i, j
+self.rows[i], self.columns[j]
-                node.dial.setValue(self.interface.getValue(i, j))
-                self.connect(node, QtCore.SIGNAL("valueChanged"), self.valueChanged)
-, j
++1, j+1
-
-    def valueChanged(self, row, column, n):
-        #print "MatrixNode.valueChanged( %i, %i, %i )" % (row,column,n)
-        self.interface.setValue(row, column, n)
+
+    def paintEvent(self, event):
+        p = QtGui.QPainter(self)
+        p.fillRect(event.rect(), self.palette().window())
-
-class Saffire_Dice(QtGui.QWidget):
@@ -73 +121 @@
-        self.layout = QtGui.QGridLayout(self)
-        self.setLayout(self.layout)
+        self.mixerwidget = QtGui.QScrollArea(self)
+        self.mixerwidget.setWidgetResizable(True)
+        self.layout.addWidget(self.mixerwidget)
-
-    def buildMixer(self):
-
-
+#
+#
-        self.matrix = MatrixMixer(self.hw.servername, self.hw.basepath+"/EAP/MatrixMixer", self)
-layout.add
+mixerwidget.set
-
-
-
+#
+#
-
-