Changeset 1610 for code/branches/core3/src/core/ConfigValueContainer.h

Timestamp:

Jun 19, 2008, 4:10:27 AM (16 years ago)

Author:

landauf

Message:

• fixed bug #1 in ConfigValueContainer (callback not being called the first time)
• fixed another bug in XMLPort, caused by the recently added support for extern types

File:

• code/branches/core3/src/core/ConfigValueContainer.h (modified) (7 diffs)

code/branches/core3/src/core/ConfigValueContainer.h

@@ -103 +103 @@
             ConfigValueContainer& getValue(T* value, C* object)
             {
-                if (this->callback_ && object)
-                {
+std::cout << "start: " << this->getName() << std::endl;
+                if ((this->callback_ && object) || this->bContainerIsNew_)
+                {
+                    if (this->bContainerIsNew_)
+                        this->bContainerIsNew_ = false;
+
                     T temp = *value;
                     this->value_.getValue(value);
                     if ((*value) != temp)
-                        this->callback_->call(object);
+                    {
+                        if (this->callback_ && object)
+                            this->callback_->call(object);
+                        else
+                            this->bDoInitialCallback_ = true;
+                    }
                 }
                 else
@@ -114 +123 @@
                     this->value_.getValue(value);
                 }
+std::cout << "end" << std::endl;
                 return *this;
             }
@@ -121 +131 @@
             ConfigValueContainer& getValue(std::vector<T>* value, C* object)
             {
-                if (this->callback_ && object)
-                {
+                if ((this->callback_ && object) || this->bContainerIsNew_)
+                {
+                    if (this->bContainerIsNew_)
+                        this->bContainerIsNew_ = false;
+
                     std::vector<T> temp = *value;
-
                     value->clear();
                     for (unsigned int i = 0; i < this->valueVector_.size(); ++i)
@@ -131 +143 @@
                     if (value->size() != temp.size())
                     {
-                        this->callback_->call(object);
+                        if (this->callback_ && object)
+                            this->callback_->call(object);
+                        else
+                            this->bDoInitialCallback_ = true;
                     }
                     else
@@ -139 +154 @@
                             if ((*value)[i] != temp[i])
                             {
-                                this->callback_->call(object);
+                                if (this->callback_ && object)
+                                    this->callback_->call(object);
+                                else
+                                    this->bDoInitialCallback_ = true;
                                 break;
                             }
@@ -172 +190 @@
 
             template <class T>
-            inline ConfigValueContainer& callback(void (T::*function) (void))
+            inline ConfigValueContainer& callback(T* object, void (T::*function) (void))
             {
                 if (!this->callback_)
+                {
                     this->callback_ = new ConfigValueCallback<T>(function);
+
+                    if (this->bDoInitialCallback_)
+                    {
+                        this->bDoInitialCallback_ = false;
+                        this->callback_->call(object);
+                    }
+                }
+
                 return (*this);
             }
@@ -215 +242 @@
             LanguageEntryLabel         description_;                //!< The description
             ConfigValueCallbackBase*   callback_;                   //!< A callback function to call after getValue if the value changed
+
+            bool                       bContainerIsNew_;            //!< True if it's the first time getValue() gets called
+            bool                       bDoInitialCallback_;         //!< True if the callback should be called as soon as it gets created
     };
 }