# HG changeset patch
# User Chris Cannam
# Date 1481897765 0
# Node ID 576be7933ec70cd7a24327536c6ad5e315c51bde
# Parent  491a992f856ead12337fa66012590d335eed0140
Introduce a colour map combo too. Doesn't yet have swatches

diff -r 491a992f856e -r 576be7933ec7 base/PropertyContainer.cpp
--- a/base/PropertyContainer.cpp	Thu Dec 15 08:59:19 2016 +0000
+++ b/base/PropertyContainer.cpp	Fri Dec 16 14:16:05 2016 +0000
@@ -178,6 +178,7 @@
 
     case ValueProperty:
     case ColourProperty:
+    case ColourMapProperty:
     {
         int min, max;
         getPropertyRangeAndValue(name, &min, &max, 0);
diff -r 491a992f856e -r 576be7933ec7 base/PropertyContainer.h
--- a/base/PropertyContainer.h	Thu Dec 15 08:59:19 2016 +0000
+++ b/base/PropertyContainer.h	Fri Dec 16 14:16:05 2016 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _PROPERTY_CONTAINER_H_
-#define _PROPERTY_CONTAINER_H_
+#ifndef SV_PROPERTY_CONTAINER_H
+#define SV_PROPERTY_CONTAINER_H
 
 #include "Command.h"
 
@@ -40,6 +40,7 @@
 	RangeProperty, // range of integers
 	ValueProperty, // range of integers given string labels
 	ColourProperty, // colours, get/set as ColourDatabase indices
+        ColourMapProperty, // colour maps, get/set as ColourMapper::StandardMap enum
         UnitsProperty, // unit from UnitDatabase, get/set unit id
 	InvalidProperty, // property not found!
     };