Changeset 161 for branches

Timestamp:

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

Author:

rkuck

Message:

Removed all Field callbacks except getter and setter

Location:

branches/turbo/avango-core

Files:

• include/avango/Field.h (modified) (4 diffs)
• include/avango/TimeSensor.h (modified) (1 diff)
• src/avango/fields/Field.cpp (modified) (9 diffs)
• src/avango/fields/tests/SConscript (modified) (1 diff)
• src/avango/fields/tests/TestFieldCallbacks.cpp (deleted)
• src/avango/interface/TimeSensor.cpp (modified) (2 diffs)
• src/avango/interface/tests/TestTimeSensor.cpp (modified) (2 diffs)
• src/avango/nodes/tests/TestFieldConnectionChangeInNotify.cpp (modified) (3 diffs)

branches/turbo/avango-core/include/avango/Field.h

@@ -65 +65 @@
   public:
 
-    /**
-     * Field event base class passed to functions attached to field signals.
-     */
     class Event
     {
@@ -96 +93 @@
       const Field *mField;
     };
-
-    /**
-     * Event class for field change events.
-     */
-    class ChangedEvent : public Event
-    {
-      friend class Field;
-
-    public:
-
-      /**
-       * Was the field change triggered from network or locally?
-       */
-      bool getChangedFromNet() const { return mChangedFromNet; }
-
-      /**
-       * Returns the connected field which triggered this field change.
-       * Returns 0 if the field was not changed by a connection.
-       * \see FieldEvent::getField for notes about holding the field after
-       * the callback has returned.
-       */
-      Field* getTriggeredFromField() const { return mTriggeredFromField; }
-
-    protected:
-      ChangedEvent(Field *field, bool changedFromNet, Field* triggeredFromField) :
-        Event(field), mChangedFromNet(changedFromNet), mTriggeredFromField(triggeredFromField) {}
-
-    private:
-      bool mChangedFromNet;
-      Field* mTriggeredFromField;
-    };
-
-    /**
-     * Event class for field connect events.
-     */
-    class ConnectedEvent : public Event
-    {
-      friend class Field;
-
-    public:
-
-      /**
-       * Get the field just connected to the originating field of the event.
-       * \see FieldEvent::getField for notes about holding the field after
-       * the callback has returned.
-       */
-      Field* getConnectedField() const { return mConnectedField; }
-
-    protected:
-      ConnectedEvent(Field *field, Field *connectedField) :
-        Event(field), mConnectedField(connectedField) {}
-
-    private:
-      Field* mConnectedField;
-    };
-
-    /**
-     * Event class for field disconnect events.
-     */
-    class DisconnectedEvent : public Event
-    {
-      friend class Field;
-
-    public:
-
-      /**
-       * Get the fields just disconnected to the originating field of the event.
-       * \see FieldEvent::getField for notes about holding a field after
-       * the callback has returned.
-       */
-      std::vector<Field*> getDisconnectedFields() const { return mDisconnectedFields; }
-
-    protected:
-      DisconnectedEvent(Field *field, std::vector<Field*> disconnectedFields) :
-        Event(field), mDisconnectedFields(disconnectedFields) {}
-
-    private:
-      std::vector<Field*> mDisconnectedFields;
-    };
-
-
-    typedef boost::signal<void (const ChangedEvent&)> ChangedSignal;
-    typedef ChangedSignal::slot_type ChangedCallback;
-    typedef boost::signals::connection ChangedCallbackHandle;
-
-    typedef boost::signal<void (const ConnectedEvent&)> ConnectedSignal;
-    typedef ConnectedSignal::slot_type ConnectedCallback;
-    typedef boost::signals::connection ConnectedCallbackHandle;
-
-    typedef boost::signal<void (const DisconnectedEvent&)> DisconnectedSignal;
-    typedef DisconnectedSignal::slot_type DisconnectedCallback;
-    typedef boost::signals::connection DisconnectedCallbackHandle;
 
     enum FieldChangeSource
@@ -371 +276 @@
 
     /**
-     * Register callback invoked after a field change or field touch.
-     * The callback must take exactly one parameter of ChangedEvent.
-     */
-    ChangedCallbackHandle addChangedCallback(const ChangedCallback& callback);
-
-    /**
-     * Remove previously registered field changed callback via its handle.
-     */
-    void removeChangedCallback(const ChangedCallbackHandle& handle);
-
-    /**
-     * Register callback invoked after a field has been connected to this field.
-     * The callback must take exactly one parameter of ConnectedEvent.
-     */
-    ConnectedCallbackHandle addConnectedCallback(const ConnectedCallback& callback);
-
-    /**
-     * Remove previously registered field ConnectedCallback via its handle.
-     */
-    void removeConnectedCallback(const ConnectedCallbackHandle& handle);
-
-    /**
-     * Register callback invoked after a field has been disconnected from this field.
-     * The callback must take exactly one parameter of DisconnectedEvent.
-     */
-    DisconnectedCallbackHandle addDisconnectedCallback(const DisconnectedCallback& callback);
-
-    /**
-     * Remove previously registered field DisconnectedCallback via its handle.
-     */
-    void removeDisconnectedCallback(const DisconnectedCallbackHandle& handle);
-
-    /**
      * Create a new instance of same field type and same value.
      * This type is not added to any container or event handler.
@@ -441 +313 @@
     // disable copy construction
     Field(const Field&);
-
-    void containerFieldChanged(const ChangedEvent& event);
-
-    ChangedSignal mChangedSignal;
-    ConnectedSignal mConnectedSignal;
-    DisconnectedSignal mDisconnectedSignal;
 
     FieldPtrSet mAuditors;

branches/turbo/avango-core/include/avango/TimeSensor.h

@@ -71 +71 @@
 
     virtual void evaluate();
-
-  private:
-
-    void referenceTimeChanged(const av::SFDouble::ChangedEvent& event);
-
   };
 

branches/turbo/avango-core/src/avango/fields/Field.cpp

@@ -182 +182 @@
 
   // copy and reference auditors while in notify because the connection topology may change
-
   FieldPtrVec auditors;
   auditors.reserve(mAuditors.size());
@@ -189 +188 @@
   FieldPtrVec::const_iterator current;
   FieldPtrVec::const_iterator past_of_end = auditors.end();
-
-  // create references to field containers
-  std::vector<Link<FieldContainer> > auditor_containers;
-  auditor_containers.reserve(mAuditors.size());
-  std::transform(auditors.begin(), auditors.end(), std::back_inserter(auditor_containers),
-                 boost::bind(&Field::getContainer, _1));
-
-  // notify
-
   for (current = auditors.begin(); current != past_of_end; ++current)
   {
@@ -344 +334 @@
   if (notifyEnabled())
   {
-    mChangedSignal(ChangedEvent(this, fromNet, triggeredFrom));
+    mContainer->fieldChanged(*this, fromNet);
     notify(triggeredFrom);
     ContainerPool::notifyFieldHasChanged(this);
@@ -370 +360 @@
   mConnectedFrom.push_back(std::make_pair(field, dependent));
   field->addAuditor(this);
-  mConnectedSignal(ConnectedEvent(this, field));
 
   ContainerPool::notifyConnect(this);
@@ -401 +390 @@
   // we can notice disconnects this way
   touch();
-
-  mDisconnectedSignal(DisconnectedEvent(this, disconnected_fields));
 
   ContainerPool::notifyDisconnect(this);
@@ -453 +440 @@
   touch();
 
-  mDisconnectedSignal(DisconnectedEvent(this, std::vector<Field*>(1, field)));
-
   ContainerPool::notifyDisconnect(this);
 }
@@ -505 +490 @@
 
 void
-av::Field::containerFieldChanged(const ChangedEvent& event)
-{
-  AV_ASSERT(this == event.getField());
-  mContainer->fieldChanged(*(event.getField()), event.getChangedFromNet());
-}
-
-void
 av::Field::bind(av::FieldContainer* container, const std::string& name, bool owned)
 {
@@ -526 +504 @@
   unsigned int index = container->addField(this, name);
   setContainer(container, index, owned);
-  addChangedCallback(boost::bind(&Field::containerFieldChanged, this, _1));
 }
 
@@ -708 +685 @@
 }
 
-av::Field::ChangedCallbackHandle
-av::Field::addChangedCallback(const ChangedCallback& callback)
-{
-  return mChangedSignal.connect(callback);
-}
-
-void
-av::Field::removeChangedCallback(const ChangedCallbackHandle& handle)
-{
-  handle.disconnect();
-}
-
-av::Field::ConnectedCallbackHandle
-av::Field::addConnectedCallback(const ConnectedCallback& callback)
-{
-  return mConnectedSignal.connect(callback);
-}
-
-void
-av::Field::removeConnectedCallback(const ConnectedCallbackHandle& handle)
-{
-  handle.disconnect();
-}
-
-av::Field::DisconnectedCallbackHandle
-av::Field::addDisconnectedCallback(const DisconnectedCallback& callback)
-{
-  return mDisconnectedSignal.connect(callback);
-}
-
-void
-av::Field::removeDisconnectedCallback(const DisconnectedCallbackHandle& handle)
-{
-  handle.disconnect();
-}
-
 void
 av::Field::evaluateDependencies(void)

branches/turbo/avango-core/src/avango/fields/tests/SConscript

@@ -42 +42 @@
 tests += avango_test_env.Alias('test-core-field-fields', test_fields, "${SOURCE.abspath}")
 
-test_field_callbacks = avango_test_env.Program('TestFieldCallbacks.cpp')
-tests += avango_test_env.Alias('test-core-field-callbacks', test_field_callbacks,
-                               "${SOURCE.abspath}")
-
 test_field_value_callbacks = avango_test_env.Program('TestFieldValueCallbacks.cpp')
 tests += avango_test_env.Alias('test-core-field-value-callbacks', test_field_value_callbacks,

branches/turbo/avango-core/src/avango/interface/TimeSensor.cpp

@@ -71 +71 @@
   AV_FC_ADD_FIELD(Time, 0);
 
-  ReferenceTime.addChangedCallback(boost::bind(&av::TimeSensor::referenceTimeChanged, this, _1));
   alwaysEvaluate(true);
 }
@@ -94 +93 @@
   RealTime.touch();
 }
-
-void
-av::TimeSensor::referenceTimeChanged(const av::SFDouble::ChangedEvent&)
-{
-  Time.setValue(RealTime.getValue()-ReferenceTime.getValue());
-}

branches/turbo/avango-core/src/avango/interface/tests/TestTimeSensor.cpp

@@ -40 +40 @@
 namespace
 {
-  double real_time = 0;
-
-  void realTimeChanged(const av::SFDouble::ChangedEvent& event)
-  {
-    real_time = dynamic_cast<const av::SFDouble*>(event.getField())->getValue();
-    AV_ASSERT(real_time);
-    av::getRootLogger().info() << "real_time: " << real_time;
-  }
-
   TEST(TimeSensor)
   {
     av::TimeSensor::initClass();
     av::Link<av::TimeSensor> time_sensor(new av::TimeSensor);
-    time_sensor->RealTime.addChangedCallback(&realTimeChanged);
     av::ApplicationInstance::get().evaluate();
+    double real_time = time_sensor->RealTime.getValue();
     CHECK(real_time > 0);
     double old_time = real_time;
@@ -63 +54 @@
 #endif
     av::ApplicationInstance::get().evaluate();
+    real_time = time_sensor->RealTime.getValue();
     av::getRootLogger().info() << "real_time - old_time : " << real_time - old_time;
     CHECK(old_time < real_time);

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);