Mercurial > hg > svcore
changeset 1331:576be7933ec7 3.0-integration
Introduce a colour map combo too. Doesn't yet have swatches
| author | Chris Cannam |
|---|---|
| date | Fri, 16 Dec 2016 14:16:05 +0000 |
| parents | 491a992f856e |
| children | b1a7f4554400 46670bb4a290 |
| files | base/PropertyContainer.cpp base/PropertyContainer.h |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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! };