comparison base/PropertyContainer.cpp @ 1365:3382d914e110

Merge from branch 3.0-integration
author Chris Cannam
date Fri, 13 Jan 2017 10:29:44 +0000
parents 576be7933ec7
children 48e9f538e6e9
comparison
equal deleted inserted replaced
1272:6a7ea3bd0e10 1365:3382d914e110
53 return 0; 53 return 0;
54 } 54 }
55 55
56 QString 56 QString
57 PropertyContainer::getPropertyValueLabel(const PropertyName &, int) const 57 PropertyContainer::getPropertyValueLabel(const PropertyName &, int) const
58 {
59 return QString();
60 }
61
62 QString
63 PropertyContainer::getPropertyValueIconName(const PropertyName &, int) const
58 { 64 {
59 return QString(); 65 return QString();
60 } 66 }
61 67
62 RangeMapper * 68 RangeMapper *
170 } 176 }
171 break; 177 break;
172 178
173 case ValueProperty: 179 case ValueProperty:
174 case ColourProperty: 180 case ColourProperty:
181 case ColourMapProperty:
175 { 182 {
176 int min, max; 183 int min, max;
177 getPropertyRangeAndValue(name, &min, &max, 0); 184 getPropertyRangeAndValue(name, &min, &max, 0);
178 for (int i = min; i <= max; ++i) { 185 for (int i = min; i <= max; ++i) {
179 if (valueString == getPropertyValueLabel(name, i)) { 186 if (valueString == getPropertyValueLabel(name, i)) {