Rooba
/
kivy
mirror of https://github.com/kivy/kivy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

properties: move the == comparaison in set() in compare_value() function. 

properties: add a NumpyProperty, that copy the default value instead of just using it + adapt comparaison for numpy matrices
This commit is contained in:
Mathieu Virbel 2010-12-15 02:35:38 +01:00
parent 0cc61bbf32
commit 0647d0777e
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kivy/c_ext/properties.pyx
View File

@ -66,13 +66,16 @@ cdef class Property:
return self return self
return self.get(obj) return self.get(obj)
cdef compare_value(self, a, b):
return a == b
cpdef set(self, obj, value): cpdef set(self, obj, value):
'''Set a new value for the property '''Set a new value for the property
''' '''
value = self.convert(obj, value) value = self.convert(obj, value)
d = self.storage[obj.__uid] d = self.storage[obj.__uid]
realvalue = d['value'] realvalue = d['value']
if realvalue == value: if self.compare_value(realvalue, value):
return False return False
self.check(obj, value) self.check(obj, value)
d['value'] = value d['value'] = value
@ -267,7 +270,7 @@ cdef class ReferenceListProperty(Property):
cdef int idx cdef int idx
storage = self.storage[obj.__uid] storage = self.storage[obj.__uid]
value = self.convert(obj, value) value = self.convert(obj, value)
if storage['value'] == value: if self.compare_value(storage['value'], value):
return False return False
self.check(obj, value) self.check(obj, value)
# prevent dependice loop # prevent dependice loop
@ -326,3 +329,11 @@ cdef class AliasProperty(Property):
cpdef set(self, obj, value): cpdef set(self, obj, value):
self.storage[obj.__uid]['setter'](obj, value) self.storage[obj.__uid]['setter'](obj, value)
cdef class NumpyProperty(Property):
cdef init_storage(self, dict storage):
Property.init_storage(self, storage)
storage['value'] = self.defaultvalue.copy()
cdef compare_value(self, a, b):
return (a == b).all()