Changeset 161 for branches/turbo/avango-core/src/avango/nodes/tests/TestFieldConnectionChangeInNotify.cpp

Timestamp:

05/15/09 17:33:25 (3 years ago)

Author:

rkuck

Message:

Removed all Field callbacks except getter and setter

File:

• branches/turbo/avango-core/src/avango/nodes/tests/TestFieldConnectionChangeInNotify.cpp (modified) (3 diffs)

branches/turbo/avango-core/src/avango/nodes/tests/TestFieldConnectionChangeInNotify.cpp

@@ -43 +43 @@
   public:
 
-    MyObject();
-    void valueChanged(const av::SFInt::ChangedEvent event);
+    MyObject() {}
+    MyObject(av::Field* field);
+    void fieldHasChanged(const av::Field& field);
 
+  private:
+    av::Field* mOtherField;
   };
 
@@ -59 +62 @@
   }
 
-  MyObject::MyObject()
+  MyObject::MyObject(av::Field* field) :
+    mOtherField(field)
   {
-    Value.addChangedCallback(boost::bind(&MyObject::valueChanged, this, _1));
   }
 
-  void MyObject::valueChanged(const av::SFInt::ChangedEvent event)
+  void MyObject::fieldHasChanged(const av::Field& field)
   {
-    if (event.getTriggeredFromField() && Value.getValue() == 1)
+    if (Value.getValue() == 1)
     {
       AVANGO_LOG(logger,av::logging::INFO , "fieldHasChanged: disconnecting from source field");
       Value.enableNotify(false);
-      Value.disconnectFrom(event.getTriggeredFromField());
+      Value.disconnectFrom(mOtherField);
       Value.enableNotify(true);
     }
-    if (event.getTriggeredFromField() && Value.getValue() == 3)
+    if (Value.getValue() == 3)
     {
       AVANGO_LOG(logger,av::logging::INFO , "fieldHasChanged: disconnecting all fields from source field");
       Value.enableNotify(false);
-      event.getTriggeredFromField()->disconnectAuditors();
+      mOtherField->disconnectAuditors();
       Value.enableNotify(true);
     }
@@ -87 +90 @@
 
     av::Link<av::IntObject> src(new av::IntObject);
-    av::Link<MyObject> dst1(new MyObject);
+    av::Link<MyObject> dst1(new MyObject(&src->Value));
     av::Link<av::IntObject> dst2(new av::IntObject);