Changeset 415:8146bf9e3e20

Timestamp:

05/05/10 12:21:25 (3 years ago)

Author:

rkuck

Branch:

default

Convert:

svn:76c98907-0e80-4c83-94c7-b346fc2aefc2/trunk@421

Message:

Made field_has_changed work again in new python script class

Location:

avango-python/src

Files:

• avango/script/Script.cpp (modified) (3 diffs)
• avango/script/Script.h (modified) (3 diffs)
• avango/script/_meta_script.py (modified) (4 diffs)
• tests/TestScript.py (modified) (2 diffs)

avango-python/src/avango/script/Script.cpp

@@ -43 +43 @@
   mSelf(self),
   mType(type),
-  mIsFloatingRef(false)
+  mIsFloatingRef(false),
+  mHasFieldHasChangedEnabled(false)
 {
 }
@@ -106 +107 @@
     handle_exception();
   }
+}
+
+/*virtual*/ void av::script::Script::fieldHasChanged(const Field& field)
+{
+  if (mHasFieldHasChangedEnabled)
+    call_method<void>(mSelf, "_fieldHasChanged", boost::ref(field));
+}
+
+void av::script::Script::enableFieldHasChanged(void)
+{
+  mHasFieldHasChangedEnabled = true;
 }
 
@@ -207 +219 @@
   class_<Script, bases<av::FieldContainer>, boost::noncopyable>
     ("_Script", "Internal base class for Script nodes", init<av::Type>())
+    .def("_enable_field_has_changed", &Script::enableFieldHasChanged)
     ;
 

avango-python/src/avango/script/Script.h

@@ -53 +53 @@
       PyObject* getSelf(void) const;
 
+      void enableFieldHasChanged(void);
+
       static void register_exception_handler(boost::python::object handler);
 
@@ -58 +60 @@
 
       /*virtual*/ void evaluate();
+      /*virtual*/ void fieldHasChanged(const Field& field);
 
     private:
@@ -70 +73 @@
       av::Type mType;
       bool mIsFloatingRef;
+      bool mHasFieldHasChangedEnabled;
       static av::Type sType;
       static boost::python::object sHandler;

avango-python/src/avango/script/_meta_script.py

@@ -28 +28 @@
 import _script
 
+def field_has_changed(field):
+    class container(object):
+        def __init__(self, field):
+            self.field = field
+        def __call__(self, function):
+            function.field_has_changed_field = self.field
+            return function
+    if isinstance(field, avango.Field):
+        return container(field)
+    else:
+        field.field_has_changed_field = None
+        return field
+
 class ScriptMetaclass(type):
     def __init__(cls, classname, bases, classdict):
@@ -47 +60 @@
 
         Wrapper._fields = list(getattr(base, '_fields', []))
+        Wrapper._field_has_changed = {}
         for name, attribute in classdict.iteritems():
             if isinstance(attribute, avango.Field):
                 Wrapper._fields.append( (name, attribute) )
                 continue
+
+            if hasattr(attribute, "field_has_changed_field"):
+                Wrapper._field_has_changed[attribute.field_has_changed_field] = attribute
+
             setattr(Wrapper, name, attribute)
 
@@ -70 +88 @@
     def __init__(self):
         self.super(Script, self).__init__(self._type)
+
+        # Fields that are added are clones of the prototype given in the class
+        # definition. We therefore need to transform the dictionary mapping
+        # fields to registered callbacks
+        transformed_field_has_changed = {}
+
         for name, field in self._fields:
             self.add_field(field, name)
+            if field in self._field_has_changed:
+                transformed_field_has_changed[self._get_field(name)] = self._field_has_changed[field]
+        self._field_has_changed = transformed_field_has_changed
+
+        if self._field_has_changed:
+            self._enable_field_has_changed()
 
     @staticmethod
@@ -80 +110 @@
     def evaluate(self):
         pass
+
+    def _fieldHasChanged(self, field):
+        if field in self._field_has_changed:
+            self._field_has_changed[field](self)

avango-python/src/tests/TestScript.py

@@ -73 +73 @@
         values.field += 1
 
-#class HasFieldCallbacks(avango.script.Script):
-#    value1 = avango.SFInt()
-#    value2 = avango.SFInt()
-#
-#    def __init__(self):
-#        self.set_value1 = 0
-#        self.set_value2 = 0
-#
-#    @avango.script.field_has_changed(value1)
-#    def callback1(self):
-#        self.set_value1 = 2
-#
-#    @avango.script.field_has_changed(value2)
-#    def callback2(self):
-#        self.set_value2 = 3
-#
+class HasFieldCallbacks(avango.script.Script):
+    value1 = avango.SFInt()
+    value2 = avango.SFInt()
+
+    def __init__(self):
+        self.super(HasFieldCallbacks, self).__init__()
+        self.set_value1 = 0
+        self.set_value2 = 0
+
+    @avango.script.field_has_changed(value1)
+    def callback1(self):
+        self.set_value1 = 2
+
+    @avango.script.field_has_changed(value2)
+    def callback2(self):
+        self.set_value2 = 3
+
 #class DerivedHasFieldCallbacks(HasFieldCallbacks): pass
 #
@@ -295 +296 @@
         self.assertEqual(node.field.value, 3)
 
-#    def testFieldHasChanged(self):
-#        node = HasFieldCallbacks()
-#        self.assert_(node)
-#
-#        node.value1.value = 1
-#        self.assertEqual(node.set_value1, 2)
-#
-#        node.value2.value = 1
-#        self.assertEqual(node.set_value2, 3)
+    def testFieldHasChanged(self):
+        node = HasFieldCallbacks()
+        self.assert_(node)
+
+        node.value1.value = 1
+        self.assertEqual(node.set_value1, 2)
+
+        node.value2.value = 1
+        self.assertEqual(node.set_value2, 3)
 
     def testSetObjectValue(self):