Changeset 1072 for branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGAttachmentContainer.cpp

Timestamp:

04/02/08 14:18:07 (8 months ago)

Author:

cneumann

Message:

replaced pointer field implementation
split FieldContainer/Fields? directory into Base and Handle subdir

Status: - ref counting seems to work (mt, cluster)

• new OSB loader works (well, the unittest does)
  
• VRML loader is deactivated
  
• get/edit handle for dynamic (pointer) fields missing
  
• need to remove some more old files - they get moved in this commit
  
• generated (i.e. base) code in following commit
  

Files:

• branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGAttachmentContainer.cpp (modified) (4 diffs)

branches/Carsten_PtrWork2/Source/System/FieldContainer/Base/OSGAttachmentContainer.cpp

@@ -67 +67 @@
-        "Attachments attached to this container.",
-        OSG_RC_FIELD_DESC(AttachmentContainer::Attachments),
-        FieldContainerAttachment::ParentsFieldId,
-        false,
-        Field::MFDefaultFlags,
@@ -108 +107 @@
-    _mfAttachmentBindings()
-{
-
-
-
-
+
+
+
-}
-
@@ -119 +117 @@
-    _mfAttachmentBindings(      )
-{
-
-
-
-
+
+
+
-}
-
@@ -349 +346 @@
-{
-    return _mfAttachmentBindings;
+}
+
+/*-------------------------------------------------------------------------*/
+/*  Child Linking                                                          */
+
+bool
+    AttachmentContainer::unlinkChild(
+        FieldContainerPtrConst pChild,
+        UInt16 const           childFieldId)
+{
+    if(childFieldId == AttachmentsFieldId)
+    {
+        FieldContainerAttachmentPtr pTypedChild =
+            dynamic_cast< FieldContainerAttachmentPtr >(pChild);
+            
+        if(pTypedChild != NullFC)
+        {
+            Int32 index = _mfAttachments.findIndex(pTypedChild);
+                            
+            if(index != -1)
+            {
+                subAttachment(pTypedChild);
+                
+                return true;
+            }
+            
+            FWARNING(("AttachmentContainer::unlinkParent: Child <-> Parent link inconsistent.\n"));
+            
+            return false;
+        }
+        
+        return false;
+    }
+        
+    return Inherited::unlinkChild(pChild, childFieldId);
-}
-