Commit 04c1f000 authored by Locatelli's avatar Locatelli
parents ce9b33cf 532cc1ef
......@@ -1493,7 +1493,6 @@ Database::PropertyMap Database::createPropertyItems(const HashMap<string, unsign
item.enumeratedValuesID = dataProperty->getEnumeratedValuesPropertyID();
item.enumeratedLabelsID = dataProperty->getEnumeratedLabelsPropertyID();
}
}
result.insert(propertyName, item);
......
......@@ -200,7 +200,7 @@ void DynamicProperty<Type>::setEnumeratedLabels(const DynamicProperty<std::strin
m_enumeratedLabelsID = labelsProperty.getID();
// Set the dynamic property.
m_propertyManager->setEnumeratedValues(m_ID, m_enumeratedLabelsID);
m_propertyManager->setEnumeratedLabels(m_ID, m_enumeratedLabelsID);
// Set all the properties.
for (int32 i = 0; i < m_size; ++i) {
......
......@@ -206,7 +206,7 @@ void DynamicProperty2<Type>::setEnumeratedLabels(const DynamicProperty<std::stri
m_enumeratedLabelsID = labelsProperty.getID();
// Set the dynamic property.
m_propertyManager->setEnumeratedValues(m_ID, m_enumeratedLabelsID);
m_propertyManager->setEnumeratedLabels(m_ID, m_enumeratedLabelsID);
// Set all the properties.
int32 size1 = getSize();
......
......@@ -110,6 +110,7 @@ public:
std::ostream& toString(int32 index, std::ostream& s, const Type& value) const;
std::string toString(int32 index, const Type& value) const;
std::string toString(int32 index) const;
protected:
template<typename ServantType>
......@@ -266,4 +267,10 @@ std::string ValueDynamicProperty<Type>::toString(int32 index, const Type& value)
}
template<typename Type>
std::string ValueDynamicProperty<Type>::toString(int32 index) const {
return toString(index, get(index));
}
#endif
......@@ -124,6 +124,7 @@ public:
std::ostream& toString(int32 index1, int32 index2, std::ostream& s, const Type& value) const;
std::string toString(int32 index1, int32 index2, const Type& value) const;
std::string toString(int32 index1, int32 index2) const;
protected:
std::vector<int32> m_size;
......@@ -301,4 +302,9 @@ std::string ValueDynamicProperty2<Type>::toString(int32 index1, int32 index2, co
}
template<typename Type>
std::string ValueDynamicProperty2<Type>::toString(int32 index1, int32 index2) const {
return toString(index1, index2, get(index1, index2));
}
#endif
......@@ -88,6 +88,7 @@ public:
std::ostream& toString(std::ostream& s, const Type& value) const;
std::string toString(const Type& value) const;
std::string toString() const;
virtual common::LogElement toPropertyLog(bool hidden = false) const;
......@@ -151,6 +152,11 @@ std::string ValueProperty<Type>::toString(const Type& value) const {
return s.str();
}
template<class Type>
std::string ValueProperty<Type>::toString() const {
return toString(get());
}
template<class Type>
common::LogElement ValueProperty<Type>::toPropertyLog(bool hidden) const {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment