Changeset 53e24573f438b3127f3acf8dddba3fc383178aa5

Timestamp:

06/06/09 02:21:54 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

92734ec69ee76842de3cb995ad24056caa272fde

Parents:

a0304dc201653703aa54a0878fabdf3f06b9f0c9

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2009-06-06T02:21:54Z+0300

Message:

Logarithmic scales for frequency and pandwidth knobs

Files:

• ui (modified) (10 diffs)

ui

@@ -26 +26 @@
 import xml.dom.minidom
 import cairo
-from math import pi, sin, cos, atan2
+from math import pi, sin, cos, atan2, log
 from colorsys import hls_to_rgb, rgb_to_hls
 import liblo
@@ -115 +115 @@
 
     def show_tooltip(self, knob):
-        text = knob.format_value(knob.value)
-        self.tooltip.set_text(knob.format_value(knob.max_value))
+        text = knob.format_value()
         rc = knob.get_allocation()
         x,y = knob.window.get_origin()
@@ -153 +152 @@
         knob_tooltip = KnobTooltip()
     return knob_tooltip
+
+class SmartAdjustment(gtk.Adjustment):
+    def __init__(self, log=False, value=0, lower=0, upper=0, step_incr=0, page_incr=0, page_size=0):
+        self.log = log
+        gtk.Adjustment.__init__(self, value, lower, upper, step_incr, page_incr, page_size)
+        self.normalized_value = self.real2norm(self.value)
+
+    def real2norm(self, value):
+        if self.log:
+            return log(value / self.lower, self.upper / self.lower)
+        else:
+            return (value - self.lower) / (self.upper - self.lower)
+
+    def norm2real(self, value):
+        if self.log:
+            return self.lower * pow(self.upper / self.lower, value)
+        else:
+            return value * (self.upper - self.lower) + self.lower
+
+    def set_value(self, value):
+        self.normalized_value = self.real2norm(value)
+        gtk.Adjustment.set_value(self, value)
+
+    def get_normalized_value(self):
+        return self.normalized_value
+
+    def set_normalized_value(self, value):
+        self.normalized_value = value
+
+        if self.normalized_value < 0.0:
+            self.normalized_value = 0.0
+        elif self.normalized_value > 1.0:
+            self.normalized_value = 1.0
+
+        self.set_value(self.norm2real(self.normalized_value))
 
 class Knob(gtk.VBox):
@@ -185 +219 @@
 
     def set_adjustment(self, adj):
-        self.min_value = adj.lower
-        self.max_value = adj.upper
-        self.value = adj.value
+        self.min_value = 0.0
+        self.max_value = 1.0
+        self.value = adj.get_normalized_value()
         if self.adj:
             self.adj.disconnect(self.adj_id)
@@ -196 +230 @@
         return self.get_property("sensitive")
 
-    def format_value(self, value):
+    def format_value(self):
+        if self.adj:
+            value = self.adj.value
+        else:
+            value = self.value
         return ("%%.%if" % self.digits) % value
 
@@ -247 +285 @@
 
     def on_adj_value_changed(self, adj):
-        if self.value != adj.value:
-            self.value = adj.value
+        new_value = adj.get_normalized_value()
+        if self.value != new_value:
+            self.value = new_value
             self.refresh()
 
@@ -256 +295 @@
         if self.value != oldval:
             if self.adj:
-                self.adj.set_value(value)
+                self.adj.set_normalized_value(value)
             self.refresh()
 
@@ -690 +729 @@
         self.add_param_box(master_box, self.create_toggle_box(port))
 
-        port = {'index': 1, 'name': 'Gain', 'type': 'knob', 'min': -20.0, 'max': 20.0, 'unit': 'dB'}
+        port = {'index': 1, 'name': 'Gain', 'type': 'knob', 'min': -20.0, 'max': 20.0, 'unit': 'dB', 'log': False}
         self.ports.append(port)
         self.add_param_box(master_box, self.create_knob_box(port))
@@ -698 +737 @@
         band_parameters = [
             {'name': 'Active', 'type': 'toggle'},
-            {'name': 'Frequency', 'type': 'knob', 'unit': 'Hz'},
-            {'name': 'Bandwidth', 'type': 'knob', 'min': 0.125, 'max': 8.0, 'unit': ''},
-            {'name': 'Gain', 'type': 'knob', 'min': -20.0, 'max': 20.0, 'unit': 'dB'}]
+            {'name': 'Frequency', 'type': 'knob', 'unit': 'Hz', 'log': True},
+            {'name': 'Bandwidth', 'type': 'knob', 'min': 0.125, 'max': 8.0, 'unit': '', 'log': True},
+            {'name': 'Gain', 'type': 'knob', 'min': -20.0, 'max': 20.0, 'unit': 'dB', 'log': False}]
 
         freq_min = [  20.0,   40.0,   100.0,   200.0]
@@ -742 +781 @@
         param_box = gtk.VBox()
         step = (port['max'] - port['min']) / 100
-        adj = gtk.Adjustment(port['min'], port['min'], port['max'], step, step * 20)
+        adj = SmartAdjustment(port['log'], port['min'], port['min'], port['max'], step, step * 20)
         adj.port = port
         port['adj'] = adj