0027932: Improvement of standard attributes usability.

OCAF attributes TDataStd_AsciiString, TDataStd_Integer, TDataStd_Name, TDataStd_Real are extended by possibility to use custom GUID.

Now multiple attributes of any of these types can be placed at the same label using different user-defined GUIDs.
For this new "Set" methods were added into each attribute, which takes this custom GUID as an argument.
Other aspects of management of attributes on labels remain the same.

Version number of persistent OCAF documents is incremented.
However, the attributes are stored in the same way unless non-standard GUID is used for particular attribute.
Previously saved documents are fully supported, but the new documents with this extension used will be non-readable by the previous version of OCAF libraries.

src/XmlMDataStd/XmlMDataStd_AsciiStringDriver.cxx

@@ -25,7 +25,7 @@
 #include <XmlObjMgt_SRelocationTable.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_AsciiStringDriver,XmlMDF_ADriver)
-
+IMPLEMENT_DOMSTRING (AttributeIDString, "asciiguid")
 //=======================================================================
 //function : XmlMDataStd_AsciiStringDriver
 //purpose  : Constructor
@@ -54,9 +54,19 @@ Standard_Boolean XmlMDataStd_AsciiStringDriver::Paste
                                 XmlObjMgt_RRelocationTable&  ) const
 {
   if(!theTarget.IsNull()) {
-    const TCollection_AsciiString aString = XmlObjMgt::GetStringValue (theSource);
-    Handle(TDataStd_AsciiString)::DownCast(theTarget) -> Set (aString);
-    return Standard_True;
+  const TCollection_AsciiString aString = XmlObjMgt::GetStringValue (theSource);
+  Handle(TDataStd_AsciiString)::DownCast(theTarget) -> Set (aString);
+  // attribute id
+  Standard_GUID aGUID;
+  const XmlObjMgt_Element& anElement = theSource;
+  XmlObjMgt_DOMString aGUIDStr = anElement.getAttribute(::AttributeIDString());
+  if (aGUIDStr.Type() == XmlObjMgt_DOMString::LDOM_NULL)
+    aGUID = TDataStd_AsciiString::GetID(); //default case
+  else
+    aGUID = Standard_GUID(Standard_CString(aGUIDStr.GetString())); // user defined case
+
+  Handle(TDataStd_AsciiString)::DownCast(theTarget)->SetID(aGUID);
+  return Standard_True;
   }
   WriteMessage("error retrieving AsciiString for type TDataStd_AsciiString");
   return Standard_False;
@@ -74,4 +84,11 @@ void XmlMDataStd_AsciiStringDriver::Paste (const Handle(TDF_Attribute)& theSourc
   if (aS.IsNull()) return;
   XmlObjMgt_DOMString aString = aS->Get().ToCString();
   XmlObjMgt::SetStringValue (theTarget, aString);
+  if(aS->ID() != TDataStd_AsciiString::GetID()) {
+    //convert GUID
+    Standard_Character aGuidStr [Standard_GUID_SIZE_ALLOC];
+    Standard_PCharacter pGuidStr = aGuidStr;
+    aS->ID().ToCString (pGuidStr);
+    theTarget.Element().setAttribute (::AttributeIDString(), aGuidStr);
+  }
 }

src/XmlMDataStd/XmlMDataStd_IntegerDriver.cxx

@@ -23,7 +23,7 @@
 #include <XmlObjMgt_Persistent.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_IntegerDriver,XmlMDF_ADriver)
-
+IMPLEMENT_DOMSTRING (AttributeIDString, "intattguid")
 //=======================================================================
 //function : XmlMDataStd_IntegerDriver
 //purpose  : Constructor
@@ -65,6 +65,17 @@ Standard_Boolean XmlMDataStd_IntegerDriver::Paste
   Handle(TDataStd_Integer) anInt= Handle(TDataStd_Integer)::DownCast(theTarget);
   anInt->Set(aValue);
 
+  // attribute id
+  Standard_GUID aGUID;
+  const XmlObjMgt_Element& anElement = theSource;
+  XmlObjMgt_DOMString aGUIDStr = anElement.getAttribute(::AttributeIDString());
+  if (aGUIDStr.Type() == XmlObjMgt_DOMString::LDOM_NULL)
+    aGUID = TDataStd_Integer::GetID(); //default case
+  else
+    aGUID = Standard_GUID(Standard_CString(aGUIDStr.GetString())); // user defined case
+
+  Handle(TDataStd_Integer)::DownCast(theTarget)->SetID(aGUID);
+
   return Standard_True;
 }
 
@@ -78,4 +89,11 @@ void XmlMDataStd_IntegerDriver::Paste (const Handle(TDF_Attribute)& theSource,
 {
   Handle(TDataStd_Integer) anInt= Handle(TDataStd_Integer)::DownCast(theSource);
   XmlObjMgt::SetStringValue (theTarget, anInt->Get());
+  if(anInt->ID() != TDataStd_Integer::GetID()) {
+    //convert GUID
+    Standard_Character aGuidStr [Standard_GUID_SIZE_ALLOC];
+    Standard_PCharacter pGuidStr = aGuidStr;
+    anInt->ID().ToCString (pGuidStr);
+    theTarget.Element().setAttribute (::AttributeIDString(), aGuidStr);
+  }
 }

src/XmlMDataStd/XmlMDataStd_NameDriver.cxx

@@ -25,7 +25,7 @@
 #include <XmlObjMgt_SRelocationTable.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_NameDriver,XmlMDF_ADriver)
-
+IMPLEMENT_DOMSTRING (AttributeIDString, "nameguid")
 //=======================================================================
 //function : XmlMDataStd_NameDriver
 //purpose  : Constructor
@@ -53,11 +53,23 @@ Standard_Boolean XmlMDataStd_NameDriver::Paste
                                 const Handle(TDF_Attribute)& theTarget,
                                 XmlObjMgt_RRelocationTable&  ) const
 {
-  TCollection_ExtendedString aString;
-  if (XmlObjMgt::GetExtendedString (theSource, aString))
-  {
-    Handle(TDataStd_Name)::DownCast(theTarget) -> Set (aString);
-    return Standard_True;
+  if(!theTarget.IsNull()) {	
+    TCollection_ExtendedString aString;
+    if (XmlObjMgt::GetExtendedString (theSource, aString))
+    {
+      Handle(TDataStd_Name)::DownCast(theTarget) -> Set (aString);    
+      // attribute id
+      Standard_GUID aGUID;
+      const XmlObjMgt_Element& anElement = theSource;
+      XmlObjMgt_DOMString aGUIDStr = anElement.getAttribute(::AttributeIDString());
+      if (aGUIDStr.Type() == XmlObjMgt_DOMString::LDOM_NULL)
+        aGUID = TDataStd_Name::GetID(); //default case
+      else
+        aGUID = Standard_GUID(Standard_CString(aGUIDStr.GetString())); // user defined case
+
+      Handle(TDataStd_Name)::DownCast(theTarget)->SetID(aGUID);
+	  return Standard_True;
+    }
   }
   WriteMessage("error retrieving ExtendedString for type TDataStd_Name");
   return Standard_False;
@@ -65,12 +77,20 @@ Standard_Boolean XmlMDataStd_NameDriver::Paste
 
 //=======================================================================
 //function : Paste()
-//purpose  : 
+//purpose  : store
 //=======================================================================
 void XmlMDataStd_NameDriver::Paste (const Handle(TDF_Attribute)& theSource,
                                     XmlObjMgt_Persistent&        theTarget,
                                     XmlObjMgt_SRelocationTable&  ) const
 {
   Handle(TDataStd_Name) aName = Handle(TDataStd_Name)::DownCast(theSource);
+  if (aName.IsNull()) return;
   XmlObjMgt::SetExtendedString (theTarget, aName -> Get());
+  if(aName->ID() != TDataStd_Name::GetID()) {
+    //convert GUID
+    Standard_Character aGuidStr [Standard_GUID_SIZE_ALLOC];
+    Standard_PCharacter pGuidStr = aGuidStr;
+    aName->ID().ToCString (pGuidStr);
+    theTarget.Element().setAttribute (::AttributeIDString(), aGuidStr);
+  }
 }

src/XmlMDataStd/XmlMDataStd_RealDriver.cxx

@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_RealDriver,XmlMDF_ADriver)
-
+IMPLEMENT_DOMSTRING (AttributeIDString, "realattguid")
 //=======================================================================
 //function : XmlMDataStd_RealDriver
 //purpose  : Constructor
@@ -64,8 +64,19 @@ Standard_Boolean XmlMDataStd_RealDriver::Paste
     return Standard_False;
   }
 
-  Handle(TDataStd_Real) anInt = Handle(TDataStd_Real)::DownCast(theTarget);
-  anInt->Set(aValue);
+  Handle(TDataStd_Real) anAtt = Handle(TDataStd_Real)::DownCast(theTarget);
+  anAtt->Set(aValue);
+
+  // attribute id
+  Standard_GUID aGUID;
+  const XmlObjMgt_Element& anElement = theSource;
+  XmlObjMgt_DOMString aGUIDStr = anElement.getAttribute(::AttributeIDString());
+  if (aGUIDStr.Type() == XmlObjMgt_DOMString::LDOM_NULL)
+    aGUID = TDataStd_Real::GetID(); //default case
+  else
+    aGUID = Standard_GUID(Standard_CString(aGUIDStr.GetString())); // user defined case
+
+  Handle(TDataStd_Real)::DownCast(theTarget)->SetID(aGUID);
 
   return Standard_True;
 }
@@ -78,10 +89,17 @@ void XmlMDataStd_RealDriver::Paste (const Handle(TDF_Attribute)& theSource,
                                     XmlObjMgt_Persistent&        theTarget,
                                     XmlObjMgt_SRelocationTable&  ) const
 {
-  Handle(TDataStd_Real) anInt = Handle(TDataStd_Real)::DownCast(theSource);
+  Handle(TDataStd_Real) anAtt = Handle(TDataStd_Real)::DownCast(theSource);
   char aValueChar[32];
-  Sprintf(aValueChar, "%.17g", anInt->Get());
+  Sprintf(aValueChar, "%.17g", anAtt->Get());
   TCollection_AsciiString aValueStr(aValueChar);
   // No occurrence of '&', '<' and other irregular XML characters
   XmlObjMgt::SetStringValue (theTarget, aValueStr.ToCString(), Standard_True);
+  if(anAtt->ID() != TDataStd_Real::GetID()) {
+    //convert GUID
+    Standard_Character aGuidStr [Standard_GUID_SIZE_ALLOC];
+    Standard_PCharacter pGuidStr = aGuidStr;
+    anAtt->ID().ToCString (pGuidStr);
+    theTarget.Element().setAttribute (::AttributeIDString(), aGuidStr);
+  }
 }