[Sv1-commits] SF.net SVN: sv1: [402] sonic-visualiser/trunk/widgets

[<ca...@us...>]

Revision: 402
          http://svn.sourceforge.net/sv1/?rev=402&view=rev
Author:   cannam
Date:     2006-10-17 06:50:17 -0700 (Tue, 17 Oct 2006)

Log Message:
-----------

* minor fixes to tooltip

Modified Paths:
--------------
    sonic-visualiser/trunk/widgets/AudioDial.cpp
    sonic-visualiser/trunk/widgets/PropertyBox.cpp

Modified: sonic-visualiser/trunk/widgets/AudioDial.cpp
===================================================================
--- sonic-visualiser/trunk/widgets/AudioDial.cpp	2006-10-17 13:49:31 UTC (rev 401)
+++ sonic-visualiser/trunk/widgets/AudioDial.cpp	2006-10-17 13:50:17 UTC (rev 402)
@@ -69,7 +69,8 @@
 // Constructor.
 AudioDial::AudioDial(QWidget *parent) :
     QDial(parent),
-    m_knobColor(Qt::black), m_meterColor(Qt::white),
+    m_knobColor(Qt::black),
+    m_meterColor(Qt::white),
     m_defaultValue(0),
     m_mappedValue(0),
     m_noMappedUpdate(false),
@@ -90,13 +91,19 @@
 
 void AudioDial::setRangeMapper(RangeMapper *mapper)
 {
-    if (!m_rangeMapper) {
+    if (!m_rangeMapper && mapper) {
         connect(this, SIGNAL(valueChanged(int)),
                 this, SLOT(updateMappedValue(int)));
     }
+
     delete m_rangeMapper;
     m_rangeMapper = mapper;
-    m_mappedValue = m_rangeMapper->getValueForPosition(value());
+
+    if (m_rangeMapper) {
+        m_mappedValue = m_rangeMapper->getValueForPosition(value());
+    } else {
+        m_mappedValue = value();
+    }
 }
 
 
@@ -346,9 +353,11 @@
 
 void AudioDial::updateMappedValue(int value)
 {
-    if (m_rangeMapper) {
-        if (!m_noMappedUpdate) {
+    if (!m_noMappedUpdate) {
+        if (m_rangeMapper) {
             m_mappedValue = m_rangeMapper->getValueForPosition(value);
+        } else {
+            m_mappedValue = value;
         }
     }
 

Modified: sonic-visualiser/trunk/widgets/PropertyBox.cpp
===================================================================
--- sonic-visualiser/trunk/widgets/PropertyBox.cpp	2006-10-17 13:49:31 UTC (rev 401)
+++ sonic-visualiser/trunk/widgets/PropertyBox.cpp	2006-10-17 13:50:17 UTC (rev 402)
@@ -181,7 +181,6 @@
 	gainDial->setFixedWidth(24);
 	gainDial->setFixedHeight(24);
 	gainDial->setNotchesVisible(false);
-//!!!	gainDial->setToolTip(tr("Playback Level"));
 	gainDial->setDefaultValue(0);
         gainDial->setObjectName(tr("Playback Gain"));
         gainDial->setRangeMapper(new LinearRangeMapper
@@ -333,7 +332,6 @@
 	    if (inGroup) {
 		dial->setFixedWidth(24);
 		dial->setFixedHeight(24);
-//!!!		dial->setToolTip(propertyLabel);
 		m_groupLayouts[groupName]->addWidget(dial);
 	    } else {
 		dial->setFixedWidth(32);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.