Changeset 1644

Timestamp:

08/30/09 15:36:59 (14 years ago)

Author:

arnonym

Message:

Smaller buttons for the router-states. The group names have an increasing off-by-one error I can't put my finger on now...

Files:

• trunk/libffado/support/mixer-qt4/ffado/mixer/saffire_dice.py (modified) (2 diffs)
• trunk/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py (modified) (3 diffs)

trunk/libffado/support/mixer-qt4/ffado/mixer/saffire_dice.py

@@ -32 +32 @@
-        self.tabs = QtGui.QTabWidget(self)
-        self.layout.addWidget(self.tabs)
-        #self.mixerwidget = QtGui.QScrollArea(self)
-        #self.mixerwidget.setWidgetResizable(True)
-        #self.layout.addWidget(self.mixerwidget)
-
-    def buildMixer(self):
@@ -40 +37 @@
-        #print self.hw.getText("/Generic/Nickname")
-        self.matrix = MatrixMixer(self.hw.servername, self.hw.basepath+"/EAP/MatrixMixer", self)
-        #self.mixerwidget.setWidget(self.matrix)
-        scrollarea = QtGui.QScrollArea(self.tabs)
-        scrollarea.setWidgetResizable(True)

trunk/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py

@@ -23 +23 @@
-
-
+class CrossbarState(QtGui.QAbstractButton):
+    def __init__(self, title, parent=None):
+        QtGui.QAbstractButton.__init__(self, parent)
+        self.setText(title)
+        self.setToolTip(title)
+
+        self.setMinimumSize(QtCore.QSize(10, 10))
+
+    def paintEvent(self, event):
+        p = QtGui.QPainter(self)
+        color = QtGui.QColor(0, 255, 0)
+        if self.isChecked():
+            color = QtGui.QColor(255, 0, 0)
+        p.fillRect(self.rect(), color)
+
-
-class CrossbarRouter(QtGui.QWidget):
@@ -43 +58 @@
-        print "Available destinations (%i=?%i) %s" % (self.interface.getNbDestinations(), len(self.destinations), str(self.destinations))
-
+        self.innames = []
+        self.ingroups = {}
+        for ch in self.sources:
+            tmp = ch.split(":")[0]
+            if not tmp in self.ingroups:
+                self.ingroups[tmp] = 0
+                self.innames.append(tmp)
+            self.ingroups[tmp] = self.ingroups[tmp] + 1
+        print self.ingroups
+        self.outnames = []
+        self.outgroups = {}
+        for ch in self.destinations:
+            tmp = ch.split(":")[0]
+            if not tmp in self.outgroups:
+                self.outgroups[tmp] = 0
+                self.outnames.append(tmp)
+            self.outgroups[tmp] = self.outgroups[tmp] + 1
+        print self.outgroups
+
-        self.layout = QtGui.QGridLayout(self)
-        self.setLayout(self.layout)
-
+        tmp = 1
+        for group in self.innames:
+            lbl = QtGui.QLabel(group, self)
+            self.layout.addWidget(lbl, 0, tmp + self.innames.index(group), 1, self.ingroups[group])
+            tmp += self.ingroups[group]
+        tmp = 1
+        for group in self.outnames:
+            lbl = QtGui.QLabel(group, self)
+            self.layout.addWidget(lbl, tmp + self.outnames.index(group), 0, self.outgroups[group], 1)
+            tmp += self.outgroups[group]
-        #for i in range(len(self.sources)):
-        #    lbl = QtGui.QLabel(self.sources[i], self)
@@ -53 +97 @@
-        #    self.layout.addWidget(lbl, i+1, 0)
-
-len(self.sources
+min(600, len(self.sources)
-            print "Checking connections for source %s" % self.sources[i]
-
-
-
+
+
+
+
-                    checkbox.setCheckable(True)
-                    checkbox.setChecked(self.interface.getConnectionState(i, j))
-
-#
+#
+
-#
-# vim: sw=4 ts=4 et