# HG changeset patch
# User Chris Cannam
# Date 1435753623 -3600
# Node ID a65328f0c45067b31d55cdf4b0aa97f646bab37d
# Parent  ee0aff1d0743680befe36e5627d31c019778d0b0# Parent  16574eea3229569733af0ce77db646366d8391e6
Merge from branch simple-fft-model

diff -r 16574eea3229 -r a65328f0c450 base/PropertyContainer.cpp
--- a/base/PropertyContainer.cpp	Tue Jun 30 10:26:23 2015 +0100
+++ b/base/PropertyContainer.cpp	Wed Jul 01 13:27:03 2015 +0100
@@ -59,6 +59,12 @@
     return QString();
 }
 
+QString
+PropertyContainer::getPropertyValueIconName(const PropertyName &, int) const
+{
+    return QString();
+}
+
 RangeMapper *
 PropertyContainer::getNewPropertyRangeMapper(const PropertyName &) const
 {
diff -r 16574eea3229 -r a65328f0c450 base/PropertyContainer.h
--- a/base/PropertyContainer.h	Tue Jun 30 10:26:23 2015 +0100
+++ b/base/PropertyContainer.h	Wed Jul 01 13:27:03 2015 +0100
@@ -91,6 +91,13 @@
 					  int value) const;
 
     /**
+     * If the given property is a ValueProperty, return the icon to be
+     * used for the given value for that property, if any.
+     */
+    virtual QString getPropertyValueIconName(const PropertyName &,
+                                             int value) const;
+
+    /**
      * If the given property is a RangeProperty, return a new
      * RangeMapper object mapping its integer range onto an underlying
      * floating point value range for human-intelligible display, if